diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 58 |
1 files changed, 54 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 4e895875..1622f348 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -5,11 +5,14 @@ namespace Wallabag\CoreBundle\Controller; | |||
5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | use Symfony\Component\HttpFoundation\Request; | 7 | use Symfony\Component\HttpFoundation\Request; |
8 | use Symfony\Component\HttpFoundation\JsonResponse; | ||
8 | use Wallabag\CoreBundle\Entity\Config; | 9 | use Wallabag\CoreBundle\Entity\Config; |
9 | use Wallabag\CoreBundle\Entity\User; | 10 | use Wallabag\CoreBundle\Entity\User; |
10 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; | 11 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; |
11 | use Wallabag\CoreBundle\Form\Type\UserType; | 12 | use Wallabag\CoreBundle\Form\Type\UserType; |
12 | use Wallabag\CoreBundle\Form\Type\NewUserType; | 13 | use Wallabag\CoreBundle\Form\Type\NewUserType; |
14 | use Wallabag\CoreBundle\Form\Type\RssType; | ||
15 | use Wallabag\CoreBundle\Tools\Utils; | ||
13 | 16 | ||
14 | class ConfigController extends Controller | 17 | class ConfigController extends Controller |
15 | { | 18 | { |
@@ -77,6 +80,22 @@ class ConfigController extends Controller | |||
77 | return $this->redirect($this->generateUrl('config')); | 80 | return $this->redirect($this->generateUrl('config')); |
78 | } | 81 | } |
79 | 82 | ||
83 | // handle rss information | ||
84 | $rssForm = $this->createForm(new RssType(), $config); | ||
85 | $rssForm->handleRequest($request); | ||
86 | |||
87 | if ($rssForm->isValid()) { | ||
88 | $em->persist($config); | ||
89 | $em->flush(); | ||
90 | |||
91 | $this->get('session')->getFlashBag()->add( | ||
92 | 'notice', | ||
93 | 'RSS information updated' | ||
94 | ); | ||
95 | |||
96 | return $this->redirect($this->generateUrl('config')); | ||
97 | } | ||
98 | |||
80 | // handle adding new user | 99 | // handle adding new user |
81 | $newUser = new User(); | 100 | $newUser = new User(); |
82 | $newUserForm = $this->createForm(new NewUserType(), $newUser); | 101 | $newUserForm = $this->createForm(new NewUserType(), $newUser); |
@@ -88,6 +107,7 @@ class ConfigController extends Controller | |||
88 | $config = new Config($newUser); | 107 | $config = new Config($newUser); |
89 | $config->setTheme($this->container->getParameter('theme')); | 108 | $config->setTheme($this->container->getParameter('theme')); |
90 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); | 109 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); |
110 | $config->setRssLimit($this->getContainer()->getParameter('rss_limit')); | ||
91 | $config->setLanguage($this->container->getParameter('language')); | 111 | $config->setLanguage($this->container->getParameter('language')); |
92 | 112 | ||
93 | $em->persist($config); | 113 | $em->persist($config); |
@@ -103,14 +123,44 @@ class ConfigController extends Controller | |||
103 | } | 123 | } |
104 | 124 | ||
105 | return $this->render('WallabagCoreBundle:Config:index.html.twig', array( | 125 | return $this->render('WallabagCoreBundle:Config:index.html.twig', array( |
106 | 'configForm' => $configForm->createView(), | 126 | 'form' => array( |
107 | 'pwdForm' => $pwdForm->createView(), | 127 | 'config' => $configForm->createView(), |
108 | 'userForm' => $userForm->createView(), | 128 | 'rss' => $rssForm->createView(), |
109 | 'newUserForm' => $newUserForm->createView(), | 129 | 'pwd' => $pwdForm->createView(), |
130 | 'user' => $userForm->createView(), | ||
131 | 'new_user' => $newUserForm->createView(), | ||
132 | ), | ||
133 | 'rss' => array( | ||
134 | 'username' => $user->getUsername(), | ||
135 | 'token' => $config->getRssToken(), | ||
136 | ) | ||
110 | )); | 137 | )); |
111 | } | 138 | } |
112 | 139 | ||
113 | /** | 140 | /** |
141 | * @param Request $request | ||
142 | * | ||
143 | * @Route("/generate-token", name="generate_token") | ||
144 | * | ||
145 | * @return JsonResponse | ||
146 | */ | ||
147 | public function generateTokenAction(Request $request) | ||
148 | { | ||
149 | $config = $this->getConfig(); | ||
150 | $config->setRssToken(Utils::generateToken()); | ||
151 | |||
152 | $em = $this->getDoctrine()->getManager(); | ||
153 | $em->persist($config); | ||
154 | $em->flush(); | ||
155 | |||
156 | if ($request->isXmlHttpRequest()) { | ||
157 | return new JsonResponse(array('token' => $config->getRssToken())); | ||
158 | } | ||
159 | |||
160 | return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); | ||
161 | } | ||
162 | |||
163 | /** | ||
114 | * Retrieve config for the current user. | 164 | * Retrieve config for the current user. |
115 | * If no config were found, create a new one. | 165 | * If no config were found, create a new one. |
116 | * | 166 | * |