X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=d24066b3fc1d671dc0501e400c007e284f5ef742;hb=4f9cf232f8d4d750d39aca83406b8a6d5e17a6c9;hp=73484d86c2f0949a01649a6954cd8985e1893677;hpb=fb96ea884532e9804194afd92a98c5c6aecc177e;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 73484d86..d24066b3 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -4,14 +4,17 @@ 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 Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\Entity\Config; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\CoreBundle\Entity\TaggingRule; +use Wallabag\CoreBundle\Form\Type\ConfigType; 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\Form\Type\TaggingRuleType; +use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\CoreBundle\Tools\Utils; class ConfigController extends Controller @@ -25,10 +28,11 @@ class ConfigController extends Controller { $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 = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config'))); $configForm->handleRequest($request); if ($configForm->isValid()) { @@ -41,47 +45,51 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Config saved' + 'Config saved. Some parameters will be considered after disconnection.' ); return $this->redirect($this->generateUrl('config')); } // handle changing password - $pwdForm = $this->createForm(new ChangePasswordType()); + $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4')); $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { - $user->setPassword($pwdForm->get('new_password')->getData()); - $em->persist($user); - $em->flush(); + if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { + $message = 'In demonstration mode, you can\'t change password for this user.'; + } else { + $message = 'Password updated'; - $this->get('session')->getFlashBag()->add( - 'notice', - 'Password updated' - ); + $user->setPlainPassword($pwdForm->get('new_password')->getData()); + $userManager->updateUser($user, true); + } - return $this->redirect($this->generateUrl('config')); + $this->get('session')->getFlashBag()->add('notice', $message); + + return $this->redirect($this->generateUrl('config').'#set4'); } // handle changing user information - $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile'))); + $userForm = $this->createForm(UserInformationType::class, $user, array( + 'validation_groups' => array('Profile'), + 'action' => $this->generateUrl('config').'#set3', + )); $userForm->handleRequest($request); if ($userForm->isValid()) { - $em->persist($user); - $em->flush(); + $userManager->updateUser($user, true); $this->get('session')->getFlashBag()->add( 'notice', 'Information updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set3'); } // handle rss information - $rssForm = $this->createForm(new RssType(), $config); + $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2')); $rssForm->handleRequest($request); if ($rssForm->isValid()) { @@ -93,22 +101,45 @@ class ConfigController extends Controller 'RSS information updated' ); - return $this->redirect($this->generateUrl('config')); + return $this->redirect($this->generateUrl('config').'#set2'); + } + + // handle tagging rule + $taggingRule = new TaggingRule(); + $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5')); + $newTaggingRule->handleRequest($request); + + if ($newTaggingRule->isValid()) { + $taggingRule->setConfig($config); + $em->persist($taggingRule); + $em->flush(); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Tagging rules updated' + ); + + return $this->redirect($this->generateUrl('config').'#set5'); } // handle adding new user - $newUser = new User(); - $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile'))); + $newUser = $userManager->createUser(); + // enable created user by default + $newUser->setEnabled(true); + $newUserForm = $this->createForm(NewUserType::class, $newUser, array( + 'validation_groups' => array('Profile'), + 'action' => $this->generateUrl('config').'#set6', + )); $newUserForm->handleRequest($request); - if ($newUserForm->isValid()) { - $em->persist($newUser); + 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')); + $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); @@ -116,10 +147,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( @@ -129,11 +160,13 @@ class ConfigController extends Controller 'pwd' => $pwdForm->createView(), 'user' => $userForm->createView(), 'new_user' => $newUserForm->createView(), + 'new_tagging_rule' => $newTaggingRule->createView(), ), 'rss' => array( 'username' => $user->getUsername(), 'token' => $config->getRssToken(), ), + 'twofactor_auth' => $this->getParameter('twofactor_auth'), )); } @@ -142,7 +175,7 @@ class ConfigController extends Controller * * @Route("/generate-token", name="generate_token") * - * @return JsonResponse + * @return RedirectResponse|JsonResponse */ public function generateTokenAction(Request $request) { @@ -157,7 +190,39 @@ 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'); + } + + /** + * Deletes a tagging rule and redirect to the config homepage. + * + * @param TaggingRule $rule + * + * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") + * + * @return RedirectResponse + */ + public function deleteTaggingRuleAction(TaggingRule $rule) + { + if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { + throw $this->createAccessDeniedException('You can not access this tagging rule.'); + } + + $em = $this->getDoctrine()->getManager(); + $em->remove($rule); + $em->flush(); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Tagging rule deleted' + ); + + return $this->redirect($this->generateUrl('config').'#set5'); } /**