diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 9257ab18..3b281d48 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -14,7 +14,7 @@ use Wallabag\CoreBundle\Entity\Config; | |||
14 | use Wallabag\CoreBundle\Entity\TaggingRule; | 14 | use Wallabag\CoreBundle\Entity\TaggingRule; |
15 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; | 15 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; |
16 | use Wallabag\CoreBundle\Form\Type\ConfigType; | 16 | use Wallabag\CoreBundle\Form\Type\ConfigType; |
17 | use Wallabag\CoreBundle\Form\Type\RssType; | 17 | use Wallabag\CoreBundle\Form\Type\FeedType; |
18 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; | 18 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; |
19 | use Wallabag\CoreBundle\Form\Type\UserInformationType; | 19 | use Wallabag\CoreBundle\Form\Type\UserInformationType; |
20 | use Wallabag\CoreBundle\Tools\Utils; | 20 | use Wallabag\CoreBundle\Tools\Utils; |
@@ -92,17 +92,17 @@ class ConfigController extends Controller | |||
92 | return $this->redirect($this->generateUrl('config') . '#set3'); | 92 | return $this->redirect($this->generateUrl('config') . '#set3'); |
93 | } | 93 | } |
94 | 94 | ||
95 | // handle rss information | 95 | // handle feed information |
96 | $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config') . '#set2']); | 96 | $feedForm = $this->createForm(FeedType::class, $config, ['action' => $this->generateUrl('config') . '#set2']); |
97 | $rssForm->handleRequest($request); | 97 | $feedForm->handleRequest($request); |
98 | 98 | ||
99 | if ($rssForm->isSubmitted() && $rssForm->isValid()) { | 99 | if ($feedForm->isSubmitted() && $feedForm->isValid()) { |
100 | $em->persist($config); | 100 | $em->persist($config); |
101 | $em->flush(); | 101 | $em->flush(); |
102 | 102 | ||
103 | $this->addFlash( | 103 | $this->addFlash( |
104 | 'notice', | 104 | 'notice', |
105 | 'flashes.config.notice.rss_updated' | 105 | 'flashes.config.notice.feed_updated' |
106 | ); | 106 | ); |
107 | 107 | ||
108 | return $this->redirect($this->generateUrl('config') . '#set2'); | 108 | return $this->redirect($this->generateUrl('config') . '#set2'); |
@@ -143,14 +143,14 @@ class ConfigController extends Controller | |||
143 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ | 143 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ |
144 | 'form' => [ | 144 | 'form' => [ |
145 | 'config' => $configForm->createView(), | 145 | 'config' => $configForm->createView(), |
146 | 'rss' => $rssForm->createView(), | 146 | 'feed' => $feedForm->createView(), |
147 | 'pwd' => $pwdForm->createView(), | 147 | 'pwd' => $pwdForm->createView(), |
148 | 'user' => $userForm->createView(), | 148 | 'user' => $userForm->createView(), |
149 | 'new_tagging_rule' => $newTaggingRule->createView(), | 149 | 'new_tagging_rule' => $newTaggingRule->createView(), |
150 | ], | 150 | ], |
151 | 'rss' => [ | 151 | 'feed' => [ |
152 | 'username' => $user->getUsername(), | 152 | 'username' => $user->getUsername(), |
153 | 'token' => $config->getRssToken(), | 153 | 'token' => $config->getFeedToken(), |
154 | ], | 154 | ], |
155 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | 155 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), |
156 | 'wallabag_url' => $this->getParameter('domain_name'), | 156 | 'wallabag_url' => $this->getParameter('domain_name'), |
@@ -281,19 +281,19 @@ class ConfigController extends Controller | |||
281 | public function generateTokenAction(Request $request) | 281 | public function generateTokenAction(Request $request) |
282 | { | 282 | { |
283 | $config = $this->getConfig(); | 283 | $config = $this->getConfig(); |
284 | $config->setRssToken(Utils::generateToken()); | 284 | $config->setFeedToken(Utils::generateToken()); |
285 | 285 | ||
286 | $em = $this->getDoctrine()->getManager(); | 286 | $em = $this->getDoctrine()->getManager(); |
287 | $em->persist($config); | 287 | $em->persist($config); |
288 | $em->flush(); | 288 | $em->flush(); |
289 | 289 | ||
290 | if ($request->isXmlHttpRequest()) { | 290 | if ($request->isXmlHttpRequest()) { |
291 | return new JsonResponse(['token' => $config->getRssToken()]); | 291 | return new JsonResponse(['token' => $config->getFeedToken()]); |
292 | } | 292 | } |
293 | 293 | ||
294 | $this->addFlash( | 294 | $this->addFlash( |
295 | 'notice', | 295 | 'notice', |
296 | 'flashes.config.notice.rss_token_updated' | 296 | 'flashes.config.notice.feed_token_updated' |
297 | ); | 297 | ); |
298 | 298 | ||
299 | return $this->redirect($this->generateUrl('config') . '#set2'); | 299 | return $this->redirect($this->generateUrl('config') . '#set2'); |