From a4f42c59f0d8a408cf9f5d7971146866530012d3 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 22 Feb 2016 11:38:25 +0100
Subject: Use internal config instead for demo

---
 src/Wallabag/CoreBundle/Command/InstallCommand.php           | 10 ++++++++++
 src/Wallabag/CoreBundle/Controller/ConfigController.php      |  2 +-
 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag')

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 93520f9a..2e241757 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -327,6 +327,16 @@ class InstallCommand extends ContainerAwareCommand
                 'value' => '1',
                 'section' => 'analytics',
             ],
+            [
+                'name' => 'demo_mode_enabled',
+                'value' => '0',
+                'section' => 'misc',
+            ],
+            [
+                'name' => 'demo_mode_username',
+                'value' => 'wallabag',
+                'section' => 'misc',
+            ],
         ];
 
         foreach ($settings as $setting) {
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 9ff79ba9..87196b0e 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -57,7 +57,7 @@ class ConfigController extends Controller
         $pwdForm->handleRequest($request);
 
         if ($pwdForm->isValid()) {
-            if ($this->getParameter('demo') === true && $this->getParameter('demo_username') === $user->getUsername()) {
+            if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
                 $this->get('session')->getFlashBag()->add(
                     'notice',
                     'In demonstration mode, you can\'t change password for this user.'
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 10b60f30..1f4cafdf 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -125,6 +125,16 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'value' => '1',
                 'section' => 'analytics',
             ],
+            [
+                'name' => 'demo_mode_enabled',
+                'value' => '0',
+                'section' => 'misc',
+            ],
+            [
+                'name' => 'demo_mode_username',
+                'value' => 'wallabag',
+                'section' => 'misc',
+            ],
         ];
 
         foreach ($settings as $setting) {
-- 
cgit v1.2.3