[FEATURE] TYPO3 11.5 release

proudnerds-typo3 · Nov 18, 2021 · 7cecb8d · 7cecb8d
1 parent 2828a53
commit 7cecb8d
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 37 deletions.
diff --git a/Classes/Controller/SubscriptionlistController.php b/Classes/Controller/SubscriptionlistController.php
@@ -4,8 +4,10 @@
 
 use Proudnerds\Laposta\Domain\Model\Subscriptionlist;
 use Proudnerds\Laposta\Domain\Repository\SubscriptionlistRepository;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
+use TYPO3\CMS\Core\Http\NormalizedParams;
 use TYPO3\CMS\Core\Log\LogLevel;
 use TYPO3\CMS\Core\Http\RequestFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -61,7 +63,7 @@ public function injectRequestFactory(RequestFactory $requestFactory)
      * @param array|null $messages
      * @return void
      */
-    public function subscribeAction(array $messages = null)
+    public function subscribeAction(array $messages = null): ResponseInterface
     {
         $lists = null;
 
@@ -77,6 +79,8 @@ public function subscribeAction(array $messages = null)
             'lists' => $lists,
             'messages' => $messages
         ]);
+
+        return $this->htmlResponse();
     }
 
     /**
@@ -85,7 +89,7 @@ public function subscribeAction(array $messages = null)
      * @param array|null $messages
      * @return void
      */
-    public function unsubscribeAction(array $messages = null)
+    public function unsubscribeAction(array $messages = null): ResponseInterface
     {
         $lists = null;
 
@@ -101,6 +105,8 @@ public function unsubscribeAction(array $messages = null)
             'lists' => $lists,
             'messages' => $messages
         ]);
