Dev

config/parameters.yml.dist

@@ -37,6 +37,8 @@ parameters:
     env(REST_API_BASE_URL): 'http://api.phplist.local/api/v2'
     app.frontend_base_url: '%%env(FRONT_END_BASE_URL)%%'
     env(FRONT_END_BASE_URL): 'http://frontend.phplist.local'
+    parallel_use_with_phplist3: '%%env(parallel_use_with_phplist3)%%'
+    env(parallel_use_with_phplist3): '0'
 
     # Email configuration
     app.mailer_from: '%%env(MAILER_FROM)%%'
@@ -49,6 +51,8 @@ parameters:
     env(SUBSCRIPTION_CONFIRMATION_URL): 'http://api.phplist.local/api/v2/subscription/confirm/'
     app.password_reset_url: '%%env(PASSWORD_RESET_URL)%%'
     env(PASSWORD_RESET_URL): 'https://example.com/reset/'
+    app.show_unsubscribe_link: '%%env(SHOW_UNSUBSCRIBELINK)%%'
+    env(SHOW_UNSUBSCRIBELINK): '1'
 
     # bounce email settings
     imap_bounce.email: '%%env(BOUNCE_EMAIL)%%'

config/services/processor.yml

@@ -19,3 +19,5 @@ services:
   PhpList\Core\Bounce\Service\Processor\UnidentifiedBounceReprocessor: ~
 
   PhpList\Core\Bounce\Service\Processor\BounceDataProcessor: ~
+
+  PhpList\Core\Domain\Subscription\Service\SubscribePagePlaceholderProcessor: ~

config/services/services.yml

@@ -43,6 +43,14 @@ services:
     autoconfigure: true
     public: true
 
+  PhpList\Core\Domain\Subscription\Service\SubscribePageConfigMigrationService:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\Core\Domain\Subscription\Service\Manager\SubscribePageManager:
+    autowire: true
+    autoconfigure: true
+
   PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator:
     autowire: true
     autoconfigure: true

src/Domain/Configuration/Model/Dto/CreateConfigDto.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Configuration\Model\Dto;
+
+class CreateConfigDto
+{
+    public function __construct(
+        public readonly string $key,
+        public readonly string $value,
+        public readonly bool $editable,
+        public readonly ?string $type = null,
+    ) {
+    }
+}

src/Domain/Configuration/Repository/ConfigRepository.php

