4 files changed, 45 insertions, 0 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index b3e20ceb..93520f9a 100644
--- 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 5e89c2a9..10b60f30 100644
--- 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 1742b4aa..8ca21728 100644
--- 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
index 00000000..7725cd80
--- /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'));
+    }
+}