aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-06-10 11:36:03 +0200
committerGitHub <noreply@github.com>2017-06-10 11:36:03 +0200
commit679aaf08366c265b29d0e4b2e59919314cf338f9 (patch)
tree6b340839afa56747b6fa8aff3ede2f59d4dcc6d3
parenta8993999893fb665b5e96597f9b649a2a8b940a2 (diff)
parent1a94252831638cf41f0fe489939dee9dae1c1251 (diff)
downloadwallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.gz
wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.zst
wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.zip
Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
-rw-r--r--app/DoctrineMigrations/Version20170606155640.php53
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml1
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/wallabag.yml4
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml4
-rw-r--r--src/Wallabag/UserBundle/Resources/config/services.yml2
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php2
18 files changed, 60 insertions, 20 deletions
diff --git a/app/DoctrineMigrations/Version20170606155640.php b/app/DoctrineMigrations/Version20170606155640.php
new file mode 100644
index 00000000..e9b50428
--- /dev/null
+++ b/app/DoctrineMigrations/Version20170606155640.php
@@ -0,0 +1,53 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Remove wallabag_url from craue_config_setting.
12 * It has been moved into the parameters.yml
13 */
14class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface
15{
16 /**
17 * @var ContainerInterface
18 */
19 private $container;
20
21 public function setContainer(ContainerInterface $container = null)
22 {
23 $this->container = $container;
24 }
25
26 private function getTable($tableName)
27 {
28 return $this->container->getParameter('database_table_prefix').$tableName;
29 }
30
31 /**
32 * @param Schema $schema
33 */
34 public function up(Schema $schema)
35 {
36 $apiUserRegistration = $this->container
37 ->get('doctrine.orm.default_entity_manager')
38 ->getConnection()
39 ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'wallabag_url'");
40
41 $this->skipIf(false === $apiUserRegistration, 'It seems that you already played this migration.');
42
43 $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'wallabag_url'");
44 }
45
46 /**
47 * @param Schema $schema
48 */
49 public function down(Schema $schema)
50 {
51 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");
52 }
53}
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 20e938f5..5475e571 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -20,7 +20,6 @@ share_twitter: Aktiver deling gennem Twitter
20share_unmark: Aktiver deling gennem Unmark.it 20share_unmark: Aktiver deling gennem Unmark.it
21show_printlink: Vis et link til print-indhold 21show_printlink: Vis et link til print-indhold
22wallabag_support_url: Support-URL for wallabag 22wallabag_support_url: Support-URL for wallabag
23wallabag_url: URL for *sin* wallabag-installation
24entry: "artikel" 23entry: "artikel"
25export: "eksport" 24export: "eksport"
26import: "import" 25import: "import"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index 526d41bc..f57db303 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -20,7 +20,6 @@ share_twitter: Teilen zu Twitter aktiveren
20share_unmark: Teilen zu Unmark.it aktiveren 20share_unmark: Teilen zu Unmark.it aktiveren
21show_printlink: Link anzeigen, um den Inhalt auszudrucken 21show_printlink: Link anzeigen, um den Inhalt auszudrucken
22wallabag_support_url: Support-URL für wallabag 22wallabag_support_url: Support-URL für wallabag
23wallabag_url: URL von *deiner* wallabag-Instanz
24entry: "Artikel" 23entry: "Artikel"
25export: "Export" 24export: "Export"
26import: "Import" 25import: "Import"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 3c0037f3..1e4f4668 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -20,7 +20,6 @@ share_twitter: Enable share to Twitter
20share_unmark: Enable share to Unmark.it 20share_unmark: Enable share to Unmark.it
21show_printlink: Display a link to print content 21show_printlink: Display a link to print content
22wallabag_support_url: Support URL for wallabag 22wallabag_support_url: Support URL for wallabag
23wallabag_url: URL of *your* wallabag instance
24entry: "article" 23entry: "article"
25export: "export" 24export: "export"
26import: "import" 25import: "import"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index 99869669..46ed4040 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -20,7 +20,6 @@ share_twitter: Activar compartir con Twitter
20share_unmark: Activar compartir con Unmark.it 20share_unmark: Activar compartir con Unmark.it
21show_printlink: Mostrar un enlace para imprimir contenido 21show_printlink: Mostrar un enlace para imprimir contenido
22wallabag_support_url: URL de soporte de wallabag 22wallabag_support_url: URL de soporte de wallabag
23wallabag_url: URL de *tu* instancia de wallabag
24entry: "artículo" 23entry: "artículo"
25export: "exportar" 24export: "exportar"
26import: "importar" 25import: "importar"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index 2e1307e5..f8da4acf 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -20,7 +20,6 @@ share_twitter: فعال‌سازی هم‌رسانی به Twitter
20share_unmark: فعال‌سازی هم‌رسانی به Unmark.it 20share_unmark: فعال‌سازی هم‌رسانی به Unmark.it
21show_printlink: نمایش پیوندی برای چاپ مطلب 21show_printlink: نمایش پیوندی برای چاپ مطلب
22wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag 22wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
23wallabag_url: نشانی صفحهٔ wallabag *شما*
24entry: "مقاله" 23entry: "مقاله"
25export: "برون‌سپاری" 24export: "برون‌سپاری"
26import: "درون‌ریزی" 25import: "درون‌ریزی"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 454053ad..a79409b4 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -20,7 +20,6 @@ share_twitter: Activer le partage vers Twitter
20share_unmark: Activer le partage vers Unmark.it 20share_unmark: Activer le partage vers Unmark.it
21show_printlink: Afficher un lien pour imprimer 21show_printlink: Afficher un lien pour imprimer
22wallabag_support_url: URL de support de wallabag 22wallabag_support_url: URL de support de wallabag
23wallabag_url: URL de *votre* instance de wallabag
24entry: "article" 23entry: "article"
25export: "export" 24export: "export"
26import: "import" 25import: "import"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 4dbd2ff8..dd4def4b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -20,7 +20,6 @@ share_twitter: Abilita la condivisione con Twitter
20share_unmark: Abilita la condivisione con Unmark.it 20share_unmark: Abilita la condivisione con Unmark.it
21show_printlink: Mostra un collegamento per stampare il contenuto 21show_printlink: Mostra un collegamento per stampare il contenuto
22wallabag_support_url: URL di supporto per wallabag 22wallabag_support_url: URL di supporto per wallabag
23wallabag_url: URL della *tua* installazione di wallabag
24entry: "contenuto" 23entry: "contenuto"
25export: "esporta" 24export: "esporta"
26import: "importa" 25import: "importa"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 00c06638..66d9ae26 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -20,7 +20,6 @@ share_twitter: Activar lo partatge cap a Twitter
20share_unmark: Activar lo partatge cap a Unmark.it 20share_unmark: Activar lo partatge cap a Unmark.it
21show_printlink: Afichar un ligam per imprimir 21show_printlink: Afichar un ligam per imprimir
22wallabag_support_url: URL d'assisténcia de wallabag 22wallabag_support_url: URL d'assisténcia de wallabag
23wallabag_url: URL de *vòstra* instància de wallabag
24entry: "article" 23entry: "article"
25export: "expòrt" 24export: "expòrt"
26import: "impòrt" 25import: "impòrt"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index ada11b3a..04ad4fd3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -20,7 +20,6 @@ share_twitter: Włącz udostępnianie dla Twitter
20share_unmark: Włącz udostępnianie dla Unmark.it 20share_unmark: Włącz udostępnianie dla Unmark.it
21show_printlink: Pokaż link do wydrukowania zawartości 21show_printlink: Pokaż link do wydrukowania zawartości
22wallabag_support_url: Adres URL wsparcia dla wallabag 22wallabag_support_url: Adres URL wsparcia dla wallabag
23wallabag_url: Adres *twojej* instacji wallabag
24entry: "artykuł" 23entry: "artykuł"
25export: "eksport" 24export: "eksport"
26import: "import" 25import: "import"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index 59af9610..77e22b37 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -20,7 +20,6 @@ share_twitter: Habilitar compartilhamento para o Twitter
20share_unmark: Habilitar compartilhamento para o Unmark.it 20share_unmark: Habilitar compartilhamento para o Unmark.it
21show_printlink: Mostrar um link para imprimir o conteúdo 21show_printlink: Mostrar um link para imprimir o conteúdo
22wallabag_support_url: URL de Suporte do wallabag 22wallabag_support_url: URL de Suporte do wallabag
23wallabag_url: URL de *sua* instância do wallabag
24entry: "artigo" 23entry: "artigo"
25export: "exportar" 24export: "exportar"
26import: "importar" 25import: "importar"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 104e37c6..1b4bfb5b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -20,7 +20,6 @@ share_twitter: Permite share către Twitter
20share_unmark: Permite share către Unmark.it 20share_unmark: Permite share către Unmark.it
21show_printlink: Afișează un link pentru a printa content-ul 21show_printlink: Afișează un link pentru a printa content-ul
22wallabag_support_url: URL-ul de suport pentru wallabag 22wallabag_support_url: URL-ul de suport pentru wallabag
23wallabag_url: URL-ul instanței tale wallabag
24entry: "alticol" 23entry: "alticol"
25export: "exportă" 24export: "exportă"
26import: "importă" 25import: "importă"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index afcee039..914fb1ef 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -23,6 +23,8 @@ parameters:
23 # with PostgreSQL and SQLite, you must set "utf8" 23 # with PostgreSQL and SQLite, you must set "utf8"
24 database_charset: utf8mb4 24 database_charset: utf8mb4
25 25
26 domain_name: https://your-wallabag-url-instance.com
27
26 mailer_transport: smtp 28 mailer_transport: smtp
27 mailer_host: 127.0.0.1 29 mailer_host: 127.0.0.1
28 mailer_user: ~ 30 mailer_user: ~
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d8c593c6..51b7e4e3 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -148,10 +148,6 @@ wallabag_core:
148 value: https://www.wallabag.org/pages/support.html 148 value: https://www.wallabag.org/pages/support.html
149 section: misc 149 section: misc
150 - 150 -
151 name: wallabag_url
152 value: http://v2.wallabag.org
153 section: misc
154 -
155 name: api_user_registration 151 name: api_user_registration
156 value: 0 152 value: 0
157 section: api 153 section: api
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 0e61c642..89d27425 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -151,7 +151,7 @@ class ConfigController extends Controller
151 'token' => $config->getRssToken(), 151 'token' => $config->getRssToken(),
152 ], 152 ],
153 'twofactor_auth' => $this->getParameter('twofactor_auth'), 153 'twofactor_auth' => $this->getParameter('twofactor_auth'),
154 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'), 154 'wallabag_url' => $this->getParameter('domain_name'),
155 'enabled_users' => $this->getDoctrine() 155 'enabled_users' => $this->getDoctrine()
156 ->getRepository('WallabagUserBundle:User') 156 ->getRepository('WallabagUserBundle:User')
157 ->getSumEnabledUsers(), 157 ->getSumEnabledUsers(),
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 2ae5d27f..4be79547 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -123,7 +123,7 @@ services:
123 wallabag_core.helper.entries_export: 123 wallabag_core.helper.entries_export:
124 class: Wallabag\CoreBundle\Helper\EntriesExport 124 class: Wallabag\CoreBundle\Helper\EntriesExport
125 arguments: 125 arguments:
126 - '@=service(''craue_config'').get(''wallabag_url'')' 126 - '%domain_name%'
127 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png 127 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
128 128
129 wallabag.operator.array.matches: 129 wallabag.operator.array.matches:
@@ -196,7 +196,7 @@ services:
196 arguments: 196 arguments:
197 - "@wallabag_core.entry.download_images.client" 197 - "@wallabag_core.entry.download_images.client"
198 - "%kernel.root_dir%/../web/assets/images" 198 - "%kernel.root_dir%/../web/assets/images"
199 - '@=service(''craue_config'').get(''wallabag_url'')' 199 - '%domain_name%'
200 - "@logger" 200 - "@logger"
201 201
202 wallabag_core.entry.download_images.client: 202 wallabag_core.entry.download_images.client:
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index f2cd6e01..d3925de3 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -7,7 +7,7 @@ services:
7 - "%scheb_two_factor.email.sender_email%" 7 - "%scheb_two_factor.email.sender_email%"
8 - "%scheb_two_factor.email.sender_name%" 8 - "%scheb_two_factor.email.sender_name%"
9 - '@=service(''craue_config'').get(''wallabag_support_url'')' 9 - '@=service(''craue_config'').get(''wallabag_support_url'')'
10 - '@=service(''craue_config'').get(''wallabag_url'')' 10 - '%domain_name%'
11 11
12 wallabag_user.password_resetting: 12 wallabag_user.password_resetting:
13 class: Wallabag\UserBundle\EventListener\PasswordResettingListener 13 class: Wallabag\UserBundle\EventListener\PasswordResettingListener
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 3babbaca..8f5c372d 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -989,7 +989,7 @@ class EntryControllerTest extends WallabagCoreTestCase
989 $this->assertEquals($url, $entry->getUrl()); 989 $this->assertEquals($url, $entry->getUrl());
990 $this->assertContains('Perpignan', $entry->getTitle()); 990 $this->assertContains('Perpignan', $entry->getTitle());
991 // instead of checking for the filename (which might change) check that the image is now local 991 // instead of checking for the filename (which might change) check that the image is now local
992 $this->assertContains('http://v2.wallabag.org/assets/images/', $entry->getContent()); 992 $this->assertContains('https://your-wallabag-url-instance.com/assets/images/', $entry->getContent());
993 993
994 $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); 994 $client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
995 } 995 }