@@ -5,11 +5,21 @@
 namespace PhpList\Core\Domain\Configuration\Repository;
 
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
+use PhpList\Core\Domain\Configuration\Model\Config;
 
 class ConfigRepository extends AbstractRepository
 {
     public function findValueByItem(string $name): ?string
     {
         return $this->findOneBy(['key' => $name])?->getValue();
     }
+
+    public function findByKey(string $key): ?Config
+    {
+        return $this->createQueryBuilder('c')
+            ->where('c.key = :key')
+            ->setParameter('key', $key)
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
 }

src/Domain/Configuration/Service/Manager/ConfigManager.php

@@ -5,57 +5,84 @@
 namespace PhpList\Core\Domain\Configuration\Service\Manager;
 
 use PhpList\Core\Domain\Configuration\Model\Config;
+use PhpList\Core\Domain\Configuration\Model\Dto\CreateConfigDto;
 use PhpList\Core\Domain\Configuration\Repository\ConfigRepository;
 use PhpList\Core\Domain\Configuration\Exception\ConfigNotEditableException;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 class ConfigManager
 {
-    private ConfigRepository $configRepository;
-
-    public function __construct(ConfigRepository $configRepository)
-    {
-        $this->configRepository = $configRepository;
+    public function __construct(
+        private readonly ConfigRepository $configRepository,
+        #[Autowire('%parallel_use_with_phplist3%')]
+        private readonly bool $parallelUseWithPhpList3,
+    ) {
     }
 
     /**
      * Get a configuration item by its key
      */
-    public function getByItem(string $item): ?Config
+    public function findByKey(string $item): ?Config
     {
-        return $this->configRepository->findOneBy(['item' => $item]);
+        return $this->configRepository->findByKey($item);
     }
 
     /**
      * Get all configuration items
      *
      * @return Config[]
      */
-    public function getAll(): array
+    public function getAllEditable(): array
     {
-        return $this->configRepository->findAll();
+        $all = $this->configRepository->findAll();
+
+        if ($this->parallelUseWithPhpList3) {
+            $filtered = [];
+            foreach ($all as $config) {
+                $key = trim($config->getKey());
+                if ($key === '' || $config->isEditable() === false) {
+                    continue;
+                }
+                // filter legacy config items (WithNamespaces)
+                if (str_contains($key, ':') === true) {
+                    continue;
+                }
+                if (str_starts_with($key, 'lastlanguageupdate-') === true) {
+                    continue;
+                }
+                $filtered[] = $config;
+            }
+            $all = $filtered;
+        }
+
+        return $all;
     }
 
     /**
      * Update a configuration item
      * @throws ConfigNotEditableException
      */
-    public function update(Config $config, string $value): void
+    public function update(Config $config, string $value): Config
     {
         if (!$config->isEditable()) {
             throw new ConfigNotEditableException($config->getKey());
         }
         $config->setValue($value);
+
+        return $config;
     }
 
-    public function create(string $key, string $value, bool $editable, ?string $type = null): void
+    public function create(CreateConfigDto $configRequestDto): Config
     {
         $config = (new Config())
-            ->setKey($key)
-            ->setValue($value)
-            ->setEditable($editable)
-            ->setType($type);
+            ->setKey($configRequestDto->key)
+            ->setValue($configRequestDto->value)
+            ->setEditable($configRequestDto->editable)
+            ->setType($configRequestDto->type);
 
         $this->configRepository->persist($config);
+
+        return $config;
     }
 
     public function delete(Config $config): void

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

@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Repository\ConfigRepository;
 use Psr\SimpleCache\CacheInterface;
+use ValueError;
 
 class ConfigProvider
 {
@@ -71,16 +72,32 @@ public function getValue(ConfigOption $key): ?string
         return $this->defaultConfigs->has($key) ? (string) $this->defaultConfigs->get($key)['value'] : null;
     }
 
-    public function getValueWithNamespace(ConfigOption $key): ?string
+    public function getValueWithNamespace(ConfigOption|string $key): ?string
     {
-        $full = $this->getValue($key);
+        if ($key instanceof ConfigOption) {
+            $full = $this->getValue($key);
+            $keyValue = $key->value;
+        } else {
+            $keyValue = $key;
+            $cacheKey = 'cfg:' . $keyValue;
+            $full = $this->cache->get($cacheKey);
+            if ($full === null) {
+                $full = $this->configRepository->findValueByItem($keyValue);
+                $this->cache->set($cacheKey, $full, $this->ttlSeconds);
+            }
+        }
+
         if ($full !== null && $full !== '') {
             return $full;
         }
 
-        if (str_contains($key->value, ':')) {
-            [$parent] = explode(':', $key->value, 2);
-            $parentKey = ConfigOption::from($parent);
+        if (str_contains($keyValue, ':')) {
+            [$parent] = explode(':', $keyValue, 2);
+            try {
+                $parentKey = ConfigOption::from($parent);
+            } catch (ValueError) {
+                return null;
+            }
 
             return $this->getValue($parentKey);
         }

src/Domain/Messaging/Service/TemplateImageEmbedder.php

@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Common\ExternalImageService;
 use PhpList\Core\Domain\Common\Model\ContentTransferEncoding;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Model\Dto\CreateConfigDto;
 use PhpList\Core\Domain\Configuration\Service\Manager\ConfigManager;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Messaging\Model\TemplateImage;
@@ -133,10 +134,12 @@ private function getFilesystemImage(string $filename): string
             if (is_file($candidate['path'])) {
                 if ($candidate['config'] !== null) {
                     $this->configManager->create(
-                        ConfigOption::UploadImageRoot->value,
-                        $candidate['config'],
-                        false,
-                        'string'
+                        configRequestDto: new CreateConfigDto(
+                            key: ConfigOption::UploadImageRoot->value,
+                            value: $candidate['config'],
+                            editable: false,
+                            type: 'string'
+                        )
                     );
                 }
 

src/Domain/Subscription/MessageHandler/DynamicTableMessageHandler.php

@@ -14,7 +14,6 @@
 #[AsMessageHandler]
 class DynamicTableMessageHandler
 {
-
     public function __construct(private readonly AbstractSchemaManager $schemaManager)
     {
     }

src/Domain/Subscription/Model/SubscribePage.php

@@ -30,6 +30,9 @@ class SubscribePage implements DomainModel, Identity, OwnableInterface
     #[ORM\JoinColumn(name: 'owner', referencedColumnName: 'id', nullable: true)]
     private ?Administrator $owner = null;
 
+    /** @var SubscribePageData[] */
+    private array $data = [];
+
     public function getId(): ?int
     {
         return $this->id;
@@ -50,6 +53,12 @@ public function getOwner(): ?Administrator
         return $this->owner;
     }
 
+    /** @return SubscribePageData[] */
+    public function getData(): array
+    {
+        return $this->data;
+    }
+
     public function setTitle(string $title): self
     {
         $this->title = $title;
@@ -67,4 +76,11 @@ public function setOwner(?Administrator $owner): self
         $this->owner = $owner;
         return $this;
     }
+
+    /** @param SubscribePageData[] $data */
+    public function setData(array $data): self
+    {
+        $this->data = $data;
+        return $this;
+    }
 }

src/Domain/Subscription/Repository/SubscriberAttributeDefinitionRepository.php

@@ -33,6 +33,7 @@ private function hydrateOptionsForAll(array $defs): array
         foreach ($defs as $def) {
             $this->hydrateOptions($def);
         }
+
         return $defs;
     }
 
@@ -81,9 +82,17 @@ public function findOneByName(string $name): ?SubscriberAttributeDefinition
         if ($def instanceof SubscriberAttributeDefinition) {
             $this->hydrateOptions($def);
         }
+
         return $def;
     }
 
+    public function getByIds(array $ids): array
+    {
+        $defs = $this->findBy(['id' => $ids]);
+
+        return $this->hydrateOptionsForAll($defs);
+    }
+
     public function existsByTableName(string $tableName): bool
     {
         return (bool) $this->createQueryBuilder('s')

src/Domain/Subscription/Repository/SubscriberListRepository.php

@@ -64,10 +64,13 @@ public function getListIdsByMessage(Message $message): array
             ->getSingleColumnResult();
     }
 
-    public function getAllActive(): array
+    /** @return SubscriberList[] */
+    public function getPublicByIds(array $ids): array
     {
         return $this->createQueryBuilder('l')
-            ->where('l.active = true')
+            ->where('l.public = true')
+            ->andWhere('l.id IN (:ids)')
+            ->setParameter('ids', $ids)
             ->getQuery()
             ->getResult();
     }