use Wallabag\CoreBundle\Entity\TaggingRule;
use Wallabag\CoreBundle\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-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;
-use Wallabag\UserBundle\Entity\User;
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()) {
$em->persist($config);
$em->flush();
+ $request->getSession()->set('_locale', $config->getLanguage());
+
// 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.'
+ '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()) {
- $user->setPlainPassword($pwdForm->get('new_password')->getData());
- $userManager->updateUser($user, true);
+ if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
+ $message = 'flashes.config.notice.password_not_updated_demo';
+ } else {
+ $message = 'flashes.config.notice.password_updated';
- $this->get('session')->getFlashBag()->add(
- 'notice',
- 'Password updated'
- );
+ $user->setPlainPassword($pwdForm->get('new_password')->getData());
+ $userManager->updateUser($user, true);
+ }
+
+ $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()) {
$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()) {
$this->get('session')->getFlashBag()->add(
'notice',
- 'RSS information updated'
+ 'flashes.config.notice.rss_updated'
);
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);
+ $action = $this->generateUrl('config').'#set5';
- if ($newTaggingRule->isValid()) {
- $taggingRule->setConfig($config);
- $em->persist($taggingRule);
- $em->flush();
+ if ($request->query->has('tagging-rule')) {
+ $taggingRule = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:TaggingRule')
+ ->find($request->query->get('tagging-rule'));
- $this->get('session')->getFlashBag()->add(
- 'notice',
- 'Tagging rules updated'
- );
+ if ($this->getUser()->getId() !== $taggingRule->getConfig()->getUser()->getId()) {
+ return $this->redirect($action);
+ }
- return $this->redirect($this->generateUrl('config').'#set5');
+ $action = $this->generateUrl('config').'?tagging-rule='.$taggingRule->getId().'#set5';
}
- // handle adding new user
- $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() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) {
- $userManager->updateUser($newUser, true);
-
- $config = new Config($newUser);
- $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);
+ $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $action]);
+ $newTaggingRule->handleRequest($request);
+ if ($newTaggingRule->isValid()) {
+ $taggingRule->setConfig($config);
+ $em->persist($taggingRule);
$em->flush();
$this->get('session')->getFlashBag()->add(
'notice',
- $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername()))
+ 'flashes.config.notice.tagging_rules_updated'
);
- return $this->redirect($this->generateUrl('config').'#set6');
+ return $this->redirect($this->generateUrl('config').'#set5');
}
- 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'),
- ));
+ ]);
}
/**
$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');
*/
public function deleteTaggingRuleAction(TaggingRule $rule)
{
- if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
- throw $this->createAccessDeniedException('You can not access this tagging ryle.');
- }
+ $this->validateRuleAction($rule);
$em = $this->getDoctrine()->getManager();
$em->remove($rule);
$this->get('session')->getFlashBag()->add(
'notice',
- 'Tagging rule deleted'
+ 'flashes.config.notice.tagging_rules_deleted'
);
return $this->redirect($this->generateUrl('config').'#set5');
}
+ /**
+ * Edit a tagging rule.
+ *
+ * @param TaggingRule $rule
+ *
+ * @Route("/tagging-rule/edit/{id}", requirements={"id" = "\d+"}, name="edit_tagging_rule")
+ *
+ * @return RedirectResponse
+ */
+ public function editTaggingRuleAction(TaggingRule $rule)
+ {
+ $this->validateRuleAction($rule);
+
+ return $this->redirect($this->generateUrl('config').'?tagging-rule='.$rule->getId().'#set5');
+ }
+
+ /**
+ * Validate that a rule can be edited/deleted by the current user.
+ *
+ * @param TaggingRule $rule
+ */
+ private function validateRuleAction(TaggingRule $rule)
+ {
+ if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
+ throw $this->createAccessDeniedException('You can not access this tagging rule.');
+ }
+ }
+
/**
* 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()
{
->getRepository('WallabagCoreBundle:Config')
->findOneByUser($this->getUser());
+ // should NEVER HAPPEN ...
if (!$config) {
$config = new Config($this->getUser());
}