check if token is valid, added translations

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.23.5] - 2022-07-14
+- Changed: added some translations to token check
+- Fixed: missing token validation check
+
 ## [1.23.4] - 2022-06-30
 - Fixed: issue on sending messages with notification center queue
 

classes/EventListener/GeneratePageListener.php

@@ -64,6 +64,10 @@ public function __invoke(PageModel $pageModel, LayoutModel $layout, PageRegular
             $this->errorRedirect('Token already confirmed!', $form);
         }
 
+        if (!$token->isValid()) {
+            $this->errorRedirect('Token is expired or no longer valid.', $form);
+        }
+
         // Valid token, do confirm process
 
         $token->confirm();
@@ -136,6 +140,8 @@ private function errorRedirect(string $errorCode, FormModel $form = null): void
         }
 
         Input::setGet('token', null);
-        throw new PageNotFoundException('Invalid token!  (Error: '.$errorCode.')');
+        throw new PageNotFoundException(
+            ($GLOBALS['TL_LANG']['ERR']['submission']['invalidToken'] ?? 'Invalid token!').'  (Error: '.$errorCode.')'
+        );
     }
 }

languages/de/default.php

@@ -10,3 +10,6 @@
 $GLOBALS['TL_LANG']['MSC']['salutation']['male']   = 'Herr';
 $GLOBALS['TL_LANG']['MSC']['salutation']['female'] = 'Frau';
 $GLOBALS['TL_LANG']['MSC']['salutation']['divers'] = 'Divers';
+
+
+$GLOBALS['TL_LANG']['ERR']['submission']['invalidToken'] = 'Ungültiger Bestätigungslink!';

languages/en/default.php

@@ -3,3 +3,5 @@
 $GLOBALS['TL_LANG']['MSC']['salutation']['male']   = 'Mr.';
 $GLOBALS['TL_LANG']['MSC']['salutation']['female'] = 'Mrs.';
 $GLOBALS['TL_LANG']['MSC']['salutation']['divers'] = 'Divers';
+
+$GLOBALS['TL_LANG']['ERR']['submission']['invalidToken'] = 'Invalid confirmation link!';