Merge branch '16-integrate-e-mail-templates' into 'develop'

Resolve "Integrate E-Mail Templates"

Closes #16

See merge request !1

html/typo3conf/LocalConfiguration.php

@@ -22,10 +22,27 @@ return [
     'EXT' => [
         '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:"";}',
+            'belog' => 'a:0:{}',
+            'beuser' => 'a:0:{}',
+            'documentation' => 'a: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:"0";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:"0";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:"0";s:12:"keepFEGroups";s:1:"0";s:11:"enableFESSO";s:1:"0";}',
+            'info' => 'a:0:{}',
+            'info_pagetsconfig' => 'a:0:{}',
+            'recycler' => 'a: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;}}',
             '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' => [

html/typo3conf/ext/t3omy/Configuration/TypoScript/femanager.txt

 plugin.tx_femanager {
+	view {
+		templateRootPaths.3 = EXT:t3omy/Resources/Private/Templates/Femanager/
+		layoutRootPaths.3 = EXT:t3omy/Resources/Private/Templates/Femanager/
+	}
 	settings {
 		new {
 			validation {
 				terms.required = 1
 				name.required = 1
 			}
+			requestRedirect = TEXT
+			requestRedirect {
+            parameter = {$plugin.tx_t3omy.page.createMessage}
+            returnLast = url
+         }
 		}
 	}
 }
+
+page.includeJSFooter.femanagerValidation >

html/typo3conf/ext/t3omy/Resources/Private/Templates/Femanager/Email/CreateUserConfirmation.html

+<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>

html/typo3conf/ext/t3omy/Resources/Private/Templates/Femanager/Email/CreateUserNotify.html

+<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>

html/typo3conf/ext/t3omy/Resources/Private/Templates/Femanager/Email/CreateUserSecondConfirmation.html

+<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>

html/typo3conf/ext/t3omy/ext_typoscript_constants.txt

@@ -2,3 +2,22 @@
 #### DEPENDENCIES ####
 ######################
 <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 =