Compatibility 9.5 with changes from agendartobias

Classes/Controller/AddressController.php

@@ -235,7 +235,7 @@ protected function errorAction()
      * action form only
      *
      * @param Address $newAddress
-     * @dontvalidate $newAddress
+     * @ignorevalidation $newAddress
      * @return void
      */
     public function formOnlyAction(Address $newAddress = NULL)
@@ -247,7 +247,7 @@ public function formOnlyAction(Address $newAddress = NULL)
      * action new
      *
      * @param Address $newAddress
-     * @dontvalidate $newAddress
+     * @ignorevalidation $newAddress
      * @return void
      */
     public function newAction(Address $newAddress = NULL)

Configuration/TCA/Overrides/sys_template.php

@@ -0,0 +1,5 @@
+<?php
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+ExtensionManagementUtility::addStaticFile('registeraddress', 'Configuration/TypoScript', 'registerttaddress');

Configuration/TCA/Overrides/tt_content.php

@@ -1,6 +1,28 @@
 <?php
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
+
 defined('TYPO3_MODE') or die();
 
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['registeraddress_registerform'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('registeraddress_registerform',
+ExtensionManagementUtility::addPiFlexFormValue('registeraddress_registerform',
     'FILE:EXT:registeraddress/Configuration/FlexForms/flexform_registration.xml');
+
+ExtensionUtility::registerPlugin(
+    'registeraddress',
+    'Registerform',
+    'Registration Form'
+);
+
+ExtensionUtility::registerPlugin(
+    'registeraddress',
+    'RegisterformRedirect',
+    'Registration Form (only redirects)'
+);
+
+ExtensionUtility::registerPlugin(
+    'registeraddress',
+    'RegisterformUnsubscribe',
+    'Registration Form to unsubscribe'
+);

Resources/Private/Language/de.locallang.xlf

@@ -84,7 +84,7 @@ Name: %1s %2s
 E-Mail: %3s</target>
 			</trans-unit>
 			<trans-unit id="form.approve.errortext" xml:space="preserve">
-				<target>Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
+				<target>Die Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
 			</trans-unit>
 			<trans-unit id="form.approve.submitButton" xml:space="preserve">
 				<target>zustimmen</target>
@@ -93,10 +93,10 @@ E-Mail: %3s</target>
 				<target>Sie sind nun vom Newsletter abgemeldet.</target>
 			</trans-unit>
 			<trans-unit id="form.delete.errortext" xml:space="preserve">
-				<target>Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
+				<target>Die Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
 			</trans-unit>
 			<trans-unit id="form.delete.submitButton" xml:space="preserve">
-				<target>Dem löschen zustimmen</target>
+				<target>Dem Löschen zustimmen</target>
 			</trans-unit>
 
 			<trans-unit id="form.edit.saveButton" xml:space="preserve">
@@ -106,7 +106,7 @@ E-Mail: %3s</target>
 				<target>Newsletter abbestellen</target>
 			</trans-unit>
 			<trans-unit id="form.edit.errortext" xml:space="preserve">
-				<target>Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
+				<target>Die Adresse konnte nicht in unserer Datenbank gefunden werden.</target>
 			</trans-unit>
 			<trans-unit id="form.info.text" xml:space="preserve">
 				<target>Eine E-Mail mit den Daten wurde an Sie gesendet.</target>
@@ -133,9 +133,15 @@ Versuchen Sie es bitte erneut.</target>
 			<trans-unit id="mail.info.editLinkText" xml:space="preserve">
 				<target>Bitte klicken Sie folgenden Link, um Ihre Daten zu bearbeiten:</target>
 			</trans-unit>
+			<trans-unit id="mail.info.editLink" xml:space="preserve">
+				<target>Bearbeiten</target>
+			</trans-unit>
 			<trans-unit id="mail.info.deleteLinkText" xml:space="preserve">
 				<target>Bitte klicken Sie folgenden Link, um Ihre Anmeldung zu löschen:</target>
 			</trans-unit>
+			<trans-unit id="mail.info.deleteLink" xml:space="preserve">
+				<target>Anmeldung löschen</target>
+			</trans-unit>
 			<trans-unit id="mail.info.subjectsuffix" xml:space="preserve">
 				<target>Newsletter-Information</target>
 			</trans-unit>
@@ -149,12 +155,21 @@ Versuchen Sie es bitte erneut.</target>
 			<trans-unit id="mail.registration.approveLinkText" xml:space="preserve">
 				<target>Bitte bestätigen Sie Ihre Anmeldung mit Klick auf folgenden Link:</target>
 			</trans-unit>
+			<trans-unit id="mail.registration.approveLink" xml:space="preserve">
+				<target>Bestätigen</target>
+			</trans-unit>
 			<trans-unit id="mail.registration.deleteLinkText" xml:space="preserve">
 				<target>Wenn Sie sich nicht für den Newsletter anmelden wollen, dann klicken Sie bitte folgenden Link:</target>
 			</trans-unit>
+			<trans-unit id="mail.registration.deleteLink" xml:space="preserve">
+				<target>Anmeldung widerrufen</target>
+			</trans-unit>
 			<trans-unit id="mail.registration.editLinkText" xml:space="preserve">
 				<target>Wenn Sie Ihre persönlichen Daten ändern wollen, dann klicken Sie bitte folgenden Link:</target>
 			</trans-unit>
+			<trans-unit id="mail.registration.editLink" xml:space="preserve">
+				<target>Daten ändern</target>
+			</trans-unit>
 			<trans-unit id="mail.registration.subjectsuffix" xml:space="preserve">
 				<target>Newsletter-Registrierung</target>
 			</trans-unit>
@@ -199,8 +214,7 @@ Versuchen Sie es bitte erneut.</target>
 			</trans-unit>
 
 			<trans-unit id="mail.registration.consentText" xml:space="preserve">
-				<source>You will apply the following consent.</source>
-					<target>Sie stimmen den folgenden Bedingungen zu.</target>
+                <target>Sie stimmen den folgenden Bedingungen zu.</target>
 			</trans-unit>
 
 		</body>

Resources/Private/Language/de.locallang_db.xlf

@@ -40,13 +40,10 @@
 				<source>Consent</source>
 				<target>Einwilligung</target>
 			</trans-unit>
-
 			<trans-unit id="flexforms.consent">
-				<source>Einwilligungstext</source>
-				<target>Consent text</target>
+				<source>Consent text</source>
+				<target>Einwilligungstext</target>
 			</trans-unit>
-
-
 		</body>
 	</file>
 </xliff>

Resources/Private/Language/locallang.xlf

@@ -17,13 +17,13 @@
 				<source>Mr</source>
 			</trans-unit>
 			<trans-unit id="tx_registeraddress_domain_model_address.gender.f" xml:space="preserve">
-				<source>Mrs</source>
+				<source>Ms</source>
 			</trans-unit>
 			<trans-unit id="tx_registeraddress_domain_model_address.first_name" xml:space="preserve">
 				<source>First name</source>
 			</trans-unit>
 			<trans-unit id="tx_registeraddress_domain_model_address.middle_name" xml:space="preserve">
-				<source>Middle Vorname</source>
+				<source>Middle name</source>
 			</trans-unit>
 			<trans-unit id="tx_registeraddress_domain_model_address.last_name" xml:space="preserve">
 				<source>Last name</source>
@@ -41,7 +41,7 @@
 				<source>Dear Mrs </source>
 			</trans-unit>
 			<trans-unit id="salutationgeneration.onlyfirstname" xml:space="preserve">
-				<source>Hallo </source>
+				<source>Hello </source>
 			</trans-unit>
 			<trans-unit id="salutationgeneration.other" xml:space="preserve">
 				<source>Dear Reader</source>
@@ -124,7 +124,7 @@ Please try again.</source>
 				<source>Mr</source>
 			</trans-unit>
 			<trans-unit id="mail.gender.f" xml:space="preserve">
-				<source>Mrs</source>
+				<source>Ms</source>
 			</trans-unit>
 
 			<trans-unit id="mail.info.greet" xml:space="preserve">
@@ -133,9 +133,15 @@ Please try again.</source>
 			<trans-unit id="mail.info.editLinkText" xml:space="preserve">
 				<source>Please click the following link to edit your data:</source>
 			</trans-unit>
+			<trans-unit id="mail.info.editLink" xml:space="preserve">
+				<source>Edit data</source>
+			</trans-unit>
 			<trans-unit id="mail.info.deleteLinkText" xml:space="preserve">
 				<source>Please click the following link to delete your registration:</source>
 			</trans-unit>
+			<trans-unit id="mail.info.deleteLink" xml:space="preserve">
+				<source>Delete registration</source>
+			</trans-unit>
 			<trans-unit id="mail.info.subjectsuffix" xml:space="preserve">
 				<source>Newsletter-Information</source>
 			</trans-unit>
@@ -149,12 +155,21 @@ Please try again.</source>
 			<trans-unit id="mail.registration.approveLinkText" xml:space="preserve">
 				<source>Please confirm your subscription by clicking on the following link:</source>
 			</trans-unit>
+			<trans-unit id="mail.registration.approveLink" xml:space="preserve">
+				<source>Confirm</source>
+			</trans-unit>
 			<trans-unit id="mail.registration.deleteLinkText" xml:space="preserve">
 				<source>If you do not want to subscribe for the newsletter, please click the following link:</source>
 			</trans-unit>
+			<trans-unit id="mail.registration.deleteLink" xml:space="preserve">
+				<source>Reject subscription</source>
+			</trans-unit>
 			<trans-unit id="mail.registration.editLinkText" xml:space="preserve">
 				<source>If you want to change your personal data, please click the following link:</source>
 			</trans-unit>
+			<trans-unit id="mail.registration.editLink" xml:space="preserve">
+				<source>Change data</source>
+			</trans-unit>
 			<trans-unit id="mail.registration.subjectsuffix" xml:space="preserve">
 				<source>Newsletter-Subscription</source>
 			</trans-unit>
@@ -202,7 +217,6 @@ Please try again.</source>
 				<source>You will apply the following consent.</source>
 			</trans-unit>
 
-
 		</body>
 	</file>
 </xliff>

Resources/Private/Language/locallang_db.xlf

@@ -31,15 +31,12 @@
 			<trans-unit id="tx_registeraddress_domain_model_address.consent">
 				<source>Consent</source>
 			</trans-unit>
-
 			<trans-unit id="tt_address.tx_extbase_type.Tx_Registeraddress_Address">
 				<source>registerttaddress Address</source>
 			</trans-unit>
-
 			<trans-unit id="flexforms.consent">
-				<source>Einwilligungstext</source>
+				<source>Consent text</source>
 			</trans-unit>
-
 		</body>
 	</file>
 </xliff>

Resources/Private/Templates/Address/Approve.html

@@ -17,7 +17,7 @@
 	<f:then>
 		<f:if condition="{doApprove}">
 			<f:then>
-				<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+				<p><f:translate key="form.approve.approvetext" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
 			</f:then>
 			<f:else>
 				<f:form action="approve" arguments="{hash: hash}">

Resources/Private/Templates/Address/Create.html

@@ -15,11 +15,11 @@
 	<f:then>
 		<f:if condition="{alreadyExists}">
 			<f:then>
-				<p><f:translate key="form.create.alreadyexists" htmlEscape="false" /><br />
+				<p><f:translate key="form.create.alreadyexists" /><br />
 					<f:link.action action="information" arguments="{email: oldAddress.email, uid: oldAddress}" pageUid="{settings.pagewithform}"><f:translate key="form.create.alreadyexistsLinktext" /></f:link.action></p>
 			</f:then>
 			<f:else>
-				<p><f:translate key="form.create.approvetext" htmlEscape="false" arguments="{0: address.email}" /></p>
+				<p><f:translate key="form.create.approvetext" arguments="{0: address.email}" /></p>
 			</f:else>
 		</f:if>
 	</f:then>

Resources/Private/Templates/Address/Delete.html

@@ -17,7 +17,7 @@
 	<f:then>
 		<f:if condition="{doDelete}">
 			<f:then>
-				<p><f:translate key="form.delete.text" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+				<p><f:translate key="form.delete.text" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
 			</f:then>
 			<f:else>
 				<f:form action="delete" arguments="{hash: hash}">

Resources/Private/Templates/Address/Information.html

@@ -18,7 +18,7 @@
 		<p><f:translate key="form.info.text" /></p>
 	</f:then>
 	<f:else>
-		<p><f:translate key="form.info.error" htmlEscape="false" /></p>
+		<p><f:translate key="form.info.error" /></p>
 	</f:else>
 </f:if>
 

Resources/Private/Templates/Address/MailNewsletterInformation.html

@@ -3,9 +3,9 @@
 </p>
 <p>
 	{f:translate(key:'mail.info.editLinkText')}
-	{f:link.action(action: 'edit', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.info.editLink') -> f:link.action(action: 'edit', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>
 <p>
 	{f:translate(key:'mail.info.deleteLinkText')}
-	{f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.info.deleteLink') -> f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>

Resources/Private/Templates/Address/MailNewsletterRegistration.html

@@ -2,21 +2,21 @@
 	{f:translate(key:'mail.registration.greet')} {f:translate(key:'mail.gender.{address.gender}')} {address.firstName} {address.lastName}
 </p>
 <p>
-	{f:translate(key:'mail.registration.text', htmlEscape:0)}
+	{f:translate(key:'mail.registration.text')}
 </p>
 <div>
 	{f:translate(key:'mail.registration.consentText')}
 	{address.consent -> f:format.html(parseFuncTSPath:"plugin.tx_registeraddress.lib.parseFunc_HTML")}
 </div>
 <p>
 	{f:translate(key:'mail.registration.approveLinkText')}
-	{f:link.action(action: 'approve', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.registration.approveLink') -> f:link.action(action: 'approve', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>
 <p>
 	{f:translate(key:'mail.registration.deleteLinkText')}
-	{f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.registration.deleteLink') -> f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>
 <p>
 	{f:translate(key:'mail.registration.editLinkText')}
-	{f:link.action(action: 'edit', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.registration.editLink') -> f:link.action(action: 'edit', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>

Resources/Private/Templates/Address/MailNewsletterRegistration.txt

@@ -1,6 +1,6 @@
 {f:translate(key:'mail.registration.greet')} {f:translate(key:'mail.gender.{address.gender}')} {address.firstName} {address.lastName}
 
-{f:translate(key:'mail.registration.text', htmlEscape:0)}
+{f:translate(key:'mail.registration.text')}
 
 {f:translate(key:'mail.registration.consentText')}
 {address.consent -> f:format.html(parseFuncTSPath:"plugin.tx_registeraddress.lib.parseFunc_PLAIN") -> f:format.stripTags()}

Resources/Private/Templates/Address/MailNewsletterUnsubscribe.html

@@ -3,5 +3,5 @@
 </p>
 <p>
 	{f:translate(key:'mail.info.deleteLinkText')}
-	{f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
+	{f:translate(key:'mail.info.deleteLink') -> f:link.action(action: 'delete', arguments: {hash: hash}, controller: 'Address', extensionName: 'registeraddress', pluginName: 'registerform', noCacheHash: 1, pageUid: settings.pagewithform, absolute: 1) -> f:format.htmlentitiesDecode()}
 </p>