[BUGFIX] Fix statistics error when url can't be received

Classes/Container.php

@@ -28,7 +28,6 @@
  */
 class Container
 {
-
     public $boundaryStartWrap = '<!--DMAILER_SECTION_BOUNDARY_ | -->';
     public $boundaryEnd = '<!--DMAILER_SECTION_BOUNDARY_END-->';
 
@@ -79,14 +78,15 @@ public function insert_dMailer_boundaries($content, $conf = array())
                         $foreignTable,
                         $whereClause,
                         '',
-                        $orderBy);
+                        $orderBy
+                    );
 
                     if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
                         while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                             $categoryList .= $row['uid'] . ',';
                         }
                         $GLOBALS['TYPO3_DB']->sql_free_result($res);
-                        $categoryList = rtrim($categoryList, ",");
+                        $categoryList = rtrim($categoryList, ',');
                     }
                 }
                 // wrap boundaries around content

Classes/Hooks/JumpurlController.php

@@ -125,7 +125,6 @@ public function preprocessRequest($parameter, $parentObject)
                                     $_POST['pass'] = $recipRow['password'];
                                     $_POST['pid']  = $recipRow['pid'];
                                     $_POST['logintype'] = 'login';
-                                    $GLOBALS['TSFE']->initFEuser();
                                 }
                             } else {
                                 throw new \Exception('authCode: Calculated authCode did not match the submitted authCode.', 1376899631);
@@ -144,14 +143,14 @@ public function preprocessRequest($parameter, $parentObject)
                 }
             } else {
                 // jumpUrl is not an integer -- then this is a URL, that means that the "dmailerping"
-                    // functionality was used to count the number of "opened mails" received (url, dmailerping)
+                // functionality was used to count the number of "opened mails" received (url, dmailerping)
 
-                    // Check if jumpurl is a valid link to a "dmailerping.gif"
-                    // Make $checkPath an absolute path pointing to dmailerping.gif so it can get checked via ::isAllowedAbsPath()
-                    // and remove an eventual "/" at beginning of $jumpurl (because PATH_site already contains "/" at the end)
+                // Check if jumpurl is a valid link to a "dmailerping.gif"
+                // Make $checkPath an absolute path pointing to dmailerping.gif so it can get checked via ::isAllowedAbsPath()
+                // and remove an eventual "/" at beginning of $jumpurl (because PATH_site already contains "/" at the end)
                 $checkPath = PATH_site . preg_replace('#^/#', '', $jumpurl);
 
-                    // Now check if $checkPath is a valid path and points to a "/dmailerping.gif"
+                // Now check if $checkPath is a valid path and points to a "/dmailerping.gif"
                 if (preg_match('#/dmailerping\\.(gif|png)$#', $checkPath) && GeneralUtility::isAllowedAbsPath($checkPath)) {
                     // set juHash as done for external_url in core: http://forge.typo3.org/issues/46071
                     GeneralUtility::_GETset(GeneralUtility::hmac($jumpurl, 'jumpurl'), 'juHash');

Classes/Hooks/TtnewsPlaintextHook.php

@@ -107,7 +107,7 @@ public function extraCodesProcessor(&$invokingObj)
                 );
             $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
             $GLOBALS['TYPO3_DB']->sql_free_result($res);
-                // get the translated record if the content language is not the default language
+            // get the translated record if the content language is not the default language
             if ($GLOBALS['TSFE']->sys_language_content) {
                 $OLmode = ($this->sys_language_mode == 'strict'?'hideNonTranslated':'');
                 $row = $GLOBALS['TSFE']->sys_page->getRecordOverlay('tt_news', $row, $GLOBALS['TSFE']->sys_language_content, $OLmode);
@@ -116,19 +116,19 @@ public function extraCodesProcessor(&$invokingObj)
                 // Render the title
                 $lines[] = $this->renderPlainText->renderHeader($row['title']);
 
-                    // Render author of the tt_news record
+                // Render author of the tt_news record
                 $lines[] = $this->renderAuthor($row);
 
-                    // Render the short version of the tt_news record
+                // Render the short version of the tt_news record
                 $lines[] = $this->renderPlainText->breakContent(strip_tags($this->renderPlainText->parseBody($row['short'], 'tt_news_short')));
 
-                    // Render the main text of the tt_news record
+                // Render the main text of the tt_news record
                 $lines[] = $this->renderPlainText->breakContent(strip_tags($this->renderPlainText->parseBody($row['bodytext'], 'tt_news_bodytext')));
 
-                    // Render the images of the tt_news record.
+                // Render the images of the tt_news record.
                 $lines[] = $this->getImages($row);
 
-                    // Render the downloads of the tt_news record.
+                // Render the downloads of the tt_news record.
                 $lines[] = $this->renderPlainText->renderUploads($row['news_files']);
             } elseif ($this->sys_language_mode == 'strict' && $this->tt_news_uid) {
                 $noTranslMsg = $this->cObj->stdWrap($invokingObj->pi_getLL('noTranslMsg', 'Sorry, there is no translation for this news-article'), $this->conf['noNewsIdMsg_stdWrap.']);
@@ -139,7 +139,7 @@ public function extraCodesProcessor(&$invokingObj)
                 $content = implode(LF, $lines).$content;
             }
 
-                // Substitute labels
+            // Substitute labels
             if (!empty($content)) {
                 $markerArray = array();
                 $markerArray = $this->renderPlainText->addLabelsMarkers($markerArray);
@@ -223,6 +223,6 @@ public function renderAuthor($row, $type=0)
                 return implode(LF, $lines);
             }
         }
