oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge pull request #8017 from wallabag/make-wallabag_url-a-twig-global

Browse source 
Make wallabag_url a Twig global
This commit is contained in:
Yassine Guedidi 2025-02-20 08:32:30 +01:00 • committed by GitHub
commit b905a2c856
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/config/config.yml
View file

@ -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

4
src/Controller/Api/DeveloperController.php
View file

@ -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');
}
}

1
src/Controller/ConfigController.php
View file

@ -257,7 +257,6 @@ class ConfigController extends AbstractController
'username' => $user->getUsername(),
'token' => $config->getFeedToken(),
],
'wallabag_url' => $this->getParameter('domain_name'),
'enabled_users' => $userRepository->getSumEnabledUsers(),
]);
}

2
src/Controller/FeedController.php
View file

@ -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']));

12
src/Mailer/AuthCodeMailer.php
View file

@ -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(),

6
templates/Entry/entries.xml.twig
View file

@ -3,10 +3,10 @@
{% if type != 'tag' %}
<title>wallabag — {{ type }} feed</title>
<subtitle type="html">Atom feed for {{ type }} entries</subtitle>
<id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }}</id>
<id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }}</id>
<link rel="alternate" type="text/html" href="{{ url(type) }}"/>
{% else %}
<id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id>
<id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id>
<link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/>
<title>wallabag — {{ type }} {{ tag }} feed</title>
<subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle>
@ -34,7 +34,7 @@
<link rel="alternate" href="{{ entry.url }}"/>
<link rel="via" type="text/html"
href="{{ url('view', {'id': entry.id}) }}"/>
<id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }}</id>
<id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }}</id>
<updated>{{ entry.updatedAt|date('c') }}</updated>
<published>{{ entry.createdAt|date('c') }}</published>
{% for tag in entry.tags %}

3
tests/Mailer/AuthCodeMailerTest.php
View file

@ -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);