use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
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()) {
$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);
+ }
- 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(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'));
+ 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'));
+ 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 = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $this->generateUrl('config').'#set5']);
$newTaggingRule->handleRequest($request);
if ($newTaggingRule->isValid()) {
$this->get('session')->getFlashBag()->add(
'notice',
- 'Tagging rules updated'
+ 'flashes.config.notice.tagging_rules_updated'
);
- return $this->redirect($this->generateUrl('config'));
+ return $this->redirect($this->generateUrl('config').'#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'),
+ $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')) {
$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);
$this->get('session')->getFlashBag()->add(
'notice',
- sprintf('User "%s" added', $newUser->getUsername())
+ $this->get('translator')->trans('flashes.config.notice.user_added', ['%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(
- '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'),
+ ]);
}
/**
*
* @Route("/generate-token", name="generate_token")
*
- * @return JsonResponse
+ * @return RedirectResponse|JsonResponse
*/
public function generateTokenAction(Request $request)
{
$em->flush();
if ($request->isXmlHttpRequest()) {
- return new JsonResponse(array('token' => $config->getRssToken()));
+ return new JsonResponse(['token' => $config->getRssToken()]);
}
- return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config');
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'flashes.config.notice.rss_token_updated'
+ );
+
+ return $this->redirect($this->generateUrl('config').'#set2');
}
/**
*
* @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
*
- * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ * @return RedirectResponse
*/
- public function deleteTaggingRule(TaggingRule $rule)
+ 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();
$this->get('session')->getFlashBag()->add(
'notice',
- 'Tagging rule deleted'
+ 'flashes.config.notice.tagging_rules_deleted'
);
- return $this->redirect($this->generateUrl('config'));
+ return $this->redirect($this->generateUrl('config').'#set5');
}
/**
* 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()
{
projects / github / wallabag / wallabag.git / blobdiff