X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=62ef3eeaf4107741be3671164131a8fb785b878e;hb=f506da40e2573a98cd84159b2ee36621220a2771;hp=4e89587599c94b2f8750a9ebd2cc27868c73c0ac;hpb=ba7b9d48d407f87690a3fdc199b37714d2a52897;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 4e895875..62ef3eea 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -5,11 +5,14 @@ namespace Wallabag\CoreBundle\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\UserType;
+use Wallabag\CoreBundle\Form\Type\UserInformationType;
 use Wallabag\CoreBundle\Form\Type\NewUserType;
+use Wallabag\CoreBundle\Form\Type\RssType;
+use Wallabag\CoreBundle\Tools\Utils;
 
 class ConfigController extends Controller
 {
@@ -62,7 +65,7 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(new UserType(), $user);
+        $userForm = $this->createForm(new UserInformationType(), $user);
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
@@ -77,6 +80,22 @@ class ConfigController extends Controller
             return $this->redirect($this->generateUrl('config'));
         }
 
+        // handle rss information
+        $rssForm = $this->createForm(new RssType(), $config);
+        $rssForm->handleRequest($request);
+
+        if ($rssForm->isValid()) {
+            $em->persist($config);
+            $em->flush();
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'RSS information updated'
+            );
+
+            return $this->redirect($this->generateUrl('config'));
+        }
+
         // handle adding new user
         $newUser = new User();
         $newUserForm = $this->createForm(new NewUserType(), $newUser);
@@ -88,6 +107,7 @@ class ConfigController extends Controller
             $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'));
 
             $em->persist($config);
@@ -103,13 +123,43 @@ class ConfigController extends Controller
         }
 
         return $this->render('WallabagCoreBundle:Config:index.html.twig', array(
-            'configForm' => $configForm->createView(),
-            'pwdForm' => $pwdForm->createView(),
-            'userForm' => $userForm->createView(),
-            'newUserForm' => $newUserForm->createView(),
+            'form' => array(
+                'config' => $configForm->createView(),
+                'rss' => $rssForm->createView(),
+                'pwd' => $pwdForm->createView(),
+                'user' => $userForm->createView(),
+                'new_user' => $newUserForm->createView(),
+            ),
+            'rss' => array(
+                'username' => $user->getUsername(),
+                'token' => $config->getRssToken(),
+            ),
         ));
     }
 
+    /**
+     * @param Request $request
+     *
+     * @Route("/generate-token", name="generate_token")
+     *
+     * @return JsonResponse
+     */
+    public function generateTokenAction(Request $request)
+    {
+        $config = $this->getConfig();
+        $config->setRssToken(Utils::generateToken());
+
+        $em = $this->getDoctrine()->getManager();
+        $em->persist($config);
+        $em->flush();
+
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse(array('token' => $config->getRssToken()));
+        }
+
+        return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config');
+    }
+
     /**
      * Retrieve config for the current user.
      * If no config were found, create a new one.