diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-05-30 13:52:26 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-05-30 13:59:33 +0200 |
commit | 4346a86068781f4acdeb574d7e2af08b77b58ea7 (patch) | |
tree | 5c392314913f7cbcd2658893432ff5f9db318465 /src/Wallabag/CoreBundle/Controller | |
parent | 399bd777d7900f532bfcfa367da88767739391bc (diff) | |
download | wallabag-4346a86068781f4acdeb574d7e2af08b77b58ea7.tar.gz wallabag-4346a86068781f4acdeb574d7e2af08b77b58ea7.tar.zst wallabag-4346a86068781f4acdeb574d7e2af08b77b58ea7.zip |
CS
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 16 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 6 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/SecurityController.php | 9 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 8a8f3cd7..7fd982c9 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -50,7 +50,7 @@ class EntryController extends Controller | |||
50 | } | 50 | } |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Shows unread entries for current user | 53 | * Shows unread entries for current user. |
54 | * | 54 | * |
55 | * @Route("/unread", name="unread") | 55 | * @Route("/unread", name="unread") |
56 | * | 56 | * |
@@ -70,7 +70,7 @@ class EntryController extends Controller | |||
70 | } | 70 | } |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Shows read entries for current user | 73 | * Shows read entries for current user. |
74 | * | 74 | * |
75 | * @Route("/archive", name="archive") | 75 | * @Route("/archive", name="archive") |
76 | * | 76 | * |
@@ -90,7 +90,7 @@ class EntryController extends Controller | |||
90 | } | 90 | } |
91 | 91 | ||
92 | /** | 92 | /** |
93 | * Shows starred entries for current user | 93 | * Shows starred entries for current user. |
94 | * | 94 | * |
95 | * @Route("/starred", name="starred") | 95 | * @Route("/starred", name="starred") |
96 | * | 96 | * |
@@ -110,7 +110,7 @@ class EntryController extends Controller | |||
110 | } | 110 | } |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Shows entry content | 113 | * Shows entry content. |
114 | * | 114 | * |
115 | * @param Entry $entry | 115 | * @param Entry $entry |
116 | * | 116 | * |
@@ -129,7 +129,7 @@ class EntryController extends Controller | |||
129 | } | 129 | } |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * Changes read status for an entry | 132 | * Changes read status for an entry. |
133 | * | 133 | * |
134 | * @param Request $request | 134 | * @param Request $request |
135 | * @param Entry $entry | 135 | * @param Entry $entry |
@@ -154,7 +154,7 @@ class EntryController extends Controller | |||
154 | } | 154 | } |
155 | 155 | ||
156 | /** | 156 | /** |
157 | * Changes favorite status for an entry | 157 | * Changes favorite status for an entry. |
158 | * | 158 | * |
159 | * @param Request $request | 159 | * @param Request $request |
160 | * @param Entry $entry | 160 | * @param Entry $entry |
@@ -179,7 +179,7 @@ class EntryController extends Controller | |||
179 | } | 179 | } |
180 | 180 | ||
181 | /** | 181 | /** |
182 | * Deletes entry | 182 | * Deletes entry. |
183 | * | 183 | * |
184 | * @param Request $request | 184 | * @param Request $request |
185 | * @param Entry $entry | 185 | * @param Entry $entry |
@@ -205,7 +205,7 @@ class EntryController extends Controller | |||
205 | } | 205 | } |
206 | 206 | ||
207 | /** | 207 | /** |
208 | * Check if the logged user can manage the given entry | 208 | * Check if the logged user can manage the given entry. |
209 | * | 209 | * |
210 | * @param Entry $entry | 210 | * @param Entry $entry |
211 | */ | 211 | */ |
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 14f1dcb2..86754e15 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -11,7 +11,7 @@ use Wallabag\CoreBundle\Entity\Entry; | |||
11 | class RssController extends Controller | 11 | class RssController extends Controller |
12 | { | 12 | { |
13 | /** | 13 | /** |
14 | * Shows unread entries for current user | 14 | * Shows unread entries for current user. |
15 | * | 15 | * |
16 | * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"}) | 16 | * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"}) |
17 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 17 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") |
@@ -35,7 +35,7 @@ class RssController extends Controller | |||
35 | } | 35 | } |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * Shows read entries for current user | 38 | * Shows read entries for current user. |
39 | * | 39 | * |
40 | * @Route("/{username}/{token}/archive.xml", name="archive_rss") | 40 | * @Route("/{username}/{token}/archive.xml", name="archive_rss") |
41 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 41 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") |
@@ -59,7 +59,7 @@ class RssController extends Controller | |||
59 | } | 59 | } |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * Shows starred entries for current user | 62 | * Shows starred entries for current user. |
63 | * | 63 | * |
64 | * @Route("/{username}/{token}/starred.xml", name="starred_rss") | 64 | * @Route("/{username}/{token}/starred.xml", name="starred_rss") |
65 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") | 65 | * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") |
diff --git a/src/Wallabag/CoreBundle/Controller/SecurityController.php b/src/Wallabag/CoreBundle/Controller/SecurityController.php index fe511db5..a61a898b 100644 --- a/src/Wallabag/CoreBundle/Controller/SecurityController.php +++ b/src/Wallabag/CoreBundle/Controller/SecurityController.php | |||
@@ -30,9 +30,10 @@ class SecurityController extends Controller | |||
30 | } | 30 | } |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Request forgot password: show form | 33 | * Request forgot password: show form. |
34 | * | 34 | * |
35 | * @Route("/forgot-password", name="forgot_password") | 35 | * @Route("/forgot-password", name="forgot_password") |
36 | * | ||
36 | * @Method({"GET", "POST"}) | 37 | * @Method({"GET", "POST"}) |
37 | */ | 38 | */ |
38 | public function forgotPasswordAction(Request $request) | 39 | public function forgotPasswordAction(Request $request) |
@@ -73,9 +74,10 @@ class SecurityController extends Controller | |||
73 | } | 74 | } |
74 | 75 | ||
75 | /** | 76 | /** |
76 | * Tell the user to check his email provider | 77 | * Tell the user to check his email provider. |
77 | * | 78 | * |
78 | * @Route("/forgot-password/check-email", name="forgot_password_check_email") | 79 | * @Route("/forgot-password/check-email", name="forgot_password_check_email") |
80 | * | ||
79 | * @Method({"GET"}) | 81 | * @Method({"GET"}) |
80 | */ | 82 | */ |
81 | public function checkEmailAction(Request $request) | 83 | public function checkEmailAction(Request $request) |
@@ -93,9 +95,10 @@ class SecurityController extends Controller | |||
93 | } | 95 | } |
94 | 96 | ||
95 | /** | 97 | /** |
96 | * Reset user password | 98 | * Reset user password. |
97 | * | 99 | * |
98 | * @Route("/forgot-password/{token}", name="forgot_password_reset") | 100 | * @Route("/forgot-password/{token}", name="forgot_password_reset") |
101 | * | ||
99 | * @Method({"GET", "POST"}) | 102 | * @Method({"GET", "POST"}) |
100 | */ | 103 | */ |
101 | public function resetAction(Request $request, $token) | 104 | public function resetAction(Request $request, $token) |