Skip to content

Commit 291d91e

Browse files
thorstenthorsten
committed
feat: added rewrite rules for user pages
1 parent e6f1b05 commit 291d91e

File tree

3 files changed

+73
-40
lines changed

3 files changed

+73
-40
lines changed

‎nginx.conf

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,25 @@ server {
122122
# * http://[...]/tags/<ID>/<HEADER>.htm
123123
rewrite tags/([0-9]+)/([^\/]+).htm(l?)$ /index.php?action=search&tagging_id=$1 last;
124124

125+
# User pages
126+
RewriteRule user/ucp /index.php?action=ucp last;
127+
RewriteRule user/bookmarks /index.php?action=bookmarks last;
128+
RewriteRule user/request-removal /index.php?action=request-removal last;
129+
RewriteRule user/logout /index.php?action=logout last;
130+
125131
# REST API v2.0
126132
# * http://[...]/api/v2.0/<ACTION>
127-
rewrite api/v2.0/version /api.php?action=version last;
128-
rewrite api/v2.0/language /api.php?action=language last;
129-
rewrite api/v2.0/categories /api.php?action=categories last;
130-
rewrite api/v2.0/searches/popular /api.php?action=searches&filter=popular last;
131-
rewrite api/v2.0/search /api.php?action=search last;
132-
rewrite api/v2.0/tags /api.php?action=tags last;
133-
rewrite api/v2.0/open-questions /api.php?action=open-questions last;
134-
rewrite api/v2.0/comments/([0-9]+) /api.php?action=comments&recordId=$1 last;
135-
rewrite api/v2.0/attachments/([0-9]+) /api.php?action=attachments&recordId=$1 last;
136-
rewrite api/v2.0/news /api.php?action=news last;
137-
rewrite api/v2.0/login /api.php?action=login last;
133+
rewrite api/v2.0/version /api/index.php last;
134+
rewrite api/v2.0/language /api/index.php last;
135+
rewrite api/v2.0/categories /api/index.php last;
136+
rewrite api/v2.0/searches/popular /api/index.php last;
137+
rewrite api/v2.0/search /api/index.php last;
138+
rewrite api/v2.0/tags /api/index.php last;
139+
rewrite api/v2.0/open-questions /api/index.php last;
140+
rewrite api/v2.0/comments/([0-9]+) /api/index.php last;
141+
rewrite api/v2.0/attachments/([0-9]+) /api/index.php last;
142+
rewrite api/v2.0/news /api/index.php last;
143+
rewrite api/v2.0/login /api/index.php last;
138144
rewrite api/v2.0/faqs/([0-9]+) /api.php?action=faqs&categoryId=$1 last;
139145
rewrite api/v2.0/faqs/popular /api.php?action=faqs&filter=popular last;
140146
rewrite api/v2.0/faqs/latest /api.php?action=faqs&filter=latest last;
@@ -145,17 +151,17 @@ server {
145151

146152
# REST API v2.1
147153
# * http://[...]/api/v2.1/<ACTION>
148-
rewrite api/v2.1/version /api.php?action=version last;
149-
rewrite api/v2.1/language /api.php?action=language last;
150-
rewrite api/v2.1/categories /api.php?action=categories last;
151-
rewrite api/v2.1/searches/popular /api.php?action=searches&filter=popular last;
152-
rewrite api/v2.1/search /api.php?action=search last;
153-
rewrite api/v2.1/tags /api.php?action=tags last;
154-
rewrite api/v2.1/open-questions /api.php?action=open-questions last;
155-
rewrite api/v2.1/comments/([0-9]+) /api.php?action=comments&recordId=$1 last;
156-
rewrite api/v2.1/attachments/([0-9]+) /api.php?action=attachments&recordId=$1 last;
157-
rewrite api/v2.1/news /api.php?action=news last;
158-
rewrite api/v2.1/login /api.php?action=login last;
154+
rewrite api/v2.1/version /api/index.php last;
155+
rewrite api/v2.1/language /api/index.php last;
156+
rewrite api/v2.1/categories /api/index.php last;
157+
rewrite api/v2.1/searches/popular /api/index.php last;
158+
rewrite api/v2.1/search /api/index.php last;
159+
rewrite api/v2.1/tags /api/index.php last;
160+
rewrite api/v2.1/open-questions /api/index.php last;
161+
rewrite api/v2.1/comments/([0-9]+) /api/index.php last;
162+
rewrite api/v2.1/attachments/([0-9]+) /api/index.php last;
163+
rewrite api/v2.1/news /api/index.php last;
164+
rewrite api/v2.1/login /api/index.php last;
159165
rewrite api/v2.1/faqs/([0-9]+) /api.php?action=faqs&categoryId=$1 last;
160166
rewrite api/v2.1/faqs/popular /api.php?action=faqs&filter=popular last;
161167
rewrite api/v2.1/faqs/latest /api.php?action=faqs&filter=latest last;
@@ -168,19 +174,20 @@ server {
168174

169175
# REST API v2.2
170176
# * http://[...]/api/v2.2/<ACTION>
171-
rewrite api/v2.2/version /api.php?action=version last;
172-
rewrite api/v2.2/language /api.php?action=language last;
173-
rewrite api/v2.2/categories /api.php?action=categories last;
177+
rewrite api/v2.2/version /api/index.php last;
178+
rewrite api/v2.2/title /api/index.php last;
179+
rewrite api/v2.2/language /api/index.php last;
180+
rewrite api/v2.2/categories /api/index.php last;
174181
rewrite api/v2.2/category /api.php?action=category last;
175-
rewrite api/v2.2/groups /api.php?action=groups last;
176-
rewrite api/v2.2/searches/popular /api.php?action=searches&filter=popular last;
177-
rewrite api/v2.2/search /api.php?action=search last;
178-
rewrite api/v2.2/tags /api.php?action=tags last;
179-
rewrite api/v2.2/open-questions /api.php?action=open-questions last;
180-
rewrite api/v2.2/comments/([0-9]+) /api.php?action=comments&recordId=$1 last;
181-
rewrite api/v2.2/attachments/([0-9]+) /api.php?action=attachments&recordId=$1 last;
182-
rewrite api/v2.2/news /api.php?action=news last;
183-
rewrite api/v2.2/login /api.php?action=login last;
182+
rewrite api/v2.2/groups /api/index.php last;
183+
rewrite api/v2.2/searches/popular /api/index.php last;
184+
rewrite api/v2.2/search /api/index.php last;
185+
rewrite api/v2.2/tags /api/index.php last;
186+
rewrite api/v2.2/open-questions /api/index.php last;
187+
rewrite api/v2.2/comments/([0-9]+) /api/index.php last;
188+
rewrite api/v2.2/attachments/([0-9]+) /api/index.php last;
189+
rewrite api/v2.2/news /api/index.php last;
190+
rewrite api/v2.2/login /api/index.php last;
184191
rewrite api/v2.2/faqs/([0-9]+) /api.php?action=faqs&categoryId=$1 last;
185192
rewrite api/v2.2/faqs/popular /api.php?action=faqs&filter=popular last;
186193
rewrite api/v2.2/faqs/latest /api.php?action=faqs&filter=latest last;
@@ -190,6 +197,22 @@ server {
190197
rewrite api/v2.2/faq/([0-9]+)/([0-9]+) /api.php?action=faq&categoryId=$1&recordId=$2 last;
191198
rewrite api/v2.2/register /api.php?action=register last;
192199

200+
# REST API v2.3
201+
# * http://[...]/api/v2.3/<ACTION>
202+
RewriteRule api/v2.3/attachments/([0-9]+) /api/index.php last;
203+
RewriteRule api/v2.3/categories /api/index.php last;
204+
RewriteRule api/v2.3/comments/([0-9]+) /api/index.php last;
205+
RewriteRule api/v2.3/groups /api/index.php last;
206+
RewriteRule api/v2.3/language /api/index.php last;
207+
RewriteRule api/v2.3/login /api/index.php last;
208+
RewriteRule api/v2.3/news /api/index.php last;
209+
RewriteRule api/v2.3/open-questions /api/index.php last;
210+
RewriteRule api/v2.3/search /api/index.php last;
211+
RewriteRule api/v2.3/searches/popular /api/index.php last;
212+
RewriteRule api/v2.3/tags /api/index.php last;
213+
RewriteRule api/v2.3/title /api/index.php last;
214+
RewriteRule api/v2.3/version /api/index.php last;
215+
193216
break;
194217
}
195218
}

‎phpmyfaq/.htaccess

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ RewriteRule tags/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$ index.php?ac
132132
# * http://[...]/tags/<ID>/<HEADER>.html
133133
RewriteRule tags/([0-9]+)/([^\/]+)\.htm(l?)$ index.php?action=search&tagging_id=$1 [L,QSA]
134134

135+
# User pages
136+
RewriteRule user/ucp index.php?action=ucp [L,QSA]
137+
RewriteRule user/bookmarks index.php?action=bookmarks [L,QSA]
138+
RewriteRule user/request-removal index.php?action=request-removal [L,QSA]
139+
RewriteRule user/logout index.php?action=logout [L,QSA]
140+
135141
# Administration API
136142
RewriteRule admin/api/updates admin/api/updates.php
137143
RewriteRule admin/api/update-check admin/api/updates.php

‎phpmyfaq/index.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -674,16 +674,20 @@
674674
'msgUserControl' => $adminSection,
675675
'msgLoginName' => $user->getUserData('display_name'), // @deprecated
676676
'activeUserControl' => ('ucp' == $action) ? 'active' : '',
677-
'msgUserControlDropDown' => '<a class="dropdown-item" href="?action=ucp">' .
678-
Translation::get('headerUserControlPanel') . '</a>',
677+
'msgUserControlDropDown' => sprintf(
678+
'<a class="dropdown-item" href="user/ucp">%s</a>',
679+
Translation::get('headerUserControlPanel')
680+
),
679681
'msgBookmarks' => sprintf(
680-
'<a class="dropdown-item" href="?action=bookmarks">%s</a>',
682+
'<a class="dropdown-item" href="user/bookmarks">%s</a>',
681683
Translation::get('msgBookmarks')
682684
),
683-
'msgUserRemoval' => '<a class="dropdown-item" href="?action=request-removal">' .
684-
Translation::get('ad_menu_RequestRemove') . '</a>',
685+
'msgUserRemoval' => sprintf(
686+
'<a class="dropdown-item" href="user/request-removal">%s</a>',
687+
Translation::get('ad_menu_RequestRemove')
688+
),
685689
'msgLogoutUser' => sprintf(
686-
'<a class="dropdown-item" href="?action=logout&csrf=%s">%s</a>',
690+
'<a class="dropdown-item" href="user/logout?csrf=%s">%s</a>',
687691
Token::getInstance()->getTokenString('logout'),
688692
Translation::get('ad_menu_logout'),
689693
)

0 commit comments

Comments
 (0)