namespace Wallabag\CoreBundle\Controller;
-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 Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
$activeTheme = $this->get('liip_theme.active_theme');
$activeTheme->setName($config->getTheme());
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.config_saved'
);
$userManager->updateUser($user, true);
}
- $this->get('session')->getFlashBag()->add('notice', $message);
+ $this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('config') . '#set4');
}
]);
$userForm->handleRequest($request);
+ // `googleTwoFactor` isn't a field within the User entity, we need to define it's value in a different way
+ if ($this->getParameter('twofactor_auth') && true === $user->isGoogleAuthenticatorEnabled() && false === $userForm->isSubmitted()) {
+ $userForm->get('googleTwoFactor')->setData(true);
+ }
+
if ($userForm->isSubmitted() && $userForm->isValid()) {
+ // handle creation / reset of the OTP secret if checkbox changed from the previous state
+ if ($this->getParameter('twofactor_auth')) {
+ if (true === $userForm->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
+ $secret = $this->get('scheb_two_factor.security.google_authenticator')->generateSecret();
+
+ $user->setGoogleAuthenticatorSecret($secret);
+ $user->setEmailTwoFactor(false);
+
+ $this->addFlash('OtpQrCode', $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user));
+ } elseif (false === $userForm->get('googleTwoFactor')->getData() && true === $user->isGoogleAuthenticatorEnabled()) {
+ $user->setGoogleAuthenticatorSecret(null);
+ }
+ }
+
$userManager->updateUser($user, true);
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.user_updated'
);
$em->persist($config);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_updated'
);
$em->persist($taggingRule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_updated'
);
return new JsonResponse(['token' => $config->getRssToken()]);
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_token_updated'
);
$em->remove($rule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_deleted'
);
break;
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.' . $type . '_reset'
);
return $this->redirect($request->headers->get('referer'));
}
+ /**
+ * Change the locale for the current user.
+ *
+ * @param Request $request
+ * @param string $language
+ *
+ * @Route("/locale/{language}", name="changeLocale")
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ */
+ public function setLocaleAction(Request $request, $language = null)
+ {
+ $errors = $this->get('validator')->validate($language, (new LocaleConstraint()));
+
+ if (0 === \count($errors)) {
+ $request->getSession()->set('_locale', $language);
+ }
+
+ return $this->redirect($request->headers->get('referer', $this->generateUrl('homepage')));
+ }
+
/**
* Remove all tags for given tags and a given user and cleanup orphan tags.
*
$em = $this->getDoctrine()->getManager();
foreach ($tags as $tag) {
- if (count($tag->getEntries()) === 0) {
+ if (0 === \count($tag->getEntries())) {
$em->remove($tag);
}
}