After review 0

Author: tatevikg1

config/parameters.yml.dist

@@ -132,3 +132,7 @@ parameters:
     env(FCKIMAGES_DIR): 'uploadimages'
     phplist.public_schema: '%%env(PUBLIC_SCHEMA)%%'
     env(PUBLIC_SCHEMA): 'https'
+    phplist.attachment_download_url: '%env(PHPLIST_ATTACHMENT_DOWNLOAD_URL)%'
+    env(PHPLIST_ATTACHMENT_DOWNLOAD_URL): 'https://example.com/download/'
+    phplist.attachment_repository_path: '%env(PHPLIST_ATTACHMENT_REPOSITORY_PATH)%'
+    env(PHPLIST_ATTACHMENT_REPOSITORY_PATH): '/tmp'

resources/translations/messages.en.xlf

@@ -774,9 +774,9 @@ Thank you.</target>
         <source>This message contains attachments that can be viewed with a webbrowser</source>
         <target>__This message contains attachments that can be viewed with a webbrowser</target>
       </trans-unit>
-      <trans-unit id="QLlIQQh" resname="Insufficient memory to add attachment to campaign %campaignId% %tatalSize% - %memLimit%">
-        <source>Insufficient memory to add attachment to campaign %campaignId% %tatalSize% - %memLimit%</source>
-        <target>__Insufficient memory to add attachment to campaign %campaignId% %tatalSize% - %memLimit%</target>
+      <trans-unit id="QLlIQQh" resname="Insufficient memory to add attachment to campaign %campaignId% %totalSize% - %memLimit%">
+        <source>Insufficient memory to add attachment to campaign %campaignId% %totalSize% - %memLimit%</source>
+        <target>__Insufficient memory to add attachment to campaign %campaignId% %totalSize% - %memLimit%</target>
       </trans-unit>
       <trans-unit id="HhEWxtR" resname="Add us to your address book">
         <source>Add us to your address book</source>

src/Domain/Common/FileHelper.php

@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Common;
 
+use Throwable;
+
 class FileHelper
 {
     public function isValidFile(string $path): bool
@@ -13,14 +15,47 @@ public function isValidFile(string $path): bool
 
     public function readFileContents(string $path): ?string
     {
-        $filePointer = fopen($path, 'r');
+        $filePointer = fopen($path, 'rb');
         if ($filePointer === false) {
             return null;
         }
 
-        $contents = fread($filePointer, filesize($path));
-        fclose($filePointer);
+        try {
+            $contents = stream_get_contents($filePointer);
+            if ($contents === false) {
+                return null;
+            }
+            return $contents;
+        } catch (Throwable) {
+            return null;
+        } finally {
+            fclose($filePointer);
+        }
+    }
+
+    public function writeFileToDirectory(string $directory, string $originalFilename, string $contents): ?string
+    {
+        $pathInfo = pathinfo($originalFilename);
+        $name = $pathInfo['filename'] === '' ? 'file' : $pathInfo['filename'];
+        $ext = $pathInfo['extension'] ?? '';
+
+        $newFile = tempnam($directory, $name);
+        if ($newFile === false) {
+            return null;
+        }
+
+        if ($ext !== '') {
+            $newFile .= '.' . $ext;
+        }
+        $relativeName = basename($newFile);
+
+        $fullPath = $directory . '/' . $relativeName;
+
+        $fileHandle = fopen($fullPath, 'w');
+
+        fwrite($fileHandle, $contents);
+        fclose($fileHandle);
 
-        return $contents === false ? null : $contents;
+        return $fullPath;
     }
 }

src/Domain/Configuration/Service/MessagePlaceholderProcessor.php

@@ -29,7 +29,7 @@ public function __construct(
         private readonly iterable $patternResolvers,
         /** @var iterable<SupportingPlaceholderResolverInterface> */
         private readonly iterable $supportingResolvers,
-        #[Autowire('messaging.always_add_user_track')] private readonly bool $alwaysAddUserTrack,
+        #[Autowire('%messaging.always_add_user_track%')] private readonly bool $alwaysAddUserTrack,
     ) {
     }
 
@@ -61,12 +61,6 @@ public function process(
             name: 'ORGANIZATION_NAME',
             resolver: fn(PlaceholderContext $ctx) => $this->config->getValue(ConfigOption::OrganisationName) ?? ''
         );
-        $resolver->register(
-            name: 'CONTACTURL',
-            resolver: fn(PlaceholderContext $ctx) => htmlspecialchars(
-                $this->config->getValue(ConfigOption::VCardUrl) ?? ''
-            )
-        );
 
         foreach ($this->placeholderResolvers as $placeholderResolver) {
             $resolver->register($placeholderResolver->name(), $placeholderResolver);
@@ -100,33 +94,33 @@ public function process(
         );
     }
 
