Release 5.2.3 with feature recipient list by sys_dmail_category

Classes/DirectMailUtility.php

@@ -274,6 +274,12 @@ protected static function addUserPass(string $url, array $params): string
     public static function getFullUrlsForDirectMailRecord(array $row): array
     {
         // Finding the domain to use
+        if (!$_SERVER['HTTP_HOST']) {
+            // In CLI / Scheduler context, $_SERVER['HTTP_HOST'] can be null
+            $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
+            $site = $siteFinder->getSiteByPageId((int)$row['page']);
+            $_SERVER['HTTP_HOST'] = $site->getBase()->getHost();
+        }
         $result = [
             'baseUrl' => self::getTypolinkURL((int)$row['page']),
             'htmlUrl' => '',

Classes/Dmailer.php

@@ -247,8 +247,8 @@ public function prepare(array $row): void
         }
 
         //$this->encoding          = $row['encoding'];
-        $this->theParts          = unserialize(base64_decode($row['mailContent']));
-        $this->messageid         = $this->theParts['messageid'];
+        $this->theParts          = unserialize(base64_decode((string)$row['mailContent'])) ?: [];
+        $this->messageid         = $this->theParts['messageid'] ?? 0;
         $this->subject           = $this->ensureCorrectEncoding($row['subject']);
         $this->fromEmail         = $row['from_email'];
         $this->fromName          = $this->ensureCorrectEncoding($row['from_name']);
@@ -262,7 +262,7 @@ public function prepare(array $row): void
         $this->dmailer['sectionBoundary']    = '<!--DMAILER_SECTION_BOUNDARY';
         $this->dmailer['html_content']       = $this->theParts['html']['content'] ?? '';
         $this->dmailer['plain_content']      = $this->theParts['plain']['content'] ?? '';
-        $this->dmailer['messageID']          = $this->theParts['messageid'];
+        $this->dmailer['messageID']          = $this->theParts['messageid'] ?? 0;
         $this->dmailer['sys_dmail_uid']      = $row['uid'];
         $this->dmailer['sys_dmail_rec']      = $row;
         $this->dmailer['boundaryParts_html'] = explode($this->dmailer['sectionBoundary'], '_END-->' . $this->dmailer['html_content']);
@@ -354,7 +354,7 @@ protected function replaceMailMarkers(string $content, array $recipRow, array $m
     public function sendAdvanced(array $recipientRow, string $tableNameChar): int
     {
         $returnCode = 0;
-        $recipientRow = array_map('htmlspecialchars', $recipientRow);
+        $recipientRow = array_map(function($a) { return @htmlspecialchars($a); }, $recipientRow);
 
         // Workaround for strict checking of email addresses in TYPO3
         // (trailing newline = invalid address)
@@ -417,7 +417,17 @@ public function sendAdvanced(array $recipientRow, string $tableNameChar): int
             $this->dmailer['sys_dmail_rec']['return_path'] = str_replace('###XID###', $midRidId, $this->dmailer['sys_dmail_rec']['return_path']);
 
             if ($returnCode) {
-                $recipient = $this->createRecipient($recipientRow['email'], $this->ensureCorrectEncoding($recipientRow['name']));
+                $recipientName = $recipientRow['name'] ?? '';
+                if ($recipientName == '') {
+                    if ($recipientRow['first_name'] ?? '') {
+                        $recipientName = $recipientRow['first_name'] . ' ';
+                    }
+                    if ($recipientRow['middle_name'] ?? '') {
+                        $recipientName .= $recipientRow['middle_name'] . ' ';
+                    }
+                    $recipientName .= $recipientRow['last_name'] ?? '';
+                }
+                $recipient = $this->createRecipient($recipientRow['email'], $this->ensureCorrectEncoding($recipientName));
                 $this->sendTheMail($recipient, $recipientRow);
             }
         }
@@ -506,7 +516,10 @@ public function getListOfRecipentCategories(string $table, int $uid): string
             return '';
         }
 
-        $relationTable = $GLOBALS['TCA'][$table]['columns']['module_sys_dmail_category']['config']['MM'];
+        $relationTable = $GLOBALS['TCA'][$table]['columns']['module_sys_dmail_category']['config']['MM'] ?? null;
+        if ($relationTable === null) {
+            return '';
+        }
 
         $rows = GeneralUtility::makeInstance(TempRepository::class)->getListOfRecipentCategories($table, $relationTable, $uid);
 
@@ -864,7 +877,7 @@ protected function setContent(MailMessage $mailer): void
         if ((int)$this->dmailer['sys_dmail_rec']['attachment'] > 0) {
             $files = DirectMailUtility::getAttachments((int)$this->dmailer['sys_dmail_rec']['uid']);
             foreach ($files as $file) {
-                $mailer->attachFromPath($file->getForLocalProcessing());
+                $mailer->attachFromPath($file->getForLocalProcessing(), $file->getName());
             }
         }
     }
