In progress

Author: tatevikg1

resources/translations/messages.en.xlf

@@ -79,8 +79,8 @@
             </trans-unit>
 
             <trans-unit id="identity.subscription_confirmation">
-                <source>Please confirm your subscription</source>
-                <target>Please confirm your subscription</target>
+                <source>Request for confirmation</source>
+                <target>Request for confirmation</target>
             </trans-unit>
 
             <trans-unit id="identity.subscription_confirmation.text">

src/Domain/Configuration/Model/ConfigOption.php

@@ -8,4 +8,7 @@ enum ConfigOption: string
 {
     case MaintenanceMode = 'maintenancemode';
     case SendSubscribeMessage = 'subscribemessage';
+
+    case SubscribeEmailSubject = 'subscribesubject';
+    case SubscribeEmailBody = 'subscribemessage';
 }

src/Domain/Configuration/Repository/ConfigRepository.php

@@ -8,4 +8,8 @@
 
 class ConfigRepository extends AbstractRepository
 {
+    public function findValueByItem(string $name): ?string
+    {
+        return $this->findOneBy(['item' => $name])?->getValue();
+    }
 }

src/Domain/Configuration/Service/PlaceholderResolver.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Configuration\Service;
+
+class PlaceholderResolver
+{
+    /** @var array<string, callable():string> */
+    private array $providers = [];
+
+    public function register(string $token, callable $provider): void
+    {
+        // tokens like [UNSUBSCRIBEURL] (case-insensitive)
+        $this->providers[strtoupper($token)] = $provider;
+    }
+
+    public function resolve(?string $input): ?string
+    {
+        if ($input === null || $input === '') return $input;
+
+        // Replace [TOKEN] (case-insensitive). Keep simple & fast:
+        return preg_replace_callback('/\[(\w+)\]/i', function ($m) {
+            $key = strtoupper($m[1]);
+            if (!isset($this->providers[$key])) {
+                return $m[0]; // leave as-is
+            }
+            $val = (string) ($this->providers[$key])();
+            return $val; // no auto-added spaces
+        }, $input);
+    }
+}

src/Domain/Configuration/Service/Provider/ConfigProvider.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Repository\ConfigRepository;
+use Psr\SimpleCache\CacheInterface;
 
 class ConfigProvider
 {
@@ -15,11 +16,11 @@ class ConfigProvider
         ConfigOption::SendSubscribeMessage,
     ];
 
-    private ConfigRepository $configRepository;
-
-    public function __construct(ConfigRepository $configRepository)
-    {
-        $this->configRepository = $configRepository;
+    public function __construct(
+        private readonly ConfigRepository $configRepository,
+        private readonly CacheInterface $cache,
+        private readonly int $ttlSeconds = 300
+    ) {
     }
 
     public function isEnabled(ConfigOption $key): bool
@@ -35,11 +36,35 @@ public function isEnabled(ConfigOption $key): bool
     /**
      * Get configuration value by its key
      */
-    public function getValue(string $ikey, ?string $default = null): ?string
+    public function getValue(ConfigOption $key, ?string $default = null): ?string
     {
-        $config = $this->configRepository->findOneBy(['item' => $ikey]);
+        if (in_array($key, $this->booleanValues)) {
+            throw new InvalidArgumentException('Key is a boolean value, use isEnabled instead');
+        }
+        $cacheKey = 'cfg:' . $key->value;
+        $value = $this->cache->get($cacheKey);
+        if ($value === null) {
+            $value = $this->configRepository->findValueByItem($key->value);
+            $this->cache->set($cacheKey, $value, $this->ttlSeconds);
+        }
 
-        return $config?->getValue() ?? $default;
+        return $value ?? $default;
     }
 
+    public function getValueWithNamespace(ConfigOption $key, ?string $default = null): ?string
+    {
+        $full = $this->getValue($key);
+        if ($full !== null && $full !== '') {
+            return $full;
+        }
+
+        if (str_contains($key->value, ':')) {
+            [$parent] = explode(':', $key->value, 2);
+            $parentKey = ConfigOption::from($parent);
+
+            return $this->getValue($parentKey, $default);
+        }
+
+        return $default;
+    }
 }

src/Domain/Configuration/Service/UrlBuilder.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Configuration\Service;
+
+class UrlBuilder
+{
+    public function withUid(string $baseUrl, string $uid): string
+    {
+        $parts = parse_url($baseUrl) ?: [];
+        $query = [];
+        if (!empty($parts['query'])) {
+            parse_str($parts['query'], $query);
+        }
+        $query['uid'] = $uid;
+
+        $parts['query'] = http_build_query($query);
+
+        // rebuild url
+        $scheme   = $parts['scheme'] ?? 'https';
+        $host     = $parts['host'] ?? '';
+        $port     = isset($parts['port']) ? ':'.$parts['port'] : '';
+        $path     = $parts['path'] ?? '';
+        $queryStr = $parts['query'] ? '?'.$parts['query'] : '';
+        $frag     = isset($parts['fragment']) ? '#'.$parts['fragment'] : '';
+
+        return "{$scheme}://{$host}{$port}{$path}{$queryStr}{$frag}";
+    }
+}

