diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-07-09 18:45:39 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-07-09 18:45:39 +0200 |
commit | 1554eb0adac470151d9668d55ce1450c64f862d9 (patch) | |
tree | a373af783ba1d53329be9790a0f672f55cd961ec /src/Wallabag/CoreBundle/Controller/ConfigController.php | |
parent | f04611c711715064cd7a23d4dc51bc703a8dbeef (diff) | |
download | wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.tar.gz wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.tar.zst wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.zip |
Rebase & Rename all rss to feeds
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
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 7e39992d..48e0653d 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -12,7 +12,7 @@ use Wallabag\CoreBundle\Entity\Config; | |||
12 | use Wallabag\CoreBundle\Entity\TaggingRule; | 12 | use Wallabag\CoreBundle\Entity\TaggingRule; |
13 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; | 13 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; |
14 | use Wallabag\CoreBundle\Form\Type\ConfigType; | 14 | use Wallabag\CoreBundle\Form\Type\ConfigType; |
15 | use Wallabag\CoreBundle\Form\Type\RssType; | 15 | use Wallabag\CoreBundle\Form\Type\FeedType; |
16 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; | 16 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; |
17 | use Wallabag\CoreBundle\Form\Type\UserInformationType; | 17 | use Wallabag\CoreBundle\Form\Type\UserInformationType; |
18 | use Wallabag\CoreBundle\Tools\Utils; | 18 | use Wallabag\CoreBundle\Tools\Utils; |
@@ -90,17 +90,17 @@ class ConfigController extends Controller | |||
90 | return $this->redirect($this->generateUrl('config') . '#set3'); | 90 | return $this->redirect($this->generateUrl('config') . '#set3'); |
91 | } | 91 | } |
92 | 92 | ||
93 | // handle rss information | 93 | // handle feed information |
94 | $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config') . '#set2']); | 94 | $feedForm = $this->createForm(FeedType::class, $config, ['action' => $this->generateUrl('config') . '#set2']); |
95 | $rssForm->handleRequest($request); | 95 | $feedForm->handleRequest($request); |
96 | 96 | ||
97 | if ($rssForm->isSubmitted() && $rssForm->isValid()) { | 97 | if ($feedForm->isSubmitted() && $feedForm->isValid()) { |
98 | $em->persist($config); | 98 | $em->persist($config); |
99 | $em->flush(); | 99 | $em->flush(); |
100 | 100 | ||
101 | $this->get('session')->getFlashBag()->add( | 101 | $this->get('session')->getFlashBag()->add( |
102 | 'notice', | 102 | 'notice', |
103 | 'flashes.config.notice.rss_updated' | 103 | 'flashes.config.notice.feed_updated' |
104 | ); | 104 | ); |
105 | 105 | ||
106 | return $this->redirect($this->generateUrl('config') . '#set2'); | 106 | return $this->redirect($this->generateUrl('config') . '#set2'); |
@@ -141,14 +141,14 @@ class ConfigController extends Controller | |||
141 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ | 141 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ |
142 | 'form' => [ | 142 | 'form' => [ |
143 | 'config' => $configForm->createView(), | 143 | 'config' => $configForm->createView(), |
144 | 'rss' => $rssForm->createView(), | 144 | 'feed' => $feedForm->createView(), |
145 | 'pwd' => $pwdForm->createView(), | 145 | 'pwd' => $pwdForm->createView(), |
146 | 'user' => $userForm->createView(), | 146 | 'user' => $userForm->createView(), |
147 | 'new_tagging_rule' => $newTaggingRule->createView(), | 147 | 'new_tagging_rule' => $newTaggingRule->createView(), |
148 | ], | 148 | ], |
149 | 'rss' => [ | 149 | 'feed' => [ |
150 | 'username' => $user->getUsername(), | 150 | 'username' => $user->getUsername(), |
151 | 'token' => $config->getRssToken(), | 151 | 'token' => $config->getFeedToken(), |
152 | ], | 152 | ], |
153 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | 153 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), |
154 | 'wallabag_url' => $this->getParameter('domain_name'), | 154 | 'wallabag_url' => $this->getParameter('domain_name'), |
@@ -167,19 +167,19 @@ class ConfigController extends Controller | |||
167 | public function generateTokenAction(Request $request) | 167 | public function generateTokenAction(Request $request) |
168 | { | 168 | { |
169 | $config = $this->getConfig(); | 169 | $config = $this->getConfig(); |
170 | $config->setRssToken(Utils::generateToken()); | 170 | $config->setFeedToken(Utils::generateToken()); |
171 | 171 | ||
172 | $em = $this->getDoctrine()->getManager(); | 172 | $em = $this->getDoctrine()->getManager(); |
173 | $em->persist($config); | 173 | $em->persist($config); |
174 | $em->flush(); | 174 | $em->flush(); |
175 | 175 | ||
176 | if ($request->isXmlHttpRequest()) { | 176 | if ($request->isXmlHttpRequest()) { |
177 | return new JsonResponse(['token' => $config->getRssToken()]); | 177 | return new JsonResponse(['token' => $config->getFeedToken()]); |
178 | } | 178 | } |
179 | 179 | ||
180 | $this->get('session')->getFlashBag()->add( | 180 | $this->get('session')->getFlashBag()->add( |
181 | 'notice', | 181 | 'notice', |
182 | 'flashes.config.notice.rss_token_updated' | 182 | 'flashes.config.notice.feed_token_updated' |
183 | ); | 183 | ); |
184 | 184 | ||
185 | return $this->redirect($this->generateUrl('config') . '#set2'); | 185 | return $this->redirect($this->generateUrl('config') . '#set2'); |