From 6c9f50a6622cdc5c9f975cfb14994db1d9b3ab1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 17 Feb 2016 17:02:12 +0100 Subject: [PATCH] Demonstration mode to prevent password changes --- app/config/parameters.yml.dist | 3 +++ app/config/tests/parameters.yml.dist.mysql | 3 +++ app/config/tests/parameters.yml.dist.pgsql | 3 +++ app/config/tests/parameters.yml.dist.sqlite | 3 +++ .../Controller/ConfigController.php | 21 ++++++++++++------- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7c7413fb..dd9ec60a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -45,3 +45,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 1951f021..3d5df619 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 36ad6cde..dd29b737 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 6564014a..0e3256e6 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 6eb621d8..04b54644 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -57,13 +57,20 @@ class ConfigController extends Controller $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { - $user->setPlainPassword($pwdForm->get('new_password')->getData()); - $userManager->updateUser($user, true); - - $this->get('session')->getFlashBag()->add( - 'notice', - 'Password updated' - ); + if ($this->getParameter('demo') === false) { + $user->setPlainPassword($pwdForm->get('new_password')->getData()); + $userManager->updateUser($user, true); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Password updated' + ); + } else { + $this->get('session')->getFlashBag()->add( + 'notice', + 'In demonstration mode, you can`t change password.' + ); + } return $this->redirect($this->generateUrl('config').'#set4'); } -- 2.41.0