Skip to content

Commit 044e1be

Browse files
thorstenthorsten
committed
refactor: added controller for update and fetch glossary, simplified rewrite rules (#2791)
1 parent 700857c commit 044e1be

File tree

9 files changed

+127
-460
lines changed

9 files changed

+127
-460
lines changed

‎nginx.conf‎

Lines changed: 7 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -35,44 +35,8 @@ server {
3535
index index.php;
3636

3737
if (!-f $request_filename) {
38-
# show all categories
39-
rewrite ^/showcat.html$ /index.php?action=show last;
40-
41-
# the search page
42-
rewrite ^/search.html$ /index.php?action=search last;
43-
44-
# the add content page
45-
rewrite ^/addcontent.html$ /index.php?action=add last;
46-
47-
# the ask question page
48-
rewrite ^/ask.html$ /index.php?action=ask last;
49-
50-
# the open questions page
51-
rewrite ^/open-questions.html$ /index.php?action=open-questions last;
52-
53-
# the help page
54-
rewrite ^/help.html$ /index.php?action=help last;
55-
56-
# the contact page
57-
rewrite ^/contact.html$ /index.php?action=contact last;
58-
59-
# the glossary page
60-
rewrite ^/glossary.html$ /index.php?action=glossary last;
61-
62-
# the overview page
63-
rewrite ^/overview.html$ /index.php?action=overview last;
64-
65-
# the login page
66-
rewrite ^/login.html$ /index.php?action=login last;
67-
68-
# the privacy page
69-
rewrite ^/privacy.html$ /index.php?action=privacy last;
70-
71-
# start page
72-
rewrite ^/index.html$ /index.php last;
73-
74-
# sitemap (backward compatibility)
75-
rewrite ^/sitemap-([a-zA-Z0-9]*)_([a-z\-]+).html$ /index.php?action=sitemap&letter=$1&lang=$2 last;
38+
# General pages
39+
rewrite ^/(showcat|search|addcontent|ask|open-questions|help|contact|glossary|overview|login|privacy|index).html$ /index.php?action=$1 last;
7640

7741
# a solution id page
7842
rewrite ^/solution_id_([0-9]+).html$ /index.php?solution_id=$1 last;
@@ -81,127 +45,42 @@ server {
8145
rewrite ^/bookmarks.html$ /index.php?action=bookmarks last;
8246

8347
# PMF faq record page
84-
# * http://[...]/content/1/1/<LANGUAGE CODE>/<FAQ TOPIC>.htm
85-
# * http://[...]/content/1/1/<LANGUAGE CODE>/<FAQ TOPIC>.html
8648
rewrite content/([0-9]+)/([0-9]+)/([a-z\-]+)/(.+).html$ /index.php?action=faq&cat=$1&id=$2&artlang=$3 last;
8749

8850
# PMF category page with page count
89-
# * http://[...]/category/1/<PAGE NUMBER/<CATEGORY NAME>.htm
90-
# * http://[...]/category/1/<PAGE NUMBER/<CATEGORY NAME>.html
9151
rewrite category/([0-9]+)/([0-9]+)/(.+).html$ /index.php?action=show&cat=$1&seite=$2 last;
9252

9353
# PMF category page
94-
# * http://[...]/category/1/<CATEGORY NAME>.htm
95-
# * http://[...]/category/1/<CATEGORY NAME>.html
9654
rewrite category/([0-9]+)/(.+).html$ /index.php?action=show&cat=$1 last;
9755

9856
# PMF news page
9957
rewrite news/([0-9]+)/([a-z\-]+)/(.+).html$ /index.php?action=news&newsid=$1&newslang=$2 last;
10058

10159
# PMF sitemap
102-
# * http://[...]/sitemap/<LETTER>/<LANGUAGE CODE>.htm
103-
# * http://[...]/sitemap/<LETTER>/<LANGUAGE CODE>.html
10460
rewrite sitemap/([^\/]+)/([a-z\-]+).htm(l?)$ /index.php?action=sitemap&letter=$1&lang=$2 last;
10561

10662
# PMF Google sitemap
107-
# * http://[...]/sitemap.xml
108-
# * http://[...]/sitemap.gz
109-
# * http://[...]/sitemap.xml.gz
11063
rewrite sitemap.xml$ /sitemap.xml.php last;
11164
rewrite sitemap.gz$ /sitemap.xml.php?gz=1 last;
11265
rewrite sitemap.xml.gz$ /sitemap.xml.php?gz=1 last;
11366

11467
# PMF tags page with page count
115-
# * http://[...]/tags/<ID>/<PAGE NUMBER>/<HEADER>.htm
11668
rewrite tags/([0-9]+)/([0-9]+)/(.+).htm(l?)$ /index.php?action=search&tagging_id=$1&seite=$2 last;
11769

11870
# PMF tags page
119-
# * http://[...]/tags/<ID>/<HEADER>.htm
12071
rewrite tags/([0-9]+)/([^\/]+).htm(l?)$ /index.php?action=search&tagging_id=$1 last;
12172

12273
# User pages
123-
rewrite user/ucp /index.php?action=ucp last;
124-
rewrite user/bookmarks /index.php?action=bookmarks last;
125-
rewrite user/request-removal /index.php?action=request-removal last;
126-
rewrite user/logout /index.php?action=logout last;
74+
rewrite user/(ucp|bookmarks|request-removal|logout) /index.php?action=$1 last;
12775

12876
# Private APIs
129-
rewrite api/autocomplete /api/index.php last;
130-
rewrite api/bookmark/([0-9]+) /api/index.php last;
77+
rewrite api/(autocomplete|bookmark/([0-9]+)) /api/index.php last;
13178

13279
# Setup APIs
133-
rewrite api/setup/check /api/index.php last;
134-
rewrite api/setup/backup /api/index.php last;
135-
rewrite api/setup/update-database /api/index.php last;
80+
rewrite api/setup/(check|backup|update-database) /api/index.php last;
13681

13782
# Administration API
138-
rewrite admin/api/category/delete /admin/api/index.php last;
139-
rewrite admin/api/category/permissions /admin/api/index.php last;
140-
rewrite admin/api/category/update-order /admin/api/index.php last;
141-
rewrite admin/api/category/translations /admin/api/index.php last;
142-
rewrite admin/api/configuration/faqs-sorting-key /admin/api/index.php last;
143-
rewrite admin/api/configuration/faqs-sorting-order /admin/api/index.php last;
144-
rewrite admin/api/configuration/faqs-sorting-popular /admin/api/index.php last;
145-
rewrite admin/api/configuration/list /admin/api/index.php last;
146-
rewrite admin/api/configuration/perm-level /admin/api/index.php last;
147-
rewrite admin/api/configuration/release-environment /admin/api/index.php last;
148-
rewrite admin/api/configuration/search-relevance /admin/api/index.php last;
149-
rewrite admin/api/configuration/send-test-mail /admin/api/index.php last;
150-
rewrite admin/api/configuration/seo-metatags /admin/api/index.php last;
151-
rewrite admin/api/configuration/templates /admin/api/index.php last;
152-
rewrite admin/api/configuration/translations /admin/api/index.php last;
153-
rewrite admin/api/configuration/ /admin/api/index.php last;
154-
rewrite admin/api/content/attachments /admin/api/index.php last;
155-
rewrite admin/api/content/attachments/upload /admin/api/index.php last;
156-
rewrite admin/api/content/comments /admin/api/index.php last;
157-
rewrite admin/api/content/images /admin/api/index.php last;
158-
rewrite admin/api/content/markdown /admin/api/index.php last;
159-
rewrite admin/api/content/tags /admin/api/index.php last;
160-
rewrite admin/api/content/tag /admin/api/index.php last;
161-
rewrite admin/api/dashboard/topten /admin/api/index.php last;
162-
rewrite admin/api/dashboard/versions /admin/api/index.php last;
163-
rewrite admin/api/dashboard/visits /admin/api/index.php last;
164-
rewrite admin/api/elasticsearch/create /admin/api/index.php last;
165-
rewrite admin/api/elasticsearch/drop /admin/api/index.php last;
166-
rewrite admin/api/elasticsearch/import /admin/api/index.php last;
167-
rewrite admin/api/elasticsearch/statistics /admin/api/index.php last;
168-
rewrite admin/api/export/file /admin/api/index.php last;
169-
rewrite admin/api/export/report /admin/api/index.php last;
170-
rewrite admin/api/faq/activate /admin/api/index.php last;
171-
rewrite admin/api/faq/delete /admin/api/index.php last;
172-
rewrite admin/api/faq/permissions /admin/api/index.php last;
173-
rewrite admin/api/faq/search /admin/api/index.php last;
174-
rewrite admin/api/faq/sticky /admin/api/index.php last;
175-
rewrite admin/api/faqs /admin/api/index.php last;
176-
rewrite admin/api/glossary/add /admin/api/index.php last;
177-
rewrite admin/api/glossary/delete /admin/api/index.php last;
178-
rewrite admin/api/group/data /admin/api/index.php last;
179-
rewrite admin/api/group/groups /admin/api/index.php last;
180-
rewrite admin/api/group/members /admin/api/index.php last;
181-
rewrite admin/api/group/permissions /admin/api/index.php last;
182-
rewrite admin/api/instance/add /admin/api/index.php last;
183-
rewrite admin/api/instance/delete /admin/api/index.php last;
184-
rewrite admin/api/question/delete /admin/api/index.php last;
185-
rewrite admin/api/search/term /admin/api/index.php last;
186-
rewrite admin/api/stopword/delete /admin/api/index.php last;
187-
rewrite admin/api/stopword/save /admin/api/index.php last;
188-
rewrite admin/api/stopwords /admin/api/index.php last;
189-
rewrite admin/api/user/users /admin/api/index.php last;
190-
rewrite admin/api/user/activate /admin/api/index.php last;
191-
rewrite admin/api/user/add /admin/api/index.php last;
192-
rewrite admin/api/user/data /admin/api/index.php last;
193-
rewrite admin/api/user/delete /admin/api/index.php last;
194-
rewrite admin/api/user/permissions /admin/api/index.php last;
195-
rewrite admin/api/user/overwrite-password /admin/api/index.php last;
196-
rewrite admin/api/health-check /admin/api/index.php last;
197-
rewrite admin/api/updates /admin/api/index.php last;
198-
rewrite admin/api/update-check /admin/api/index.php last;
199-
rewrite admin/api/download-package /admin/api/index.php last;
200-
rewrite admin/api/extract-package /admin/api/index.php last;
201-
rewrite admin/api/create-temporary-backup /admin/api/index.php last;
202-
rewrite admin/api/install-package /admin/api/index.php last;
203-
rewrite admin/api/update-database /admin/api/index.php last;
204-
rewrite admin/api/cleanup /admin/api/index.php last;
83+
rewrite admin/api/(.*) /admin/api/index.php last;
20584

20685
# REST API v2.0
20786
# * http://[...]/api/v2.0/<ACTION>
@@ -273,20 +152,7 @@ server {
273152
rewrite api/v2.2/register /api.php?action=register last;
274153

275154
# REST API v3.0
276-
# * http://[...]/api/v3.0/<ACTION>
277-
RewriteRule api/v3.0/attachments/([0-9]+) /api/index.php last;
278-
RewriteRule api/v3.0/categories /api/index.php last;
279-
RewriteRule api/v3.0/comments/([0-9]+) /api/index.php last;
280-
RewriteRule api/v3.0/groups /api/index.php last;
281-
RewriteRule api/v3.0/language /api/index.php last;
282-
RewriteRule api/v3.0/login /api/index.php last;
283-
RewriteRule api/v3.0/news /api/index.php last;
284-
RewriteRule api/v3.0/open-questions /api/index.php last;
285-
RewriteRule api/v3.0/search /api/index.php last;
286-
RewriteRule api/v3.0/searches/popular /api/index.php last;
287-
RewriteRule api/v3.0/tags /api/index.php last;
288-
RewriteRule api/v3.0/title /api/index.php last;
289-
RewriteRule api/v3.0/version /api/index.php last;
155+
rewrite api/v3.0/(.*) /api/index.php last;
290156

291157
break;
292158
}

0 commit comments

Comments
 (0)