fix: php warnings in JumpurlController

kartolo · Jun 8, 2023 · 6a06b25 · 6a06b25
1 parent a4922dd
commit 6a06b25
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/Classes/Middleware/JumpurlController.php b/Classes/Middleware/JumpurlController.php
@@ -86,8 +86,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         if ($this->shouldProcess()) {
             $mailId = (int)$this->request->getQueryParams()['mid'];
             $submittedRecipient = isset($this->request->getQueryParams()['rid']) ? (string)$this->request->getQueryParams()['rid'] : '';
-            $submittedAuthCode  = $this->request->getQueryParams()['aC'];
-            $jumpurl = $this->request->getQueryParams()['jumpurl'];
+            $submittedAuthCode  = $this->request->getQueryParams()['aC'] ?? '';
+            $jumpurl = $this->request->getQueryParams()['jumpurl'] ?? '';
 
             $urlId = 0;
             if (MathUtility::canBeInterpretedAsInteger($jumpurl)) {
@@ -179,25 +179,28 @@ protected function initDirectMailRecord(int $mailId): void
      * Fetches the target url from the direct mail record
      *
      * @param int $targetIndex
-     * @return string|null
+     * @return string
      */
-    protected function getTargetUrl(int $targetIndex): ?string
+    protected function getTargetUrl(int $targetIndex): string
     {
-        $targetUrl = null;
+        $targetUrl = '';
 
         if (!empty($this->directMailRecord)) {
             $mailContent = unserialize(
                 base64_decode((string)$this->directMailRecord['mailContent']),
                 ['allowed_classes' => false]
             );
-            if ($targetIndex >= 0) {
-                // Link (number)
-                $this->responseType = self::RESPONSE_TYPE_HREF;
-                $targetUrl = $mailContent['html']['hrefs'][$targetIndex]['absRef'];
-            } else {
-                // Link (number, plaintext)
-                $this->responseType = self::RESPONSE_TYPE_PLAIN;
-                $targetUrl = $mailContent['plain']['link_ids'][abs($targetIndex)];
+
+            if(is_array($mailContent)) {
+                if ($targetIndex >= 0) {
+                    // Link (number)
+                    $this->responseType = self::RESPONSE_TYPE_HREF;
+                    $targetUrl = $mailContent['html']['hrefs'][$targetIndex]['absRef'];
+                } else {
+                    // Link (number, plaintext)
+                    $this->responseType = self::RESPONSE_TYPE_PLAIN;
+                    $targetUrl = $mailContent['plain']['link_ids'][abs($targetIndex)];
+                }
             }
             $targetUrl = htmlspecialchars_decode(urldecode($targetUrl));
         }