Demonstration mode to prevent password changes

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / ConfigController.php

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index b01aaa7f5f7dd6f7cd07b12878855bbb8c178151..04b54644385516d1d54032e7ca11886e1e4c74bb 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\TaggingRule;
@@ -56,15 +57,22 @@ 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'
-            );
-
-            return $this->redirect($this->generateUrl('config'));
+            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');
         }
 
         // handle changing user information
@@ -82,7 +90,7 @@ class ConfigController extends Controller
                 'Information updated'
             );
 
-            return $this->redirect($this->generateUrl('config'));
+            return $this->redirect($this->generateUrl('config').'#set3');
         }
 
         // handle rss information
@@ -98,7 +106,7 @@ class ConfigController extends Controller
                 'RSS information updated'
             );
 
-            return $this->redirect($this->generateUrl('config'));
+            return $this->redirect($this->generateUrl('config').'#set2');
         }
 
         // handle tagging rule
@@ -116,7 +124,7 @@ class ConfigController extends Controller
                 'Tagging rules updated'
             );
 
-            return $this->redirect($this->generateUrl('config'));
+            return $this->redirect($this->generateUrl('config').'#set5');
         }
 
         // handle adding new user
@@ -133,10 +141,10 @@ class ConfigController extends Controller
             $userManager->updateUser($newUser, true);
 
             $config = new Config($newUser);
-            $config->setTheme($this->container->getParameter('theme'));
-            $config->setItemsPerPage($this->container->getParameter('items_on_page'));
-            $config->setRssLimit($this->container->getParameter('rss_limit'));
-            $config->setLanguage($this->container->getParameter('language'));
+            $config->setTheme($this->getParameter('wallabag_core.theme'));
+            $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
+            $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
+            $config->setLanguage($this->getParameter('wallabag_core.language'));
 
             $em->persist($config);
 
@@ -144,10 +152,10 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                sprintf('User "%s" added', $newUser->getUsername())
+                $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername()))
             );
 
-            return $this->redirect($this->generateUrl('config'));
+            return $this->redirect($this->generateUrl('config').'#set6');
         }
 
         return $this->render('WallabagCoreBundle:Config:index.html.twig', array(
@@ -163,6 +171,7 @@ class ConfigController extends Controller
                 'username' => $user->getUsername(),
                 'token' => $config->getRssToken(),
             ),
+            'twofactor_auth' => $this->getParameter('twofactor_auth'),
         ));
     }
 
@@ -171,7 +180,7 @@ class ConfigController extends Controller
      *
      * @Route("/generate-token", name="generate_token")
      *
-     * @return JsonResponse
+     * @return RedirectResponse|JsonResponse
      */
     public function generateTokenAction(Request $request)
     {
@@ -186,7 +195,12 @@ class ConfigController extends Controller
             return new JsonResponse(array('token' => $config->getRssToken()));
         }
 
-        return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config');
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            'RSS token updated'
+        );
+
+        return $this->redirect($this->generateUrl('config').'#set2');
     }
 
     /**
@@ -196,7 +210,7 @@ class ConfigController extends Controller
      *
      * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     * @return RedirectResponse
      */
     public function deleteTaggingRuleAction(TaggingRule $rule)
     {
@@ -213,7 +227,7 @@ class ConfigController extends Controller
             'Tagging rule deleted'
         );
 
-        return $this->redirect($this->generateUrl('config'));
+        return $this->redirect($this->generateUrl('config').'#set5');
     }
 
     /**