X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=5ccf5a560a5de2edb85e90a459e099fc26b99ba7;hb=c7a4f74f9fe225275c8c2e68269b1f86cc31da6e;hp=4ece64312b66b0de467a8b6e9de338460d362c22;hpb=bc78968764c741019a6b866ad434678cdbecbba4;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 4ece6431..5ccf5a56 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -64,7 +64,7 @@ class ConfigController extends Controller
                 'Password updated'
             );
 
-            return $this->redirect($this->generateUrl('config'));
+            return $this->redirect($this->generateUrl('config').'#set4');
         }
 
         // handle changing user information
@@ -82,7 +82,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 +98,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 +116,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 +133,10 @@ class ConfigController extends Controller
             $userManager->updateUser($newUser, true);
 
             $config = new Config($newUser);
-            $config->setTheme($this->container->getParameter('wallabag_core.theme'));
-            $config->setItemsPerPage($this->container->getParameter('wallabag_core.items_on_page'));
-            $config->setRssLimit($this->container->getParameter('wallabag_core.rss_limit'));
-            $config->setLanguage($this->container->getParameter('wallabag_core.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);
 
@@ -147,7 +147,7 @@ class ConfigController extends Controller
                 sprintf('User "%s" added', $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 +163,7 @@ class ConfigController extends Controller
                 'username' => $user->getUsername(),
                 'token' => $config->getRssToken(),
             ),
+            'twofactor_auth' => $this->getParameter('twofactor_auth'),
         ));
     }
 
@@ -186,7 +187,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');
     }
 
     /**
@@ -198,7 +204,7 @@ class ConfigController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteTaggingRule(TaggingRule $rule)
+    public function deleteTaggingRuleAction(TaggingRule $rule)
     {
         if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
             throw $this->createAccessDeniedException('You can not access this tagging ryle.');
@@ -213,7 +219,7 @@ class ConfigController extends Controller
             'Tagging rule deleted'
         );
 
-        return $this->redirect($this->generateUrl('config'));
+        return $this->redirect($this->generateUrl('config').'#set5');
     }
 
     /**