@@ -886,7 +899,7 @@ protected function sendTheMail(Address $recipient, array $recipientRow = null):
         }
 
         if (GeneralUtility::validEmail($this->dmailer['sys_dmail_rec']['return_path'])) {
-            $mailer->sender($this->dmailer['sys_dmail_rec']['return_path']);
+            $mailer->returnPath($this->dmailer['sys_dmail_rec']['return_path']);
         }
 
         // TODO: setContent should set the images (includeMedia) or add attachment
@@ -989,7 +1002,7 @@ protected function substHREFsInHTML(): void
             return;
         }
         foreach ($this->theParts['html']['hrefs'] as $urlId => $val) {
-            if ($val['no_jumpurl']) {
+            if ($val['no_jumpurl'] ?? false) {
                 // A tag attribute "no_jumpurl=1" allows to disable jumpurl for custom links
                 $substVal = $val['absRef'];
             } elseif ($this->jumperURLPrefix && ($val['tag'] != 'form') && (!strstr($val['ref'], 'mailto:'))) {
@@ -1243,7 +1256,7 @@ public function extractHyperLinks(): void
         // get all media and search for use_jumpurl then add it to the hrefs array
         $this->extractMediaLinks();
         foreach ($this->theParts['html']['media'] as $mediaData) {
-            if ($mediaData['use_jumpurl'] === 1) {
+            if (($mediaData['use_jumpurl'] ?? null) === 1) {
                 $this->theParts['html']['hrefs'][$mediaData['ref']] = $mediaData;
             }
         }

Classes/Importer.php

@@ -211,9 +211,9 @@ public function displayImport(): array
         }
 
         // check if "email" is mapped
+		$error = [];
         if (isset($stepCurrent) && $stepCurrent === 'startImport') {
             $map = $this->indata['map'];
-            $error = [];
             // check noMap
             $newMap = ArrayUtility::removeArrayEntryByValue(array_unique($map), 'noMap');
             if (empty($newMap)) {
@@ -227,6 +227,9 @@ public function displayImport(): array
         }
 
         $out = '';
+		if(!isset($stepCurrent)) {
+			$stepCurrent = '';
+		}
         switch ($stepCurrent) {
             case 'conf':
                 $output['conf']['show'] = true;
@@ -269,7 +272,7 @@ public function displayImport(): array
                     ['val' =>'name', 'text' => 'name'],
                 ];
 
-                $output['conf']['disableInput'] = $this->params['inputDisable'] == 1 ? true : false;
+                $output['conf']['disableInput'] = ($this->params['inputDisable'] ?? 0) == 1 ? true : false;
 
                 // show configuration
                 $output['subtitle'] = $this->getLanguageService()->getLL('mailgroup_import_header_conf');
@@ -279,10 +282,10 @@ public function displayImport(): array
                 $output['conf']['storageSelected'] = $this->indata['storage'] ?? '';
 
                 // remove existing option
-                $output['conf']['remove_existing'] = !$this->indata['remove_existing'] ? false : true;
+                $output['conf']['remove_existing'] = !($this->indata['remove_existing'] ?? false) ? false : true;
 
                 // first line in csv is to be ignored
-                $output['conf']['first_fieldname'] = !$this->indata['first_fieldname'] ? false : true;
+                $output['conf']['first_fieldname'] = !($this->indata['first_fieldname'] ?? false) ? false : true;
 
                 // csv separator
                 $output['conf']['delimiter'] = $optDelimiter;
@@ -293,13 +296,13 @@ public function displayImport(): array
                 $output['conf']['encapsulationSelected'] = $this->indata['encapsulation'] ?? '';
 
                 // import only valid email
-                $output['conf']['valid_email'] = !$this->indata['valid_email'] ? false : true;
+                $output['conf']['valid_email'] = !($this->indata['valid_email'] ?? false) ? false : true;
 
                 // only import distinct records
-                $output['conf']['remove_dublette'] = !$this->indata['remove_dublette'] ? false : true;
+                $output['conf']['remove_dublette'] = !($this->indata['remove_dublette'] ?? false) ? false : true;
 
                 // update the record instead renaming the new one
-                $output['conf']['update_unique'] = !$this->indata['update_unique'] ? false : true;
+                $output['conf']['update_unique'] = !($this->indata['update_unique'] ?? false) ? false : true;
 
                 // which field should be use to show uniqueness of the records
                 $output['conf']['record_unique'] = $optUnique;
@@ -320,7 +323,7 @@ public function displayImport(): array
                 $output['mapping']['remove_dublette'] = $this->indata['remove_dublette'];
                 $output['mapping']['update_unique'] = $this->indata['update_unique'];
                 $output['mapping']['record_unique'] = $this->indata['record_unique'];
-                $output['mapping']['all_html'] = !$this->indata['all_html'] ? false : true;
+                $output['mapping']['all_html'] = !($this->indata['all_html'] ?? false) ? false : true;
                 $output['mapping']['error'] = $error;
 
                 // show charset selector
@@ -386,7 +389,7 @@ public function displayImport(): array
                     $output['mapping']['table'][] = [
                         'mapping_description' => $csv_firstRow[$i],
                         'mapping_i' => $i,
-                        'mapping_mappingSelected' => $this->indata['map'][$i],
+                        'mapping_mappingSelected' => $this->indata['map'][$i] ?? '',
                         'mapping_value' => $exampleLines,
                     ];
                 }
@@ -427,8 +430,8 @@ public function displayImport(): array
                 $output['startImport']['remove_dublette'] = $this->indata['remove_dublette'];
                 $output['startImport']['update_unique'] = $this->indata['update_unique'];
                 $output['startImport']['record_unique'] = $this->indata['record_unique'];
-                $output['startImport']['all_html'] = !$this->indata['all_html'] ? false : true;
-                $output['startImport']['add_cat'] = $this->indata['add_cat'] ? true : false;
+                $output['startImport']['all_html'] = !($this->indata['all_html'] ?? false) ? false : true;
+                $output['startImport']['add_cat'] = ($this->indata['add_cat'] ?? false) ? true : false;
 
                 $output['startImport']['error'] = $error;
 
@@ -454,7 +457,7 @@ public function displayImport(): array
 
                 foreach ($endOrder as $order) {
                     $rowsTable = [];
-                    if (is_array($result[$order])) {
+                    if (is_array($result[$order] ?? false)) {
                         foreach ($result[$order] as $v) {
                             $mapKeys = array_keys($v);
                             $rowsTable[] = [
@@ -471,12 +474,12 @@ public function displayImport(): array
                 }
 
                 // back button
-                if (is_array($this->indata['map'])) {
+                if (is_array($this->indata['map'] ?? false)) {
                     foreach ($this->indata['map'] as $fieldNr => $fieldMapped) {
                         $output['startImport']['hiddenMap'][] = ['name' => htmlspecialchars('CSV_IMPORT[map][' . $fieldNr . ']'), 'value' => htmlspecialchars($fieldMapped)];
                     }
                 }
-                if (is_array($this->indata['cat'])) {
+                if (is_array($this->indata['cat'] ?? false)) {
                     foreach ($this->indata['cat'] as $k => $catUid) {
                         $output['startImport']['hiddenCat'][] = ['name' => htmlspecialchars('CSV_IMPORT[cat][' . $k . ']'), 'value' => htmlspecialchars($catUid)];
                     }
@@ -487,8 +490,7 @@ public function displayImport(): array
             default:
                 // show upload file form
                 $output['subtitle'] = $this->getLanguageService()->getLL('mailgroup_import_header_upload');
-
-                if (($this->indata['mode'] === 'file') && !(((strpos($currentFileInfo['file'], 'import') === false) ? 0 : 1) && ($currentFileInfo['realFileext'] === 'txt'))) {
+                if ((($this->indata['mode'] ?? '') === 'file') && !(((strpos($currentFileInfo['file'], 'import') === false) ? 0 : 1) && ($currentFileInfo['realFileext'] === 'txt'))) {
                     $output['upload']['current'] = true;
                     $file = $this->getFileById((int)$this->indata['newFileUid']);
                     if (is_object($file)) {
@@ -510,8 +512,8 @@ public function displayImport(): array
                 $output['upload']['csv'] = htmlspecialchars($this->indata['csv'] ?? '');
                 $output['upload']['target'] = htmlspecialchars($this->userTempFolder());
                 $output['upload']['target_disabled'] = GeneralUtility::_POST('importNow') ? 'disabled' : '';
-                $output['upload']['newFile'] = $this->indata['newFile'];
-                $output['upload']['newFileUid'] = $this->indata['newFileUid'];
+                $output['upload']['newFile'] = $this->indata['newFile'] ?? '';
+                $output['upload']['newFileUid'] = $this->indata['newFileUid'] ?? 0;
         }
 
         $output['title'] = $this->getLanguageService()->getLL('mailgroup_import') . BackendUtility::cshItem($this->cshTable ?? '', 'mailgroup_import');
@@ -726,7 +728,7 @@ public function doImport(array $csvData): array
          * Hook for doImport Mail
          * will be called every time a record is inserted
          */
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail/mod3/class.tx_directmail_recipient_list.php']['doImport'])) {
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail/mod3/class.tx_directmail_recipient_list.php']['doImport'] ?? false)) {
             $hookObjectsArr = [];
             foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail/mod3/class.tx_directmail_recipient_list.php']['doImport'] as $classRef) {
                 $hookObjectsArr[] = GeneralUtility::makeInstance($classRef);
@@ -756,7 +758,7 @@ public function addDataArray(array &$data, $id, array $dataArray): void
         if ($this->indata['all_html']) {
             $data['tt_address'][$id]['module_sys_dmail_html'] = $this->indata['all_html'];
         }
-        if (is_array($this->indata['cat']) && !in_array('cats', $this->indata['map'])) {
+        if (is_array($this->indata['cat'] ?? false) && !in_array('cats', $this->indata['map'])) {
             foreach ($this->indata['cat'] as $k => $v) {
                 $data['tt_address'][$id]['module_sys_dmail_category'][$k] = $v;
             }

Classes/Middleware/JumpurlController.php

@@ -85,15 +85,17 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         if ($this->shouldProcess()) {
             $mailId = (int)$this->request->getQueryParams()['mid'];
-            $submittedRecipient = (string)$this->request->getQueryParams()['rid'];
-            $submittedAuthCode  = $this->request->getQueryParams()['aC'];
-            $jumpurl = $this->request->getQueryParams()['jumpurl'];
+            $submittedRecipient = isset($this->request->getQueryParams()['rid']) ? (string)$this->request->getQueryParams()['rid'] : '';
+            $submittedAuthCode  = $this->request->getQueryParams()['aC'] ?? '';
+            $jumpurl = $this->request->getQueryParams()['jumpurl'] ?? '';
 
             $urlId = 0;
             if (MathUtility::canBeInterpretedAsInteger($jumpurl)) {
                 $urlId = $jumpurl;
                 $this->initDirectMailRecord($mailId);
                 $this->initRecipientRecord($submittedRecipient);
+                $rid = $this->recipientRecord['uid'] ?? 0;
+
                 $jumpurl = $this->getTargetUrl((int)$jumpurl);
 
                 // try to build the ready-to-use target url
@@ -123,7 +125,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 }
 
                 // to count the dmailerping correctly, we need something unique
-                $recipientUid = $submittedAuthCode;
+                $submittedAuthCode = preg_replace("/[^a-zA-Z0-9]/", "", $submittedAuthCode);
             }
 
             if ($this->responseType !== 0) {
@@ -134,7 +136,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     'response_type' => $this->responseType,
                     'url_id'        => (int)$urlId,
                     'rtbl'          => mb_substr($this->recipientTable, 0, 1),
-                    'rid'           => (int)($recipientUid ?? $this->recipientRecord['uid']),
+                    'rid'           => $rid ?? $submittedAuthCode,
                 ];
                 $sysDmailMaillogRepository = GeneralUtility::makeInstance(SysDmailMaillogRepository::class);
                 if ($sysDmailMaillogRepository->hasRecentLog($mailLogParams) === false) {
@@ -177,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($this->directMailRecord['mailContent']),
+                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));
         }
@@ -261,7 +266,7 @@ protected function substituteUserMarkersFromTargetUrl(string $targetUrl): string
             if (isset($this->recipientRecord[$substField])) {
                 $processedTargetUrl = str_replace(
                     '###USER_' . $substField . '###',
-                    $this->recipientRecord[$substField],
+                    (string) $this->recipientRecord[$substField],
                     $processedTargetUrl
                 );
             }