X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=ca4acc6ae450a3acd00af827ef3090581eb543d5;hb=71200c4155490cb47b64172c3c2159f44cb80eca;hp=f48a9cb19ad506cd8f2531cd9755e453e4c7cc30;hpb=4d85d7e9ba676bd5ac3428976ce9227f460eb542;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index f48a9cb1..ca4acc6a 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -5,8 +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\Form\Type\ConfigType; +use Wallabag\UserBundle\Entity\User; +use Wallabag\CoreBundle\Form\Type\ChangePasswordType; +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 { @@ -14,35 +20,153 @@ class ConfigController extends Controller * @param Request $request * * @Route("/config", name="config") - * - * @return \Symfony\Component\HttpFoundation\Response */ public function indexAction(Request $request) { + $em = $this->getDoctrine()->getManager(); $config = $this->getConfig(); + $userManager = $this->container->get('fos_user.user_manager'); + $user = $this->getUser(); + + // handle basic config detail (this form is defined as a service) + $configForm = $this->createForm('config', $config); + $configForm->handleRequest($request); + + if ($configForm->isValid()) { + $em->persist($config); + $em->flush(); + + // switch active theme + $activeTheme = $this->get('liip_theme.active_theme'); + $activeTheme->setName($config->getTheme()); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Config saved. Some parameters will be considered after disconnection.' + ); + + return $this->redirect($this->generateUrl('config')); + } + + // handle changing password + $pwdForm = $this->createForm(new ChangePasswordType()); + $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')); + } + + // handle changing user information + $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile'))); + $userForm->handleRequest($request); + + if ($userForm->isValid()) { + $userManager->updateUser($user, true); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Information updated' + ); + + return $this->redirect($this->generateUrl('config')); + } + + // handle rss information + $rssForm = $this->createForm(new RssType(), $config); + $rssForm->handleRequest($request); - $form = $this->createForm(new ConfigType(), $config); + if ($rssForm->isValid()) { + $em->persist($config); + $em->flush(); - $form->handleRequest($request); + $this->get('session')->getFlashBag()->add( + 'notice', + 'RSS information updated' + ); + + return $this->redirect($this->generateUrl('config')); + } + + // handle adding new user + $newUser = $userManager->createUser(); + // enable created user by default + $newUser->setEnabled(true); + $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile'))); + $newUserForm->handleRequest($request); + + if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { + $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')); - if ($form->isValid()) { - $em = $this->getDoctrine()->getManager(); $em->persist($config); + $em->flush(); $this->get('session')->getFlashBag()->add( 'notice', - 'Config saved' + sprintf('User "%s" added', $newUser->getUsername()) ); return $this->redirect($this->generateUrl('config')); } return $this->render('WallabagCoreBundle:Config:index.html.twig', array( - 'form' => $form->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. + * + * @return Wallabag\CoreBundle\Entity\Config + */ private function getConfig() { $config = $this->getDoctrine()