Fixed aboslute paths not working for file uploads

terminal42 · Dec 1, 2021 · d2070fc · d2070fc · Acta2000 · Feb 24, 2022
1 parent df188ab
commit d2070fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/library/NotificationCenter/Util/Form.php b/library/NotificationCenter/Util/Form.php
@@ -25,12 +25,8 @@ public static function getFileUploadPathForToken(array $file)
     {
         // Check if it has been saved by Contao and thus moved to it's final destination already
         if (isset($file['uploaded']) && $file['uploaded'] === true) {
-            $basePath = TL_ROOT . '/';
-            if (preg_match('/^' . preg_quote($basePath, '/') . '/', $file['tmp_name'])
-                && file_exists($file['tmp_name'])
-            ) {
-
-                return str_replace($basePath, '', $file['tmp_name']);
+            if (file_exists($file['tmp_name'])) {
+                return $file['tmp_name'];
             }
 
             return null;

diff --git a/library/NotificationCenter/Util/StringUtil.php b/library/NotificationCenter/Util/StringUtil.php
@@ -76,6 +76,11 @@ public static function getTokenAttachments($strAttachmentTokens, array $arrToken
             $strParsedToken = \Haste\Util\StringUtil::recursiveReplaceTokensAndTags($strToken, $arrTokens, static::NO_TAGS | static::NO_BREAKS);
 
             foreach (trimsplit(',', $strParsedToken) as $strFile) {
+                if (is_file($strFile)) {
+                    $arrAttachments[$strFile] = $strFile;
+                    continue;
+                }
+
                 $strFileFull = TL_ROOT . '/' . $strFile;
 
                 if (is_file($strFileFull)) {