aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-06-14 16:45:06 +0200
committerThomas Citharel <tcit@tcit.fr>2017-07-09 16:18:12 +0200
commitf04611c711715064cd7a23d4dc51bc703a8dbeef (patch)
tree5d3154ab0df98b976dfee8558bf6d3c7c5bc2a2a
parent638ab25fdab1f9070b4683c82a9bf4e01101cb96 (diff)
downloadwallabag-f04611c711715064cd7a23d4dc51bc703a8dbeef.tar.gz
wallabag-f04611c711715064cd7a23d4dc51bc703a8dbeef.tar.zst
wallabag-f04611c711715064cd7a23d4dc51bc703a8dbeef.zip
Added URL compatibility
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
-rw-r--r--app/config/security.yml1
-rw-r--r--src/Wallabag/CoreBundle/Controller/RssController.php3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/config/security.yml b/app/config/security.yml
index 5f3bf0b6..60500d15 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -63,6 +63,7 @@ security:
63 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 63 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
64 - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 64 - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
65 - { path: ^/feed, roles: IS_AUTHENTICATED_ANONYMOUSLY } 65 - { path: ^/feed, roles: IS_AUTHENTICATED_ANONYMOUSLY }
66 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } # For backwards compatibility
66 - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY } 67 - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
67 - { path: ^/settings, roles: ROLE_SUPER_ADMIN } 68 - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
68 - { path: ^/annotations, roles: ROLE_USER } 69 - { path: ^/annotations, roles: ROLE_USER }
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php
index 57de0e53..a2b29e72 100644
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@@ -22,6 +22,7 @@ class RssController extends Controller
22 * Shows unread entries for current user. 22 * Shows unread entries for current user.
23 * 23 *
24 * @Route("/feed/{username}/{token}/unread/{page}", name="unread_rss", defaults={"page": 1}) 24 * @Route("/feed/{username}/{token}/unread/{page}", name="unread_rss", defaults={"page": 1})
25 * @Route("/{username}/{token}/unread.xml", defaults={"page": 1})
25 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") 26 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
26 * 27 *
27 * @param User $user 28 * @param User $user
@@ -38,6 +39,7 @@ class RssController extends Controller
38 * Shows read entries for current user. 39 * Shows read entries for current user.
39 * 40 *
40 * @Route("/feed/{username}/{token}/archive/{page}", name="archive_rss", defaults={"page": 1}) 41 * @Route("/feed/{username}/{token}/archive/{page}", name="archive_rss", defaults={"page": 1})
42 * @Route("/{username}/{token}/archive.xml", defaults={"page": 1})
41 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") 43 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
42 * 44 *
43 * @param User $user 45 * @param User $user
@@ -54,6 +56,7 @@ class RssController extends Controller
54 * Shows starred entries for current user. 56 * Shows starred entries for current user.
55 * 57 *
56 * @Route("/feed/{username}/{token}/starred/{page}", name="starred_rss", defaults={"page": 1}) 58 * @Route("/feed/{username}/{token}/starred/{page}", name="starred_rss", defaults={"page": 1})
59 * @Route("/{username}/{token}/starred.xml", defaults={"page": 1})
57 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") 60 * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
58 * 61 *
59 * @param User $user 62 * @param User $user