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\Request;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\CoreBundle\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\UserInformationType;
-use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
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('config', $config, array('action' => $this->generateUrl('config')));
+ $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
$configForm->handleRequest($request);
if ($configForm->isValid()) {
}
// handle changing password
- $pwdForm = $this->createForm(new ChangePasswordType(), null, array('action' => $this->generateUrl('config').'#set4'));
+ $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
$pwdForm->handleRequest($request);
if ($pwdForm->isValid()) {
}
// handle changing user information
- $userForm = $this->createForm(new UserInformationType(), $user, array(
+ $userForm = $this->createForm(UserInformationType::class, $user, array(
'validation_groups' => array('Profile'),
'action' => $this->generateUrl('config').'#set3',
));
}
// handle rss information
- $rssForm = $this->createForm(new RssType(), $config, array('action' => $this->generateUrl('config').'#set2'));
+ $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
$rssForm->handleRequest($request);
if ($rssForm->isValid()) {
// handle tagging rule
$taggingRule = new TaggingRule();
- $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule);
+ $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
$newTaggingRule->handleRequest($request);
if ($newTaggingRule->isValid()) {
$newUser = $userManager->createUser();
// enable created user by default
$newUser->setEnabled(true);
- $newUserForm = $this->createForm(new NewUserType(), $newUser, array(
+ $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
'validation_groups' => array('Profile'),
- 'action' => $this->generateUrl('config').'#set5',
+ 'action' => $this->generateUrl('config').'#set6',
));
$newUserForm->handleRequest($request);
$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->container->getParameter('wallabag_core.theme'));
+ $config->setItemsPerPage($this->container->getParameter('wallabag_core.items_on_page'));
+ $config->setRssLimit($this->container->getParameter('wallabag_core.rss_limit'));
+ $config->setLanguage($this->container->getParameter('wallabag_core.language'));
$em->persist($config);
'username' => $user->getUsername(),
'token' => $config->getRssToken(),
),
+ 'twofactor_auth' => $this->getParameter('twofactor_auth'),
));
}