src/Domain/Configuration/Service/UserPersonalizer.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Configuration\Service;
+
+class UserPersonalizer
+{
+    public function __construct(
+        private ConfigService $config,
+        private UrlBuilder $urlBuilder,
+        private UserRepository $users,
+        private AttributeService $attributes // getUserAttributeValues()
+    ) {}
+
+    public function personalize(string $value, int $userId): string
+    {
+        $user = $this->users->findById($userId);
+        if (!$user) {
+            return $value;
+        }
+
+        $resolver = new PlaceholderResolver();
+
+        $resolver->register('EMAIL', fn() => $user->email);
+
+        $resolver->register('UNSUBSCRIBEURL', function () use ($user) {
+            $base = $this->config->getString(ConfigOption::unsubscribeurl) ?? '';
+            return $this->urlBuilder->withUid($base, $user->uniqid);
+        });
+        $resolver->register('CONFIRMATIONURL', function () use ($user) {
+            $base = $this->config->getString(ConfigOption::confirmationurl) ?? '';
+            return $this->urlBuilder->withUid($base, $user->uniqid);
+        });
+        $resolver->register('PREFERENCESURL', function () use ($user) {
+            $base = $this->config->getString(ConfigOption::preferencesurl) ?? '';
+            return $this->urlBuilder->withUid($base, $user->uniqid);
+        });
+
+        // global tokens available here too if you want a single pass:
+        $resolver->register('SUBSCRIBEURL', fn() => $this->config->getString(ConfigOption::subscribeurl) ?? '');
+        $resolver->register('DOMAIN',        fn() => $this->config->getString(ConfigOption::domain) ?? '');
+        $resolver->register('WEBSITE',       fn() => $this->config->getString(ConfigOption::website) ?? '');
+
+        // attribute placeholders (e.g., [FIRSTNAME], [CITY], etc.)
+        $attrs = $this->attributes->forEmail($user->email); // returns array<string,string>
+        foreach ($attrs as $k => $v) {
+            $resolver->register(strtoupper($k), fn() => $v);
+        }
+
+        $out = $resolver->resolve($value);
+        return $out !== null ? trim($out) : $out;
+    }
+}

src/Domain/Messaging/MessageHandler/SubscriberConfirmationMessageHandler.php

@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Messaging\MessageHandler;
 
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Messaging\Message\SubscriberConfirmationMessage;
 use PhpList\Core\Domain\Messaging\Service\EmailService;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -18,12 +20,18 @@ class SubscriberConfirmationMessageHandler
 {
     private EmailService $emailService;
     private TranslatorInterface $translator;
+    private ConfigProvider $configProvider;
     private string $confirmationUrl;
 
-    public function __construct(EmailService $emailService, TranslatorInterface $translator, string $confirmationUrl)
-    {
+    public function __construct(
+        EmailService $emailService,
+        TranslatorInterface $translator,
+        ConfigProvider $configProvider,
+        string $confirmationUrl
+    ) {
         $this->emailService = $emailService;
         $this->translator = $translator;
+        $this->configProvider = $configProvider;
         $this->confirmationUrl = $confirmationUrl;
     }
 
@@ -33,8 +41,10 @@ public function __construct(EmailService $emailService, TranslatorInterface $tra
     public function __invoke(SubscriberConfirmationMessage $message): void
     {
         $confirmationLink = $this->generateConfirmationLink($message->getUniqueId());
-
-        $subject = $this->translator->trans('Please confirm your subscription');
+        $subject = $this->configProvider->getValue(
+            key: ConfigOption::SubscribeEmailSubject,
+            default: $this->translator->trans('Request for confirmation')
+        );
 
         $textContent = $this->translator->trans(
             "Thank you for subscribing!\n\n" .

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -210,7 +210,7 @@ private function sendSubscribeEmail(string $subscriberEmail, array $listIds): vo
         }
         $listOfLists = implode(', ', $listNames);
 
-        $subject = $this->configProvider->getValue('subscribesubject', 'Subscription');
+        $subject =
         $message = $this->configProvider->getValue('subscribemessage', 'You have been subscribed to: [LISTS]');
         $message = str_replace('[LISTS]', $listOfLists, (string)$message);