-    private function appendContent(string $message, string $append): string
-    {
-        if (preg_match('#</body>#i', $message)) {
-            $message = preg_replace('#</body>#i', $append . '</body>', $message);
-        } else {
-            $message .= $append;
-        }
-
-        return $message;
-    }
-
     private function ensureStandardPlaceholders(string $value, OutputFormat $format): string
     {
-        if (!strpos($value, '[FOOTER]')) {
+        if (!str_contains($value, '[FOOTER]')) {
             $sep = $format === OutputFormat::Html ? '<br />' : "\n\n";
             $value = $this->appendContent($value, $sep . '[FOOTER]');
         }
 
-        if (!strpos($value, '[SIGNATURE]')) {
+        if (!str_contains($value, '[SIGNATURE]')) {
             $sep = $format === OutputFormat::Html ? ' ' : "\n";
             $value = $this->appendContent($value, $sep . '[SIGNATURE]');
         }
 
-        if ($this->alwaysAddUserTrack && $format === OutputFormat::Html && !strpos($value, '[USERTRACK]')) {
+        if ($this->alwaysAddUserTrack && $format === OutputFormat::Html && !str_contains($value, '[USERTRACK]')) {
             $value = $this->appendContent($value, '[USERTRACK]');
         }
 
         return $value;
     }
+
+    private function appendContent(string $message, string $append): string
+    {
+        if (preg_match('#</body>#i', $message)) {
+            $message = preg_replace('#</body>#i', $append . '</body>', $message);
+        } else {
+            $message .= $append;
+        }
+
+        return $message;
+    }
 }

src/Domain/Configuration/Service/Placeholder/BlacklistUrlValueResolver.php

@@ -24,7 +24,7 @@ public function name(): string
 
     public function __invoke(PlaceholderContext $ctx): string
     {
-        $base = $this->config->getValue(ConfigOption::UnsubscribeUrl) ?? '';
+        $base = $this->config->getValue(ConfigOption::BlacklistUrl) ?? '';
         $url = $this->urlBuilder->withEmail($base, $ctx->getUser()->getEmail());
 
         if ($ctx->isHtml()) {

src/Domain/Configuration/Service/Placeholder/ContactUrlValueResolver.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Configuration\Service\Placeholder;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Configuration\Model\Dto\PlaceholderContext;
+
+final class ContactUrlValueResolver implements PlaceholderValueResolverInterface
+{
+    public function __construct(private readonly ConfigProvider $config)
+    {
+    }
+
+    public function name(): string
+    {
+        return 'CONTACTURL';
+    }
+
+    public function __invoke(PlaceholderContext $ctx): string
+    {
+        if ($ctx->isText()) {
+            return $this->config->getValue(ConfigOption::VCardUrl) ?? '';
+        }
+
+        return htmlspecialchars($this->config->getValue(ConfigOption::VCardUrl) ?? '');
+    }
+}

src/Domain/Configuration/Service/Placeholder/FooterValueResolver.php

@@ -28,6 +28,6 @@ public function __invoke(PlaceholderContext $ctx): string
             return stripslashes($ctx->messagePrecacheDto->footer);
         }
 
-        return $this->config->getValue(ConfigOption::ForwardFooter);
+        return $this->config->getValue(ConfigOption::ForwardFooter) ?? '';
     }
 }

src/Domain/Configuration/Service/Placeholder/ForwardUrlValueResolver.php

@@ -34,6 +34,6 @@ public function __invoke(PlaceholderContext $ctx): string
             );
         }
 
-        return sprintf('%s%suid=%s&mid=%d ', $url, $sep, $ctx->getUser()->getUniqueId(), $ctx->messageId());
+        return sprintf('%s%suid=%s&mid=%d', $url, $sep, $ctx->getUser()->getUniqueId(), $ctx->messageId());
     }
 }

src/Domain/Configuration/Service/Placeholder/PreferencesUrlValueResolver.php

@@ -25,7 +25,12 @@ public function __invoke(PlaceholderContext $ctx): string
         $sep = !str_contains($url, '?') ? '?' : '&';
 
         if ($ctx->isHtml()) {
-            return sprintf('%s%suid=%s', $url, htmlspecialchars($sep), $ctx->getUser()->getUniqueId());
+            return sprintf(
+                '%s%suid=%s',
+                htmlspecialchars($url, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'),
+                htmlspecialchars($sep),
+                $ctx->getUser()->getUniqueId(),
+            );
         }
 
         return sprintf('%s%suid=%s', $url, $sep, $ctx->getUser()->getUniqueId());

src/Domain/Configuration/Service/Placeholder/SignatureValueResolver.php

@@ -25,13 +25,13 @@ public function __invoke(PlaceholderContext $ctx): string
     {
         if ($ctx->isHtml()) {
             if ($this->emailTextCredits) {
-                return $this->config->getValue(ConfigOption::PoweredByText);
+                return $this->config->getValue(ConfigOption::PoweredByText) ?? '';
             }
 
             return preg_replace(
                 '/src=".*power-phplist.png"/',
                 'src="powerphplist.png"',
-                $this->config->getValue(ConfigOption::PoweredByImage)
+                $this->config->getValue(ConfigOption::PoweredByImage) ?? ''
             );
         }