X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=4f75511bf62cf5c7ee23b5ceb5eaeeb16a89248f;hb=7e98ad962680fac17b3b90ae34b9c6e5afe7636f;hp=87196b0ec3f2bb9d1794069a46dd24c2237be49d;hpb=a4f42c59f0d8a408cf9f5d7971146866530012d3;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 87196b0e..4f75511b 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -16,7 +16,6 @@ use Wallabag\CoreBundle\Form\Type\RssType; use Wallabag\CoreBundle\Form\Type\TaggingRuleType; use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\CoreBundle\Tools\Utils; -use Wallabag\UserBundle\Entity\User; class ConfigController extends Controller { @@ -33,7 +32,7 @@ class ConfigController extends Controller $user = $this->getUser(); // handle basic config detail (this form is defined as a service) - $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config'))); + $configForm = $this->createForm(ConfigType::class, $config, ['action' => $this->generateUrl('config')]); $configForm->handleRequest($request); if ($configForm->isValid()) { @@ -46,40 +45,36 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Config saved. Some parameters will be considered after disconnection.' + 'flashes.config.notice.config_saved' ); return $this->redirect($this->generateUrl('config')); } // handle changing password - $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4')); + $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config').'#set4']); $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { - $this->get('session')->getFlashBag()->add( - 'notice', - 'In demonstration mode, you can\'t change password for this user.' - ); + $message = 'flashes.config.notice.password_not_updated_demo'; } else { + $message = 'flashes.config.notice.password_updated'; + $user->setPlainPassword($pwdForm->get('new_password')->getData()); $userManager->updateUser($user, true); - - $this->get('session')->getFlashBag()->add( - 'notice', - 'Password updated' - ); } + $this->get('session')->getFlashBag()->add('notice', $message); + return $this->redirect($this->generateUrl('config').'#set4'); } // handle changing user information - $userForm = $this->createForm(UserInformationType::class, $user, array( - 'validation_groups' => array('Profile'), + $userForm = $this->createForm(UserInformationType::class, $user, [ + 'validation_groups' => ['Profile'], 'action' => $this->generateUrl('config').'#set3', - )); + ]); $userForm->handleRequest($request); if ($userForm->isValid()) { @@ -87,14 +82,14 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Information updated' + 'flashes.config.notice.user_updated' ); return $this->redirect($this->generateUrl('config').'#set3'); } // handle rss information - $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2')); + $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config').'#set2']); $rssForm->handleRequest($request); if ($rssForm->isValid()) { @@ -103,7 +98,7 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'RSS information updated' + 'flashes.config.notice.rss_updated' ); return $this->redirect($this->generateUrl('config').'#set2'); @@ -111,7 +106,7 @@ class ConfigController extends Controller // handle tagging rule $taggingRule = new TaggingRule(); - $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5')); + $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $this->generateUrl('config').'#set5']); $newTaggingRule->handleRequest($request); if ($newTaggingRule->isValid()) { @@ -121,7 +116,7 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Tagging rules updated' + 'flashes.config.notice.tagging_rules_updated' ); return $this->redirect($this->generateUrl('config').'#set5'); @@ -131,10 +126,10 @@ class ConfigController extends Controller $newUser = $userManager->createUser(); // enable created user by default $newUser->setEnabled(true); - $newUserForm = $this->createForm(NewUserType::class, $newUser, array( - 'validation_groups' => array('Profile'), + $newUserForm = $this->createForm(NewUserType::class, $newUser, [ + 'validation_groups' => ['Profile'], 'action' => $this->generateUrl('config').'#set6', - )); + ]); $newUserForm->handleRequest($request); if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { @@ -145,6 +140,7 @@ class ConfigController extends Controller $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page')); $config->setRssLimit($this->getParameter('wallabag_core.rss_limit')); $config->setLanguage($this->getParameter('wallabag_core.language')); + $config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed')); $em->persist($config); @@ -152,27 +148,27 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername())) + $this->get('translator')->trans('flashes.config.notice.user_added', ['%username%' => $newUser->getUsername()]) ); return $this->redirect($this->generateUrl('config').'#set6'); } - return $this->render('WallabagCoreBundle:Config:index.html.twig', array( - 'form' => array( + return $this->render('WallabagCoreBundle:Config:index.html.twig', [ + 'form' => [ 'config' => $configForm->createView(), 'rss' => $rssForm->createView(), 'pwd' => $pwdForm->createView(), 'user' => $userForm->createView(), 'new_user' => $newUserForm->createView(), 'new_tagging_rule' => $newTaggingRule->createView(), - ), - 'rss' => array( + ], + 'rss' => [ 'username' => $user->getUsername(), 'token' => $config->getRssToken(), - ), + ], 'twofactor_auth' => $this->getParameter('twofactor_auth'), - )); + ]); } /** @@ -192,12 +188,12 @@ class ConfigController extends Controller $em->flush(); if ($request->isXmlHttpRequest()) { - return new JsonResponse(array('token' => $config->getRssToken())); + return new JsonResponse(['token' => $config->getRssToken()]); } $this->get('session')->getFlashBag()->add( 'notice', - 'RSS token updated' + 'flashes.config.notice.rss_token_updated' ); return $this->redirect($this->generateUrl('config').'#set2'); @@ -215,7 +211,7 @@ class ConfigController extends Controller public function deleteTaggingRuleAction(TaggingRule $rule) { if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { - throw $this->createAccessDeniedException('You can not access this tagging ryle.'); + throw $this->createAccessDeniedException('You can not access this tagging rule.'); } $em = $this->getDoctrine()->getManager(); @@ -224,7 +220,7 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Tagging rule deleted' + 'flashes.config.notice.tagging_rules_deleted' ); return $this->redirect($this->generateUrl('config').'#set5'); @@ -234,7 +230,7 @@ class ConfigController extends Controller * Retrieve config for the current user. * If no config were found, create a new one. * - * @return Wallabag\CoreBundle\Entity\Config + * @return Config */ private function getConfig() {