Use internal config instead for demo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -25,3 +25,5 @@ modify_settings: "apply"
 piwik_host: Host of your website in Piwik
 piwik_site_id: ID of your website in Piwik
 piwik_enabled: Enable Piwik
+demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
+demo_mode_username: "Demo user"

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -25,3 +25,5 @@ modify_settings: "appliquer"
 piwik_host: URL de votre site dans Piwik
 piwik_site_id: ID de votre site dans Piwik
 piwik_enabled: Activer Piwik
+demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
+demo_mode_username: "Utilisateur de la démo"

app/config/parameters.yml.dist

@@ -45,7 +45,3 @@ parameters:
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
-
-    # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
-    demo: false
-    demo_username: wallabag

app/config/tests/parameters.yml.dist.mysql

@@ -35,7 +35,3 @@ parameters:
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
-
-    # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
-    demo: false
-    demo_username: wallabag

app/config/tests/parameters.yml.dist.pgsql

@@ -35,7 +35,3 @@ parameters:
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
-
-    # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
-    demo: false
-    demo_username: wallabag

app/config/tests/parameters.yml.dist.sqlite

@@ -35,7 +35,3 @@ parameters:
     fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
-
-    # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
-    demo: false
-    demo_username: wallabag

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) {

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.'

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) {