+
+        return $this->htmlResponse();
     }
 
     /**
@@ -111,13 +117,19 @@ public function unsubscribeAction(array $messages = null)
      * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function restAction()
+    public function restAction(): ResponseInterface
     {
         $messages = [];
         $arguments = $this->request->getArguments();
         $crudAction = htmlspecialchars($arguments['crudAction']);
         $ip = GeneralUtility::getIndpEnv('REMOTE_ADDR');
-        $sourceUrl = $this->request->getRequestUri();
+
+        $request = $GLOBALS['TYPO3_REQUEST'];
+
+        /** @var NormalizedParams $normalizedParams */
+        $normalizedParams = $request->getAttribute('normalizedParams');
+        $sourceUrl = $normalizedParams->getRequestUrl();
+
         $enableLog = false;
         if ($this->settings['enableLog'] === '1') {
             $enableLog = true;
@@ -127,7 +139,6 @@ public function restAction()
         if (!$arguments['laposta.important']) {
             $customFieldLabel = htmlspecialchars($this->settings['customFieldNameStartsWith']);
             $ip = GeneralUtility::getIndpEnv('REMOTE_ADDR');
-            $sourceUrl = $this->request->getRequestUri();
 
             // Get all the custom fields, these fields the customer can create in Laposta administration
             // You can add any fields in the template, just put customFieldLabel before each fieldname

diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
@@ -13,3 +13,4 @@ ChangeLog
 
 * 1.0.0 Initial release on Github
 * 10.4.0 Release in TER
+* 11.5.0 Release for TYPO3 11.5
diff --git a/Documentation/Installation/Index.rst b/Documentation/Installation/Index.rst
@@ -10,7 +10,7 @@ Installation
 
 Target group: **Administrators / Integrators**
 
-* composer req proudnerds-typo3/laposta
+* composer req proudnerds/laposta
 * include the typoscript template
 * add to editor backend user groups
 * add the Laposta apiKey in constants settings

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -27,7 +27,7 @@ project     = Laposta
 # ...   (recommended) version, displayed next to title (desktop) and in <meta name="book-version"
 # .................................................................................
 
-release     = 10.4.0
+release     = 11.5.0
 
 # .................................................................................
 # ...  (recommended) displayed in footer

diff --git a/Resources/Private/Language/nl.locallang.xlf b/Resources/Private/Language/nl.locallang.xlf
@@ -25,22 +25,22 @@
 				<target>Afmelden</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.warning.email" resname="tx_laposta.warning.email">
-				<target>Voer svp uw e-mail in</target>
+				<target>Voer svp uw e-mailadres in</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.warning.lists" resname="tx_laposta.warning.lists">
-				<target>Kies tenminste één nieuwsbrief</target>
+				<target>Kies 1 of meerdere nieuwsbrieven</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.warning.network" resname="tx_laposta.warning.network">
 				<target>Er ging iets mis, informeer ons svp</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.warning.emailregistered" resname="tx_laposta.warning.emailregistered">
-				<target>U bent al aangemeld met dit e-mail adres voor onze nieuwsbrief</target>
+				<target>U bent al aangemeld met dit e-mailadres voor onze nieuwsbrief</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.message.subscribed" resname="tx_laposta.message.subscribed">
 				<target>Bedankt voor uw aanmelding voor onze nieuwsbrief</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.message.doubleOptinSubscribed" resname="tx_laposta.message.doubleOptinSubscribed">
-				<target>Bedankt, we hebben uw aanmelding ontvangen voor onze nieuwsbrief</target>
+				<target>We hebben uw aanmelding ontvangen en sturen u een e-mail. Bevestig uw aanmelding door op de link in de e-mail te klikken</target>
 			</trans-unit>
 			<trans-unit id="tx_laposta.message.emailVerification" resname="tx_laposta.message.emailVerification">
 				<target>Check svp uw e-mail om uw aanmelding te bevestigen</target>

diff --git a/Resources/Private/Templates/Subscriptionlist/Subscribe.html b/Resources/Private/Templates/Subscriptionlist/Subscribe.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
 <f:layout name="Default"/>
 <f:section name="content">
-    <f:form action="rest" name="subscription" class="laposta-form laposta-subscribe">
+    <f:form action="rest" name="subscription" class="laposta-form laposta-subscribe" id="laposta-form">
         <f:if condition="{lists}">
             <f:then>
                 <f:if condition="{messages}">
@@ -20,21 +20,24 @@
                         <div class="form-check">
                             <f:form.checkbox name="list_{iterator.cycle}" value="{list.uid}" id="list_{iterator.cycle}" class="form-check-input"/>
                             <label class="form-check-label" for="list_{iterator.cycle}">{list.listLabel}</label>
+                            <f:if condition="{list.info}">
+                                <div class="laposta-info">{list.info}</div>
+                            </f:if>
                         </div>
                     </f:for>
                 </div>
 
                 <div class="form-group">
                     <label class="form-check-label" for="tx_laposta-email">
                         {f:translate(key:'tx_laposta.email')}
-                        <abbr class="icon required" title="{f:translate(key:'tx_laposta.required')}">*</abbr>
+                        <abbr class="icon required" title="Verplicht veld">*</abbr>
                     </label>
-                    <f:form.textfield name="email" type="email" class="form-control" id="tx_laposta-email" additionalAttributes="{aria-required: 'true'}" required="1" />
+                    <f:form.textfield name="email" type="email" class="form-control" id="tx_laposta-email" additionalAttributes="{autocomplete: 'email'}" required="1" />
 
                     <label class="form-check-label" for="tx_laposta-firstname">{f:translate(key:'tx_laposta.firstname')}</label>
-                    <f:form.textfield name="customField.voornaam" class="form-control" id="tx_laposta-firstname"/>
+                    <f:form.textfield name="customField.voornaam" class="form-control" id="tx_laposta-firstname" additionalAttributes="{autocomplete: 'given-name'}" />
                     <label class="form-check-label" for="tx_laposta-lastname">{f:translate(key:'tx_laposta.lastname')}</label>
-                    <f:form.textfield name="customField.achternaam" class="form-control" id="tx_laposta-lastname"/>
+                    <f:form.textfield name="customField.achternaam" class="form-control" id="tx_laposta-lastname" additionalAttributes="{autocomplete: 'family-name'}" />
                 </div>
 
                 <f:form.hidden name="numberOfLists" value="{f:count(subject: lists)}"/>

diff --git a/Resources/Private/Templates/Subscriptionlist/Unsubscribe.html b/Resources/Private/Templates/Subscriptionlist/Unsubscribe.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
 <f:layout name="Default"/>
 <f:section name="content">
-    <f:form action="rest" name="subscription" class="laposta-form laposta-unsubscribe">
+    <f:form action="rest" name="subscription" class="laposta-form laposta-unsubscribe" id="laposta-form">
         <f:if condition="{lists}">
             <f:then>
                 <f:if condition="{messages}">
@@ -29,7 +29,7 @@
                         {f:translate(key:'tx_laposta.email')}
                         <abbr class="icon required" title="{f:translate(key:'tx_laposta.required')}">*</abbr>
                     </label>
-                    <f:form.textfield name="email" type="email" class="form-control" id="tx_laposta-email" additionalAttributes="{aria-required: 'true'}" required="1" />
+                    <f:form.textfield name="email" type="email" class="form-control" id="tx_laposta-email" additionalAttributes="{autocomplete: 'email'}" required="1" />
                 </div>
 
                 <f:form.hidden name="numberOfLists" value="{f:count(subject: lists)}"/>
@@ -42,4 +42,4 @@ <h3>No lists found!</h3>
         </f:if>
     </f:form>
 </f:section>
-</html>
+</html>
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "typo3/cms-core": "^10.4"
+        "typo3/cms-core": "^11.5"
     },
     "autoload": {
         "psr-4": {
@@ -32,4 +32,4 @@
             "extension-key": "laposta"
         }
     }
-}
+}
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -9,10 +9,10 @@
     'state' => 'stable',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '10.4.0',
+    'version' => '11.5.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.21-10.4.99',
+            'typo3' => '11.5.3-11.5.99',
         ],
         'conflicts' => [],
         'suggests' => [],

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -4,25 +4,17 @@
 call_user_func(
     function () {
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-            'Proudnerds.Laposta',
+            'Laposta',
             'Subscribe',
-            [
-                'Subscriptionlist' => 'subscribe, rest'
-            ],
-            [
-                'Subscriptionlist' => 'subscribe, rest'
-            ]
+            [\Proudnerds\Laposta\Controller\SubscriptionlistController::class => 'subscribe, rest'],
+            [\Proudnerds\Laposta\Controller\SubscriptionlistController::class => 'subscribe, rest']
         );
 
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-            'Proudnerds.Laposta',
+            'Laposta',
             'Unsubscribe',
-            [
-                'Subscriptionlist' => 'unsubscribe, rest'
-            ],
-            [
-                'Subscriptionlist' => 'unsubscribe, rest'
-            ]
+            [\Proudnerds\Laposta\Controller\SubscriptionlistController::class => 'unsubscribe, rest'],
+            [\Proudnerds\Laposta\Controller\SubscriptionlistController::class => 'unsubscribe, rest']
         );
 
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ ChangeLog

		* 1.0.0 Initial release on Github
		* 10.4.0 Release in TER
		* 11.5.0 Release for TYPO3 11.5