From b921abf17350419ed36c7f93d1b06eeb963529a7 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sat, 11 Jan 2025 02:09:07 +0100 Subject: [PATCH 1/3] Make wallabag_url a Twig global --- app/config/config.yml | 1 + src/Controller/Api/DeveloperController.php | 4 +--- src/Controller/ConfigController.php | 1 - src/Mailer/AuthCodeMailer.php | 12 +----------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 671f2dfbf..77d792221 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -60,6 +60,7 @@ twig: form_themes: - "@SpiriitFormFilter/Form/form_div_layout.html.twig" globals: + wallabag_url: '%domain_name%' registration_enabled: '%fosuser_registration%' # Doctrine Configuration diff --git a/src/Controller/Api/DeveloperController.php b/src/Controller/Api/DeveloperController.php index 6e41279b5..ccba13d14 100644 --- a/src/Controller/Api/DeveloperController.php +++ b/src/Controller/Api/DeveloperController.php @@ -103,8 +103,6 @@ class DeveloperController extends AbstractController */ public function howtoFirstAppAction() { - return $this->render('Developer/howto_app.html.twig', [ - 'wallabag_url' => $this->getParameter('domain_name'), - ]); + return $this->render('Developer/howto_app.html.twig'); } } diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php index 310e0c6fb..ef62dbc9c 100644 --- a/src/Controller/ConfigController.php +++ b/src/Controller/ConfigController.php @@ -257,7 +257,6 @@ class ConfigController extends AbstractController 'username' => $user->getUsername(), 'token' => $config->getFeedToken(), ], - 'wallabag_url' => $this->getParameter('domain_name'), 'enabled_users' => $userRepository->getSumEnabledUsers(), ]); } diff --git a/src/Mailer/AuthCodeMailer.php b/src/Mailer/AuthCodeMailer.php index 2a12c4d50..da6c850b8 100644 --- a/src/Mailer/AuthCodeMailer.php +++ b/src/Mailer/AuthCodeMailer.php @@ -50,27 +50,18 @@ class AuthCodeMailer implements AuthCodeMailerInterface */ private $supportUrl; - /** - * Url for the wallabag instance (only used for image in the HTML email template). - * - * @var string - */ - private $wallabagUrl; - /** * @param string $senderEmail * @param string $senderName * @param string $supportUrl wallabag support url - * @param string $wallabagUrl wallabag instance url */ - public function __construct(MailerInterface $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) + public function __construct(MailerInterface $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl) { $this->mailer = $mailer; $this->twig = $twig; $this->senderEmail = $senderEmail; $this->senderName = $senderName; $this->supportUrl = $supportUrl; - $this->wallabagUrl = $wallabagUrl; } /** @@ -85,7 +76,6 @@ class AuthCodeMailer implements AuthCodeMailerInterface 'user' => $user->getName(), 'code' => $user->getEmailAuthCode(), 'support_url' => $this->supportUrl, - 'wallabag_url' => $this->wallabagUrl, ]); $bodyText = $template->renderBlock('body_text', [ 'user' => $user->getName(), From c5c9b130b0b21c774c397b2e7878cce3a929f732 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sat, 11 Jan 2025 02:11:44 +0100 Subject: [PATCH 2/3] Use wallabag_url in entries.xml --- src/Controller/FeedController.php | 2 -- templates/Entry/entries.xml.twig | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Controller/FeedController.php b/src/Controller/FeedController.php index 70b9de359..9dea3c2c6 100644 --- a/src/Controller/FeedController.php +++ b/src/Controller/FeedController.php @@ -150,7 +150,6 @@ class FeedController extends AbstractController 'url' => $url, 'entries' => $entries, 'user' => $user->getUsername(), - 'domainName' => $this->getParameter('domain_name'), 'version' => $this->getParameter('wallabag.version'), 'tag' => $tag->getSlug(), 'updated' => $this->prepareFeedUpdatedDate($entries, $sort), @@ -231,7 +230,6 @@ class FeedController extends AbstractController 'url' => $url, 'entries' => $entries, 'user' => $user->getUsername(), - 'domainName' => $this->getParameter('domain_name'), 'version' => $this->getParameter('wallabag.version'), 'updated' => $this->prepareFeedUpdatedDate($entries), ], new Response('', 200, ['Content-Type' => 'application/atom+xml'])); diff --git a/templates/Entry/entries.xml.twig b/templates/Entry/entries.xml.twig index 783a1c947..b286517b7 100644 --- a/templates/Entry/entries.xml.twig +++ b/templates/Entry/entries.xml.twig @@ -3,10 +3,10 @@ {% if type != 'tag' %} wallabag — {{ type }} feed Atom feed for {{ type }} entries - wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }} + wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }} {% else %} - wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }} + wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }} wallabag — {{ type }} {{ tag }} feed Atom feed for entries tagged with {{ tag }} @@ -34,7 +34,7 @@ - wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }} + wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }} {{ entry.updatedAt|date('c') }} {{ entry.createdAt|date('c') }} {% for tag in entry.tags %} From 311675d30bcc5c024ae0a3f28209f18290669333 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Tue, 18 Feb 2025 01:37:09 +0100 Subject: [PATCH 3/3] Fix constructor call of AuthCodeMailer in AuthCodeMailerTest --- tests/Mailer/AuthCodeMailerTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Mailer/AuthCodeMailerTest.php b/tests/Mailer/AuthCodeMailerTest.php index d9fae3928..b71ba56d6 100644 --- a/tests/Mailer/AuthCodeMailerTest.php +++ b/tests/Mailer/AuthCodeMailerTest.php @@ -63,8 +63,7 @@ TWIG; $this->twig, 'nobody@test.io', 'wallabag test', - 'http://0.0.0.0/support', - 'http://0.0.0.0/' + 'http://0.0.0.0/support' ); $authCodeMailer->sendAuthCode($user);