Commit e0c56fb6 authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch 'develop' into 21-send-second-confirmation-e-mail

* develop:
  [TASK] Update femanger ts configuration
  [TASK] Update page configuration
  [TASK] Update edit form html
  [TASK] update ts configuration for femanager
  [TASK] Add Edit Form from femanager
  [TASK] Update versions
  [TASK] correct phpdoc
  [TASK] Add slack connection for BE approvement
parents 0beb1250 c23a7dc1
Pipeline #2486 passed with stages
in 4 minutes and 41 seconds
......@@ -109,6 +109,7 @@ class FeManagerHooks
*/
public function newUserAdminApprovement(User $user)
{
#User was approved via backend
$this->sendSlackBotMessage(
'User approved',
......@@ -201,6 +202,7 @@ class FeManagerHooks
// TODO: Handle the resonse as needed
if ($ret === true) {
} else {
}
}
}
......@@ -264,9 +266,11 @@ class FeManagerHooks
}
/**
* @param \In2code\Femanager\Domain\Model\User $user
* @return bool
*/
protected function sendConfirmationEmail(User $user ){
protected function sendConfirmationEmail(User $user)
{
return true;
}
}
......@@ -19,28 +19,39 @@ plugin.tx_femanager {
returnLast = url
}
}
redirect = TEXT
redirect {
typolink {
parameter = {tx_t3omy.page.activateMessage}
returnLast = url
}
}
#
# redirect user after user clicks confirmation link in emailX
# redirect user after user clicks confirmation link in email
userConfirmationRedirect = TEXT
userConfirmationRedirect {
typolink {
parameter = 194
parameter = {tx_t3omy.page.adminConfirmMessage}
returnLast = url
}
}
autoApprovement = 1
autoApprovement {
enable = 1
whitelistDomains {
allowTopLevelDomains = .de
exceptions =
allowTopLevelDomains = .de, .nl, .ch, .at, .it, .edu, .uk, .org, .fr, .au, .eu, .net, .ca, .gr, .be, .dk, .ro, .biz, .pl, .se, .rw, .nz
exceptions = google.com, gmail.com, googlemail.com, yahoo.com, dermatologyconference.org
}
blacklistDomains =
blacklistDomains = infectiousconferences.com
}
confirmByAdmin = 1
email.createUserNotify._enable.value = 1
}
page.termsAndConditions = 6
}
}
page.includeJSFooter.femanagerValidation >
{namespace femanager=In2code\Femanager\ViewHelpers}
<div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers" >
<f:layout name="Default" />
User / Edit
Available variables:
{user}
{allUserGroups}
<f:section name="main">
<section class="container">
<f:render partial="Misc/FlashMessages" arguments="{_all}" />
<f:render partial="Misc/FormErrors" arguments="{object:User}" />
<div class="femanager_edit">
<f:if condition="{user}">
<f:then>
<f:form
name="user"
object="{user}"
action="update"
enctype="multipart/form-data"
class="form-horizontal {f:if(condition:'{settings.edit.validation._enable.client}',then:'feManagerValidation',else:'')}">
<fieldset>
<legend>
<f:translate key="titleUpdateProfile" />
</legend>
<f:comment>
If some fields are selected in the flexform
</f:comment>
<f:for each="{femanager:misc.explode(string:'{settings.edit.fields}')}" as="field">
<f:render partial="Fields/{femanager:misc.upper(string:'{field}')}" arguments="{_all}" />
</f:for>
<div class="femanager_fieldset femanager_submit form-group">
<div class="col-sm-10 col-sm-offset-2">
<f:form.submit
value="{f:translate(key:'submitEdit')}"
id="femanager_field_submit"
class="btn btn-success btn-large" />
<f:link.action
action="delete"
arguments="{user:user}"
class="btn btn-danger btn-large"
additionalAttributes="{data-confirm:'{f:translate(key:\'UserDeleteConfirmation\')}'}">
<i class="icon-trash icon-white"></i>
<f:translate key="deleteProfile" />
</f:link.action>
</div>
</div>
</fieldset>
</f:form>
</f:then>
<f:else>
<div class="femanager_note">
<f:translate key="notLoggedIn" />
</div>
</f:else>
</f:if>
</div>
</section>
</f:section>
</div>
......@@ -2,7 +2,7 @@
"name": "t3o/t3omy",
"type": "typo3-cms-extension",
"description": "Base extension for project my.typo3.org layout and specific functions",
"homepage": "https://www.typo3.org",
"homepage": "https://my.typo3.org",
"license": [
"GPL-2.0+"
],
......@@ -14,5 +14,5 @@
"T3o\\T3omy\\": "Classes"
}
},
"version": "0.0.2"
"version": "0.1.0"
}
......@@ -21,12 +21,12 @@ $EM_CONF[$_EXTKEY] = array(
'T3o\\T3olayout\\' => 'Classes'
),
),
'state' => 'alpha',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
'clearCacheOnLoad' => 1,
'author' => 'Stefan Busemann',
'author_email' => 'stefan.busemann@typo3.org',
'author_company' => 'typo3',
'version' => '0.0.3',
'version' => '0.1.0',
);
......@@ -8,7 +8,7 @@ if (!defined('TYPO3_MODE')) {
#######################################
/**
* Register signal slots
* TODO: add the signal names
*
*/
$dispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
$dispatcher->connect(
......@@ -24,17 +24,27 @@ $dispatcher->connect(
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserNotification'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'deleteAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'deleteUser'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'',
'approveUserAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'newUserAdminApprovement'
);
$dispatcher->connect(
\In2code\Femanager\Controller\UserBackendController::class,
'deleteAction',
'declineUserAction',
\T3o\T3omy\Hooks\FeManagerHooks::class,
'deleteUser'
'newUserAdminDecline'
);
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['password_changed'][] = \T3o\T3omy\Hooks\FeManagerHooks::class . '->writePassword';
......
......@@ -10,14 +10,14 @@
plugin.tx_femanager.settings.adminName = TYPO3 Association / typo3.org Administration
plugin.tx_femanager.settings.adminEmail = info@typo3.org
plugin.tx_femanager.persistence.storagePid = 7
plugin.tx_femanager.persistence.storagePid = 5
###############
### PageIds ###
###############
# cat=T3Omy Page-Settings/page/001; type=string; label = Page with message, after create a profile
tx_t3omy.page.createMessage = 1
tx_t3omy.page.createMessage = 2
# cat=T3Omy Page-Settings/page/002; type=string; label = Page with message, after confirmed his email and Admin approvement is needed
tx_t3omy.page.adminConfirmMessage =
tx_t3omy.page.adminConfirmMessage = 8
# cat=T3Omy Page-Settings/page/003; type=string; label = Page with message, after profile was activated
tx_t3omy.page.activateMessage =
tx_t3omy.page.activateMessage = 9
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment