Fix #1137: implemented Piwik

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 1c47ed2d239428e8872fed49e5e91fe5d0b01efe..719e51eab1618f09cfcf65f63c7afb961aed548e 100644 (file)
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -22,3 +22,6 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
+piwik_host: Host of your website in Piwik
+piwik_site_id: ID of your website in Piwik
+piwik_enabled: Enable Piwik

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index ddb78a13ae97d6272965d72443e03d18d5e9d4b4..ab5dfc7219e38ee35c7eca9ca7754e8db5b492fb 100644 (file)
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -22,3 +22,6 @@ export: "export"
 import: "import"
 misc: "divers"
 modify_settings: "appliquer"
+piwik_host: URL de votre site dans Piwik
+piwik_site_id: ID de votre site dans Piwik
+piwik_enabled: Activer Piwik

diff --git a/app/config/services.yml b/app/config/services.yml
index 80d6c1a1ade63fc88fe028a3ee5cd1137737d5cc..71862fd254b93caecc88f076501a9b9d3ffba2d8 100644 (file)
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -19,6 +19,14 @@ services:
         tags:
             - { name: twig.extension }
 
+    wallabag.twig_piwik_extension:
+        class: Wallabag\CoreBundle\Twig\WallabagPiwikExtension
+        public: false
+        arguments:
+            - "@craue_config"
+        tags:
+            - { name: twig.extension }
+
     wallabag.locale_listener:
         class: Wallabag\CoreBundle\EventListener\LocaleListener
         arguments: ["%kernel.default_locale%"]

diff --git a/composer.json b/composer.json
index 497b80121dbee95bfdca9ee352b7adc91b785a52..c65ebda1b9e14693e1ddb6d2ffdbad9f480aec26 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
         "guzzlehttp/guzzle": "^5.2.0",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "paragonie/random_compat": "~1.0",
-        "craue/config-bundle": "~1.4"
+        "craue/config-bundle": "~1.4",
+        "mnapoli/piwik-twig-extension": "^1.0"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index b3e20ceb079c02e2e63527df04ecce217c66c592..93520f9a87d09dd7c21d206be1831696868d01d2 100644 (file)
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -312,6 +312,21 @@ class InstallCommand extends ContainerAwareCommand
                 'value' => 'http://v2.wallabag.org',
                 'section' => 'misc',
             ],
+            [
+                'name' => 'piwik_enabled',
+                'value' => '0',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_host',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_site_id',
+                'value' => '1',
+                'section' => 'analytics',
+            ],
         ];
 
         foreach ($settings as $setting) {

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 5e89c2a986d670758176bf8f49868e49e972035a..10b60f30027b6b189882df51c18d519d6106275c 100644 (file)
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -110,6 +110,21 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'value' => 'http://v2.wallabag.org',
                 'section' => 'misc',
             ],
+            [
+                'name' => 'piwik_enabled',
+                'value' => '0',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_host',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_site_id',
+                'value' => '1',
+                'section' => 'analytics',
+            ],
         ];
 
         foreach ($settings as $setting) {

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 1742b4aa664e4f78bfc6b7479aa303a7fa272a37..8ca217283c6ec462a8ea93525fbbe176bdd46620 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -71,5 +71,6 @@
         <div id="warning_message">
             You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
         </div>
+        {{ piwik() }}
     </body>
 </html>

diff --git a/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php
new file mode 100644 (file)
index 0000000..7725cd8
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Wallabag\CoreBundle\Twig;
+
+use Craue\ConfigBundle\Util\Config;
+use PiwikTwigExtension\PiwikTwigExtension;
+
+class WallabagPiwikExtension extends PiwikTwigExtension
+{
+    public function __construct(Config $craueConfig)
+    {
+        parent::__construct($craueConfig->get('piwik_host'), $craueConfig->get('piwik_site_id'), $craueConfig->get('piwik_enabled'));
+    }
+}