-        return "";
+        return '';
     }
 }

Classes/Hooks/TypoScriptFrontendController.php

@@ -42,7 +42,7 @@ public function simulateUsergroup($parameters, \TYPO3\CMS\Frontend\Controller\Ty
         $accessToken = GeneralUtility::_GET('access_token');
         if ($directMailFeGroup > 0 && DirectMailUtility::validateAndRemoveAccessToken($accessToken)) {
             if ($typoScriptFrontendController->fe_user->user) {
-                $typoScriptFrontendController->fe_user->user[$this->$typoScriptFrontendController->usergroup_column] = $directMailFeGroup;
+                $typoScriptFrontendController->fe_user->user[$typoScriptFrontendController->usergroup_column] = $directMailFeGroup;
             } else {
                 $typoScriptFrontendController->fe_user->user = array(
                     $typoScriptFrontendController->fe_user->usergroup_column => $directMailFeGroup

Classes/Importer.php

@@ -18,6 +18,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\File\BasicFileUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 
 /**
  * Recipient list module for tx_directmail extension
@@ -102,10 +103,10 @@ public function cmd_displayImport()
         // merge it with inData, but inData has priority.
         $this->indata = $this->indata + $this->params;
 
-//		$currentFileInfo = BasicFileUtility::getTotalFileInfo($this->indata['newFile']);
-//		$currentFileName = $currentFileInfo['file'];
-//		$currentFileSize = GeneralUtility::formatSize($currentFileInfo['size']);
-//		$currentFileMessage = $currentFileName . ' (' . $currentFileSize . ')';
+        //		$currentFileInfo = BasicFileUtility::getTotalFileInfo($this->indata['newFile']);
+        //		$currentFileName = $currentFileInfo['file'];
+        //		$currentFileSize = GeneralUtility::formatSize($currentFileInfo['size']);
+        //		$currentFileMessage = $currentFileName . ' (' . $currentFileSize . ')';
 
         if (empty($this->indata['csv']) && !empty($_FILES['upload_1']['name'])) {
             $this->indata['newFile'] = $this->checkUpload();
@@ -156,7 +157,7 @@ public function cmd_displayImport()
             }
         }
 
-        $out = "";
+        $out = '';
         switch ($stepCurrent) {
             case 'conf':
                 // get list of sysfolder
@@ -646,7 +647,7 @@ public function doImport(array $csvData)
             $mappedCSV = $filteredCSV['clean'];
         }
 
-            // array for the process_datamap();
+        // array for the process_datamap();
         $data = array();
         if ($this->indata['update_unique']) {
             $user = array();
@@ -805,7 +806,7 @@ public function makeDropdown($name, array $option, $selected, $disableInput='')
      *
      * @return	string		HTML code
      */
-    public function makeHidden($name, $value="")
+    public function makeHidden($name, $value='')
     {
         if (is_array($name)) {
             $hiddenFields = array();
@@ -830,7 +831,7 @@ public function readCSV()
     {
         ini_set('auto_detect_line_endings', true);
         $mydata = array();
-        $handle = fopen($this->indata['newFile'], "r");
+        $handle = fopen($this->indata['newFile'], 'r');
         $delimiter = $this->indata['delimiter'];
         $encaps = $this->indata['encapsulation'];
         $delimiter = ($delimiter === 'comma') ? ',' : $delimiter;
@@ -869,7 +870,7 @@ public function readExampleCSV($records=3)
         if (!is_file($this->indata['newFile']) && (strpos($this->indata['newFile'], PATH_site) === false)) {
             $this->indata['newFile'] = PATH_site . $this->indata['newFile'];
         }
-        $handle = fopen($this->indata['newFile'], "r");
+        $handle = fopen($this->indata['newFile'], 'r');
         $i = 0;
         $delimiter = $this->indata['delimiter'];
         $encaps = $this->indata['encapsulation'];
@@ -936,7 +937,7 @@ public function formatTable(array $tableLines, array $cellParams, $header, array
             $rowA = array();
             for ($k = 0; $k < count($r); $k++) {
                 $v = $r[$k];
-                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : "&nbsp;";
+                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : '&nbsp;';
                 if ($first) {
                     $v = '<B>' . $v . '</B>';
                 }
@@ -967,7 +968,9 @@ public function formatTable(array $tableLines, array $cellParams, $header, array
      */
     public function userTempFolder()
     {
-        return $tempFolder = 'fileadmin/_temp_/';
+        /** @var \TYPO3\CMS\Core\Resource\Folder $folder */
+        $folder = $GLOBALS['BE_USER']->getDefaultUploadTemporaryFolder();
+        return $folder->getPublicUrl();
     }
 
     /**
@@ -977,7 +980,7 @@ public function userTempFolder()
      */
     public function writeTempFile()
     {
-        $newfile = "";
+        $newfile = '';
         $userPermissions = $GLOBALS['BE_USER']->getFilePermissions();
 
         unset($this->fileProcessor);
@@ -992,7 +995,9 @@ public function writeTempFile()
         // Initializing:
         /* @var $fileProcessor \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility */
         $this->fileProcessor = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Utility\\File\\ExtendedFileUtility');
-        $this->fileProcessor->init($GLOBALS['FILEMOUNTS'], $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        if (version_compare(TYPO3_branch, '8.3', '<')) {
+            $this->fileProcessor->init($GLOBALS['FILEMOUNTS'], $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        }
         $this->fileProcessor->setActionPermissions($userPermissions);
         $this->fileProcessor->dontCheckForUnique = 1;
 
@@ -1061,7 +1066,9 @@ public function checkUpload()
         // Initializing:
         /* @var $fileProcessor \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility */
         $this->fileProcessor = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Utility\\File\\ExtendedFileUtility');
-        $this->fileProcessor->init($fm, $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        if (version_compare(TYPO3_branch, '8.3', '<')) {
+            $this->fileProcessor->init($fm, $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        }
         $this->fileProcessor->setActionPermissions();
         $this->fileProcessor->dontCheckForUnique = 1;
 
@@ -1073,6 +1080,7 @@ public function checkUpload()
             $this->fileProcessor->writeLog(0, 2, 1, 'Referer host "%s" and server host "%s" did not match!', array($refInfo['host'], $httpHost));
         } else {
             $this->fileProcessor->start($file);
+            $this->fileProcessor->setExistingFilesConflictMode(DuplicationBehavior::cast(DuplicationBehavior::REPLACE));
             $newfile = $this->fileProcessor->func_upload($file['upload']['1']);
         }
         return $newfile;

Classes/MailSelect.php

@@ -27,7 +27,6 @@
  */
 class MailSelect extends QueryGenerator
 {
-
     public $allowedTables = array('tt_address','fe_users');
 
     /**
@@ -43,11 +42,11 @@ public function mkTableSelect($name, $cur)
     {
         $out = '<select name="' . $name . '" onChange="submit();">';
         $out .= '<option value=""></option>';
-        reset($GLOBALS["TCA"]);
-        foreach ($GLOBALS["TCA"] as $tN => $_) {
-            if ($GLOBALS["BE_USER"]->check('tables_select', $tN) && in_array($tN, $this->allowedTables)) {
+        reset($GLOBALS['TCA']);
+        foreach ($GLOBALS['TCA'] as $tN => $_) {
+            if ($GLOBALS['BE_USER']->check('tables_select', $tN) && in_array($tN, $this->allowedTables)) {
                 $out .='<option value="' . $tN . '"' . ($tN == $cur ? ' selected':'') . '>' .
-                    $GLOBALS["LANG"]->sl($GLOBALS["TCA"][$tN]['ctrl']['title']) .
+                    $GLOBALS['LANG']->sl($GLOBALS['TCA'][$tN]['ctrl']['title']) .
                     '</option>';
             }
         }