diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/FeedController.php | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index 9d55a9b7..8d422a90 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php | |||
@@ -8,7 +8,6 @@ use Pagerfanta\Exception\OutOfRangeCurrentPageException; | |||
8 | use Pagerfanta\Pagerfanta; | 8 | use Pagerfanta\Pagerfanta; |
9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
10 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 10 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
11 | use Symfony\Component\HttpFoundation\Request; | ||
12 | use Symfony\Component\HttpFoundation\Response; | 11 | use Symfony\Component\HttpFoundation\Response; |
13 | use Symfony\Component\Routing\Annotation\Route; | 12 | use Symfony\Component\Routing\Annotation\Route; |
14 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 13 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
@@ -20,8 +19,8 @@ class FeedController extends Controller | |||
20 | /** | 19 | /** |
21 | * Shows unread entries for current user. | 20 | * Shows unread entries for current user. |
22 | * | 21 | * |
23 | * @Route("/feed/{username}/{token}/unread/{page}", name="unread_feed", defaults={"page": 1}) | 22 | * @Route("/feed/{username}/{token}/unread/{page}", name="unread_feed", defaults={"page"=1, "_format"="xml"}) |
24 | * @Route("/{username}/{token}/unread.xml", defaults={"page": 1}) | 23 | * |
25 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 24 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
26 | * | 25 | * |
27 | * @param User $user | 26 | * @param User $user |
@@ -37,8 +36,8 @@ class FeedController extends Controller | |||
37 | /** | 36 | /** |
38 | * Shows read entries for current user. | 37 | * Shows read entries for current user. |
39 | * | 38 | * |
40 | * @Route("/feed/{username}/{token}/archive/{page}", name="archive_feed", defaults={"page": 1}) | 39 | * @Route("/feed/{username}/{token}/archive/{page}", name="archive_feed", defaults={"page"=1, "_format"="xml"}) |
41 | * @Route("/{username}/{token}/archive.xml", defaults={"page": 1}) | 40 | * |
42 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 41 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
43 | * | 42 | * |
44 | * @param User $user | 43 | * @param User $user |
@@ -54,8 +53,8 @@ class FeedController extends Controller | |||
54 | /** | 53 | /** |
55 | * Shows starred entries for current user. | 54 | * Shows starred entries for current user. |
56 | * | 55 | * |
57 | * @Route("/feed/{username}/{token}/starred/{page}", name="starred_feed", defaults={"page": 1}) | 56 | * @Route("/feed/{username}/{token}/starred/{page}", name="starred_feed", defaults={"page"=1, "_format"="xml"}) |
58 | * @Route("/{username}/{token}/starred.xml", defaults={"page": 1}) | 57 | * |
59 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 58 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
60 | * | 59 | * |
61 | * @param User $user | 60 | * @param User $user |
@@ -71,29 +70,29 @@ class FeedController extends Controller | |||
71 | /** | 70 | /** |
72 | * Shows all entries for current user. | 71 | * Shows all entries for current user. |
73 | * | 72 | * |
74 | * @Route("/{username}/{token}/all.xml", name="all_feed", defaults={"_format"="xml"}) | 73 | * @Route("/feed/{username}/{token}/all/{page}", name="all_feed", defaults={"page"=1, "_format"="xml"}) |
74 | * | ||
75 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 75 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
76 | * | 76 | * |
77 | * @return \Symfony\Component\HttpFoundation\Response | 77 | * @return \Symfony\Component\HttpFoundation\Response |
78 | */ | 78 | */ |
79 | public function showAllFeedAction(Request $request, User $user) | 79 | public function showAllFeedAction(User $user, $page) |
80 | { | 80 | { |
81 | return $this->showEntries('all', $user, $request->query->get('page', 1)); | 81 | return $this->showEntries('all', $user, $page); |
82 | } | 82 | } |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Shows entries associated to a tag for current user. | 85 | * Shows entries associated to a tag for current user. |
86 | * | 86 | * |
87 | * @Route("/{username}/{token}/tags/{slug}.xml", name="tag_feed", defaults={"_format"="xml"}) | 87 | * @Route("/feed/{username}/{token}/tags/{slug}/{page}", name="tag_feed", defaults={"page"=1, "_format"="xml"}) |
88 | * | ||
88 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 89 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
89 | * @ParamConverter("tag", options={"mapping": {"slug": "slug"}}) | 90 | * @ParamConverter("tag", options={"mapping": {"slug": "slug"}}) |
90 | * | 91 | * |
91 | * @return \Symfony\Component\HttpFoundation\Response | 92 | * @return \Symfony\Component\HttpFoundation\Response |
92 | */ | 93 | */ |
93 | public function showTagsFeedAction(Request $request, User $user, Tag $tag) | 94 | public function showTagsFeedAction(User $user, Tag $tag, $page) |
94 | { | 95 | { |
95 | $page = $request->query->get('page', 1); | ||
96 | |||
97 | $url = $this->generateUrl( | 96 | $url = $this->generateUrl( |
98 | 'tag_feed', | 97 | 'tag_feed', |
99 | [ | 98 | [ |