Commit e858bcce authored by Markus Sommer's avatar Markus Sommer
Browse files

Merge branch 'develop' into 'activates-ldap-authentication'

# Conflicts:
#   html/typo3conf/LocalConfiguration.php
parents e25b191a 307e9888
Pipeline #1477 passed with stages
in 5 minutes and 38 seconds
...@@ -22,11 +22,27 @@ return [ ...@@ -22,11 +22,27 @@ return [
'EXT' => [ 'EXT' => [
'extConf' => [ 'extConf' => [
'backend' => 'a:5:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}', 'backend' => 'a:5:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}',
'belog' => 'a:0:{}',
'beuser' => 'a:0:{}',
'documentation' => 'a:0:{}',
'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}', 'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}',
'felogin' => 'a:0:{}',
'femanager' => 'a:2:{s:13:"disableModule";s:1:"0";s:10:"disableLog";s:1:"0";}',
'fluid_styled_content' => 'a:0:{}',
'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}', 'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}',
'info' => 'a:0:{}',
'info_pagetsconfig' => 'a:0:{}',
'recycler' => 'a:0:{}',
'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}', 'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
'rte_ckeditor' => 'a:0:{}',
'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}', 'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}',
'scheduler' => 'a:4:{s:11:"maxLifetime";s:4:"1440";s:11:"enableBELog";s:1:"1";s:15:"showSampleTasks";s:1:"1";s:11:"useAtdaemon";s:1:"0";}', 'scheduler' => 'a:4:{s:11:"maxLifetime";s:4:"1440";s:11:"enableBELog";s:1:"1";s:15:"showSampleTasks";s:1:"1";s:11:"useAtdaemon";s:1:"0";}',
'setup' => 'a:0:{}',
't3o_ldap' => 'a:8:{s:29:"enableExternalPasswordUpdates";s:1:"0";s:25:"enableLdapPasswordUpdates";s:1:"0";s:10:"ldapServer";s:9:"127.0.0.1";s:14:"ldapServerPort";s:3:"389";s:19:"ldapProtocolVersion";s:1:"3";s:10:"ldapBindDn";s:0:"";s:16:"ldapBindPassword";s:0:"";s:28:"ldapBaseDnForPasswordChanges";s:0:"";}',
't3o_slack' => 'a:0:{}',
't3olayout' => 'a:0:{}',
't3omy' => 'a:0:{}',
'tstemplate' => 'a:0:{}',
], ],
], ],
'FE' => [ 'FE' => [
......
plugin.tx_felogin_pi1 {
templateFile = EXT:t3omy/Resources/Private/Templates/Felogin/FrontendLogin.html
wrapContentInBaseClass = 0
stdWrap.wrap (
<section class="container">|</section>
)
_LOCAL_LANG.ll_forgot_validate_reset_password.default(
Your new password
Dear %s,
This email was sent in response to your request to reset your password. Please click on the link below.
%s
For security reasons, this link is only active until %s. If you do not visit the link before then, you will need to repeat the password reset steps.
The TYPO3.org Team
------------------------------------------------------------------
TYPO3 Association, Sihlbruggstrasse 105, CH-6340 Baar, Switzerland
------------------------------------------------------------------
)
}
plugin.tx_femanager { plugin.tx_femanager {
view {
templateRootPaths.3 = EXT:t3omy/Resources/Private/Templates/Femanager/
layoutRootPaths.3 = EXT:t3omy/Resources/Private/Templates/Femanager/
}
settings { settings {
new { new {
validation { validation {
terms.required = 1 terms.required = 1
name.required = 1 name.required = 1
} }
requestRedirect = TEXT
requestRedirect {
parameter = {$plugin.tx_t3omy.page.createMessage}
returnLast = url
}
} }
} }
} }
page.includeJSFooter.femanagerValidation >
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Templates for felogin</title>
</head>
<body>
<h1>Common markers</h1>
<p>These are substituted in all felogin item displaying templates.</p>
<h2>Markers</h2>
<ul>
<li>###ACTION_URI### - URI of the request for the login/logout form</li>
<li>###EXTRA_HIDDEN### - Hook required (additional hidden field used by kb_md5fepw extension by Kraft Bernhard)</li>
<li>###ON_SUBMIT### - Hook required (used by kb_md5fepw extension by Kraft Bernhard)</li>
<li>###PREFIXID### - Same as class name ('tx_felogin_pi1') useful to get a unique classname prefix</li>
<li>###REDIRECT_URL### - URL of redirection upon login</li>
<li>###NOREDIRECT### - if set, no redirect will be done</li>
<li>###STORAGE_PID### - explicit enough I guess (if not : id of the page where user are stored)</li>
<li>###STATUS_HEADER### - depends of the template</li>
<li>###STATUS_MESSAGE### - depends of the template</li>
</ul>
<h2>Wrap parts</h2>
<ul>
<li>###HEADER_VALID### - useful to define what to show/hide</li>
<li>###MESSAGE_VALID### - useful to define what to show/hide</li>
<li>###FORGOTP_VALID### - useful to define what to show/hide</li>
<li>###PERMALOGIN_VALID### - useful to define what to show/hide</li>
</ul>
<h2>felogin Language Markers (see pi/locallang.xlf)</h2>
<ul>
<li>###EMAIL_LABEL### - corresponding to 'your_email'</li>
<li>###FORGOT_PASSWORD### - corresponding to 'forgot_password'</li>
<li>###FORGOT_PASSWORD_BACKTOLOGIN### - corresponding to 'forgot_password_backToLogin'</li>
<li>###FORGOT_PASSWORD_ENTEREMAIL### - corresponding to 'forgot_password_enterEmail'</li>
<li>###LOGIN_LABEL### - corresponding to 'login'</li>
<li>###PASSWORD_LABEL### - corresponding to 'password'</li>
<li>###SEND_PASSWORD### - corresponding to 'send_password'</li>
<li>###USERNAME_LABEL### - corresponding to 'username'</li>
</ul>
<!--###TEMPLATE_LOGIN###-->
###STATUS_HEADER###
###STATUS_MESSAGE###
<!-- ###LOGIN_FORM### -->
<form action="###ACTION_URI###" target="_top" method="post" onsubmit="###ON_SUBMIT###">
<fieldset>
<div>
<label for="user">###USERNAME_LABEL###</label>
<input class="form-control" placeholder="username" type="text" id="user" name="user" value="" />
</div>
<div>
<label for="pass">###PASSWORD_LABEL###</label>
<input class="form-control" placeholder="password" type="password" id="pass" name="pass" value="" data-rsa-encryption="" />
</div>
<!--###PERMALOGIN_VALID###-->
<div>
<label for="permalogin">###PERMALOGIN###</label>
<input name="permalogin" value="0" type="hidden" ###PERMALOGIN_HIDDENFIELD_ATTRIBUTES### id="permaloginHiddenField" />
<input name="permalogin" value="1" type="checkbox" ###PERMALOGIN_CHECKBOX_ATTRIBUTES### id="permalogin" onclick="document.getElementById('permaloginHiddenField').disabled = this.checked;" />
</div>
<!--###PERMALOGIN_VALID###-->
<div>
<input class="btn btn-primary" type="submit" name="submit" value="###LOGIN_LABEL###" />
</div>
<div class="felogin-hidden">
<input type="hidden" name="logintype" value="login" />
<input type="hidden" name="pid" value="###STORAGE_PID###" />
<input type="hidden" name="redirect_url" value="###REDIRECT_URL###" />
<input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
###EXTRA_HIDDEN###
</div>
</fieldset>
</form>
<!--###FORGOTP_VALID###-->
<p><!--###FORGOT_PASSWORD_LINK###-->###FORGOT_PASSWORD###<!--###FORGOT_PASSWORD_LINK###--></p>
<!--###FORGOTP_VALID###-->
<!-- ###LOGIN_FORM### -->
<!--###TEMPLATE_LOGIN###-->
<!--###TEMPLATE_LOGOUT###-->
###STATUS_HEADER###
###STATUS_MESSAGE###
<form action="###ACTION_URI###" target="_top" method="post">
<fieldset>
<div>
<label>###USERNAME_LABEL###</label>
###USERNAME###
</div>
<div>
<input class="btn btn-primary" type="submit" name="submit" value="###LOGOUT_LABEL###" />
</div>
<div class="felogin-hidden">
<input type="hidden" name="logintype" value="logout" />
<input type="hidden" name="pid" value="###STORAGE_PID###" />
<input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
</div>
</fieldset>
</form>
<!--###TEMPLATE_LOGOUT###-->
<!--###TEMPLATE_FORGOT###-->
###STATUS_HEADER###
###STATUS_MESSAGE###
<!-- ###FORGOT_FORM### -->
<form action="###ACTION_URI###" method="post">
<div class="felogin-hidden">
<input type="hidden" name="tx_felogin_pi1[forgot_hash]" value="###FORGOTHASH###" />
</div>
<fieldset>
<div>
<label for="tx_felogin_pi1-forgot-email">###DATA_LABEL###</label>
<input class="form-control" placeholder="email" type="text" name="###FORGOT_EMAIL###" id="tx_felogin_pi1-forgot-email" />
</div>
<div>
<input class="btn btn-primary" type="submit" name="submit" value="###SEND_PASSWORD###" />
</div>
</fieldset>
</form>
<!-- ###FORGOT_FORM### -->
<p>###BACKLINK_LOGIN###&nbsp;</p>
<!--###TEMPLATE_FORGOT###-->
<!--###TEMPLATE_CHANGEPASSWORD###-->
###STATUS_HEADER###
###STATUS_MESSAGE###
<!-- ###CHANGEPASSWORD_FORM### -->
<form action="###ACTION_URI###" method="post">
<fieldset>
<div>
<label for="tx_felogin_pi1-newpassword1">###NEWPASSWORD1_LABEL###</label>
<input class="form-control" placeholder="password" type="password" name="###NEWPASSWORD1###" id="tx_felogin_pi1-newpassword1" />
</div>
<div>
<label for="tx_felogin_pi1-newpassword2">###NEWPASSWORD2_LABEL###</label>
<input class="form-control" placeholder="password" type="password" name="###NEWPASSWORD2###" id="tx_felogin_pi1-newpassword2" />
</div>
<div>
<input class="btn btn-primary" type="submit" name="tx_felogin_pi1[changepasswordsubmit]" value="###SEND_PASSWORD###" />
</div>
</fieldset>
</form>
<!-- ###CHANGEPASSWORD_FORM### -->
###BACKLINK_LOGIN###
<!--###TEMPLATE_CHANGEPASSWORD###-->
<f:layout name="Email" />
Email / CreateUserConfirmation
This mail will be send to the user, to confirm his new profile.
It's only activated, if the user-confirm-checkbox in the flexform setting was checked.
Available variables:
{user} User Object
{hash} Hash to ensure authentication of link
<f:section name="main">
Hi {user.username},
thank you for signing up! Use the link below activate your account.
By activating your account you will accept our terms and conditions:
### Personal data protection ###
The TYPO3 Association is committed to user privacy. For statistical reasons we collect the following technical data:
* type of browser
* type of operating system
* referrer Url
* time and date of the use of the website
* your IP address
This data is collected anonymously and will be kept separately from private user data, you might have to give us at
this website.
### Private user data ###
In some cases we need to collect your private user data, to process certain information on this website This data will
not be give to any other third party without your explicit written notice. In some cases we might be forced to give the
data to official government agencies.
### Exposure of your profile and online activities ###
Please be aware that by using our mailinglists, forums and services your profile and activities will be availabe to the
general public thru search engines and archives. As we also require you to use your real name while using the ressources
we will not accept any deletion requests for content created by you.
All terms & conditions: https://my.typo3.org?id={settings.page.termsAndConditions}
##################################################################
Confirm your account
##################################################################
<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'userConfirmation'}">
<f:translate key="emailCreateUserConfirmationLinkConfirm" />
</f:link.action>
Kind regards,
The TYPO3.org Team
------------------------------------------------------------------
TYPO3 Association, Sihlbruggstrasse 105, CH-6340 Baar, Switzerland
In case that you did not request a user account, you can delete your account:
<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'userConfirmationRefused'}">
<f:translate key="emailCreateUserConfirmationLinkConfirmRefused" />
</f:link.action>
</f:section>
<f:layout name="Email" />
Email / CreateUserNotify
This mail will be send to the user, to inform him about his new profile.
It's always activated, even if the admin confirmation and/or the double-opt-in is activated.
Available variables:
{user} User Object
<f:section name="main">
Dear {user.name}
thank you for being a part of the TYPO3 community. Your account is now activated.
Please read our code of conduct: https://www.typo3.org/index.php?id=66
Get started with using TYPO3: https://www.typo3.org/index.php?id=23
Contribute and Get Involved in TYPO3: https://www.typo3.org/index.php?id=70
The TYPO3.org Team
------------------------------------------------------------------
TYPO3 Association, Sihlbruggstrasse 105, CH-6340 Baar, Switzerland
------------------------------------------------------------------
</f:section>
<f:layout name="Email" />
Email / CreateUserNotify
This mail will be send to the user, to inform him about his new profile.
It's always activated, even if the admin confirmation and/or the double-opt-in is activated.
Available variables:
{user} User Object
<f:section name="main">
Dear typo3.org user,
we have received your request for a typo3.org login account.
Due to an immensive amount of spam subscriptions, we are currently approving new accounts after manual verification.
!!! Respond to this e-mail within the next 3 days and confirm that this account will be used with best intentions. !!!
You confirm that the account will not be used for spamming any of our services with unrelated or advertising content.
Thanks for your reply.Kind regards,
The TYPO3.org Team
------------------------------------------------------------------
TYPO3 Association, Sihlbruggstrasse 105, CH-6340 Baar, Switzerland
------------------------------------------------------------------
Given data:
Username: {user.username}
E-Mail: {user.email}
</f:section>
...@@ -9,6 +9,7 @@ $EM_CONF[$_EXTKEY] = array( ...@@ -9,6 +9,7 @@ $EM_CONF[$_EXTKEY] = array(
'constraints' => array( 'constraints' => array(
'depends' => array( 'depends' => array(
'typo3' => '8.7.0-8.99.99', 'typo3' => '8.7.0-8.99.99',
't3olayout' => '0.1.0-',
'fluid_styled_content' => '7.6.0-8.99.99' 'fluid_styled_content' => '7.6.0-8.99.99'
), ),
'conflicts' => array( 'conflicts' => array(
...@@ -26,5 +27,5 @@ $EM_CONF[$_EXTKEY] = array( ...@@ -26,5 +27,5 @@ $EM_CONF[$_EXTKEY] = array(
'author' => 'Stefan Busemann', 'author' => 'Stefan Busemann',
'author_email' => 'stefan.busemann@typo3.org', 'author_email' => 'stefan.busemann@typo3.org',
'author_company' => 'typo3', 'author_company' => 'typo3',
'version' => '0.0.1', 'version' => '0.0.2',
); );
...@@ -2,3 +2,22 @@ ...@@ -2,3 +2,22 @@
#### DEPENDENCIES #### #### DEPENDENCIES ####
###################### ######################
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:femanager/Configuration/TypoScript/Main/constants.txt"> <INCLUDE_TYPOSCRIPT: source="FILE:EXT:femanager/Configuration/TypoScript/Main/constants.txt">
#########################
#### local constants ####
#########################
plugin.tx_femanager.settings.adminName = TYPO3 Association / typo3.org Administration
plugin.tx_femanager.settings.adminEmail = info@typo3.org
plugin.tx_femanager.persistence.storagePid = 7
###############
### PageIds ###
###############
# cat=T3Omy Page-Settings/page/001; type=string; label = Page with message, after create a profile
tx_t3omy.page.createMessage = 1
# 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 =
# cat=T3Omy Page-Settings/page/003; type=string; label = Page with message, after profile was activated
tx_t3omy.page.activateMessage =
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