Merge pull request #205 from kartolo/release/6.0.1

[TASK] release 6.0.1
kartolo · Sep 2, 2020 · 040340f · 040340f
2 parents e412aa7 + b93723a
commit 040340f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/Classes/Hooks/JumpurlController.php b/Classes/Hooks/JumpurlController.php
@@ -156,7 +156,7 @@ public function preprocessRequest($parameter, $parentObject)
                 $checkPath = Environment::getPublicPath() . '/' . ltrim($jumpurl, '/');
 
                 // Now check if $checkPath is a valid path and points to a "/dmailerping.gif"
-                if (preg_match('#/dmailerping\\.(gif|png)$#', $checkPath) && GeneralUtility::isAllowedAbsPath($checkPath)) {
+                if (preg_match('#/dmailerping\\.(gif|png)$#', $checkPath) && (GeneralUtility::isAllowedAbsPath($checkPath) || GeneralUtility::isValidUrl($jumpurl))) {
                     // set juHash as done for external_url in core: http://forge.typo3.org/issues/46071
                     GeneralUtility::_GETset(GeneralUtility::hmac($jumpurl, 'jumpurl'), 'juHash');
                     $responseType = -1;

diff --git a/Classes/Importer.php b/Classes/Importer.php
@@ -69,7 +69,7 @@ public function init(&$pObj)
         $this->parent = &$pObj;
 
         // get some importer default from pageTS
-        $this->params = BackendUtility::getPagesTSconfig(intval(GeneralUtility::_GP('id')))['mod.']['web_modules.']['dmail.']['importer'] ?? [];
+        $this->params = BackendUtility::getPagesTSconfig(intval(GeneralUtility::_GP('id')))['mod.']['web_modules.']['dmail.']['importer.'] ?? [];
     }
 
     /**

diff --git a/Classes/Module/Dmail.php b/Classes/Module/Dmail.php
@@ -992,7 +992,7 @@ public function cmd_send_mail($row)
                 $res = $queryBuilder
                     ->select('a.*')
                     ->from('tt_address', 'a')
-                    ->leftJoin('a', 'pages', 'p', $queryBuilder->expr()->eq('p.uid', $queryBuilder->quoteIdentifier('a.pid')))
+                    ->leftJoin('a', 'pages', 'pages', $queryBuilder->expr()->eq('pages.uid', $queryBuilder->quoteIdentifier('a.pid')))
                     ->where($queryBuilder->expr()->eq('a.uid', $queryBuilder->createNamedParameter((int)GeneralUtility::_GP('tt_address_uid'), \PDO::PARAM_INT)))
                     ->andWhere($this->perms_clause)
                     ->execute()

diff --git a/Configuration/TypoScript/plaintext/setup.txt b/Configuration/TypoScript/plaintext/setup.txt
@@ -4,7 +4,7 @@
 ## @version $Id:setup.txt 6012 2007-07-23 12:54:25 +0000 (Mo, 23 Jul 2007) ivankartolo $
 ##
 
-[globalVar = GP:type = 99]
+[request.getQueryParams()["type"] == 99]
 // add template path for fluid_styled_content
 lib.contentElement {
   templateRootPaths.100 = EXT:direct_mail/Resources/Private/Plaintext/FluidContentElement/Templates/
@@ -121,8 +121,3 @@ This page type is deprecated. Type 99 will show up correctly in your browser, to
 	typeNum=199
 	config.no_cache=1
 }
-
-// check the globalString if dam is loaded. If so then reference the media tag.
-[globalString = TYPO3_LOADED_EXT|dam|type = *]
-plugin.tx_directmail_pi1.bodytext.stdWrap.parseFunc.tags.media =< plugin.tx_dam_tsfemediatag
-[global]
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -2,7 +2,7 @@
 
 project = Direct mail system
 version = 6.0
-release = 6.0.0
+release = 6.0.1
 t3author = Ivan Kartolo
 copyright = 2002-2019
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -15,7 +15,7 @@
     'description' => 'Advanced Direct Mail/Newsletter mailer system with sophisticated options for personalization of emails including response statistics.',
     'category' => 'module',
     'shy' => 0,
-    'version' => '6.0.0',
+    'version' => '6.0.1',
     'dependencies' => 'cms,tt_address',
     'conflicts' => 'sr_direct_mail_ext,it_dmail_fix,plugin_mgm,direct_mail_123',
     'priority' => '',