Skip to content

Commit 86cc0e4

Browse files
thorstenthorsten
committed
fix: corrected URL schemes
1 parent 02da302 commit 86cc0e4

File tree

11 files changed

+32
-27
lines changed

11 files changed

+32
-27
lines changed

‎docs/openapi.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"content": {
5151
"application/json": {
5252
"schema": {},
53-
"example": "\n [\n {\n \"filename\": \"attachment-1.pdf\",\n \"url\": \"https://www.example.org/index.php?action=attachment&id=1\"\n },\n {\n \"filename\": \"attachment-2.pdf\",\n \"url\": \"https://www.example.org/index.php?action=attachment&id=2\"\n }\n ]"
53+
"example": "\n [\n {\n \"filename\": \"attachment-1.pdf\",\n \"url\": \"https://www.example.org/attachment/1\"\n },\n {\n \"filename\": \"attachment-2.pdf\",\n \"url\": \"https://www.example.org/attachment/2\"\n }\n ]"
5454
}
5555
}
5656
},
@@ -430,7 +430,7 @@
430430
"content": {
431431
"application/json": {
432432
"schema": {},
433-
"example": "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
433+
"example": "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq//content/1/1/en/is-there-life-after-death.html\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
434434
}
435435
}
436436
},
@@ -547,7 +547,7 @@
547547
"content": {
548548
"application/json": {
549549
"schema": {},
550-
"example": "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
550+
"example": "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq//content/1/1/en/is-there-life-after-death.html\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
551551
}
552552
}
553553
},
@@ -590,7 +590,7 @@
590590
"content": {
591591
"application/json": {
592592
"schema": {},
593-
"example": "[\n {\n \"date\": \"2019-07-13T11:28:00+0200\",\n \"question\": \"How can I survive without phpMyFAQ?\",\n \"answer\": \"A good question!\",\n \"visits\": 10,\n \"url\": \"https://www.example.org/index.php?action=faq&cat=1&id=36&artlang=de\"\n }\n ]"
593+
"example": "[\n {\n \"date\": \"2019-07-13T11:28:00+0200\",\n \"question\": \"How can I survive without phpMyFAQ?\",\n \"answer\": \"A good question!\",\n \"visits\": 10,\n \"url\": \"https://www.example.org/content/1/36/de/how-can-i-survive-without-phpmyfaq.html\"\n }\n ]"
594594
}
595595
}
596596
},
@@ -1239,7 +1239,7 @@
12391239
"content": {
12401240
"application/json": {
12411241
"schema": {},
1242-
"example": "\n [\n {\n \"id\": 1,\n \"lang\": \"en\",\n \"date\": \"2019-08-23T20:43:00+0200\",\n \"header\": \"Hallo, World!\",\n \"content\": \"Hello, phpMyFAQ!\",\n \"authorName\": \"phpMyFAQ User\",\n \"authorEmail\": \"user@example.org\",\n \"dateStart\": \"0\",\n \"dateEnd\": \"99991231235959\",\n \"active\": true,\n \"allowComments\": true,\n \"link\": \"\",\n \"linkTitle\": \"\",\n \"target\": \"\",\n \"url\": \"https://www.example.org/?action=news&newsid=1&newslang=de\"\n }\n ]"
1242+
"example": "\n [\n {\n \"id\": 1,\n \"lang\": \"en\",\n \"date\": \"2019-08-23T20:43:00+0200\",\n \"header\": \"Hallo, World!\",\n \"content\": \"Hello, phpMyFAQ!\",\n \"authorName\": \"phpMyFAQ User\",\n \"authorEmail\": \"user@example.org\",\n \"dateStart\": \"0\",\n \"dateEnd\": \"99991231235959\",\n \"active\": true,\n \"allowComments\": true,\n \"link\": \"\",\n \"linkTitle\": \"\",\n \"target\": \"\",\n \"url\": \"https://www.example.org/news/1/de/hallo-phpmyfaq.html\"\n }\n ]"
12431243
}
12441244
}
12451245
},
@@ -1589,7 +1589,7 @@
15891589
"content": {
15901590
"application/json": {
15911591
"schema": {},
1592-
"example": "\n [\n {\n \"id\": \"1\",\n \"lang\": \"en\",\n \"category_id\": \"15\",\n \"question\": \"Why are you using phpMyFAQ?\",\n \"answer\": \"Because it is cool!\",\n \"link\": \"https://www.example.org/index.php?action=faq&cat=15&id=1&artlang=en\"\n }\n ]"
1592+
"example": "\n [\n {\n \"id\": \"1\",\n \"lang\": \"en\",\n \"category_id\": \"15\",\n \"question\": \"Why are you using phpMyFAQ?\",\n \"answer\": \"Because it is cool!\",\n \"link\": \"https://www.example.org/content/15/1/en/why-are-you-using-phpmyfaq.html\"\n }\n ]"
15931593
}
15941594
}
15951595
},

‎docs/openapi.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ paths:
3737
content:
3838
application/json:
3939
schema: {}
40-
example: "\n [\n {\n \"filename\": \"attachment-1.pdf\",\n \"url\": \"https://www.example.org/index.php?action=attachment&id=1\"\n },\n {\n \"filename\": \"attachment-2.pdf\",\n \"url\": \"https://www.example.org/index.php?action=attachment&id=2\"\n }\n ]"
40+
example: "\n [\n {\n \"filename\": \"attachment-1.pdf\",\n \"url\": \"https://www.example.org/attachment/1\"\n },\n {\n \"filename\": \"attachment-2.pdf\",\n \"url\": \"https://www.example.org/attachment/2\"\n }\n ]"
4141
'404':
4242
description: 'If the FAQ has no attachments.'
4343
headers:
@@ -290,7 +290,7 @@ paths:
290290
content:
291291
application/json:
292292
schema: {}
293-
example: "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
293+
example: "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq//content/1/1/en/is-there-life-after-death.html\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
294294
'404':
295295
description: 'If the category has no FAQs.'
296296
headers:
@@ -368,7 +368,7 @@ paths:
368368
content:
369369
application/json:
370370
schema: {}
371-
example: "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
371+
example: "[\n {\n \"record_id\": 1,\n \"record_lang\": \"en\",\n \"category_id\": 1,\n \"record_title\": \"Is there life after death?\",\n \"record_preview\": \"Maybe!\",\n \"record_link\": \"/phpmyfaq//content/1/1/en/is-there-life-after-death.html\",\n \"record_updated\": \"20191010175452\",\n \"visits\": 3,\n \"record_created\": \"2018-09-03T21:30:17+02:00\"\n }\n ]"
372372
'404':
373373
description: 'If the tag ID has no FAQs.'
374374
headers:
@@ -397,7 +397,7 @@ paths:
397397
content:
398398
application/json:
399399
schema: {}
400-
example: "[\n {\n \"date\": \"2019-07-13T11:28:00+0200\",\n \"question\": \"How can I survive without phpMyFAQ?\",\n \"answer\": \"A good question!\",\n \"visits\": 10,\n \"url\": \"https://www.example.org/index.php?action=faq&cat=1&id=36&artlang=de\"\n }\n ]"
400+
example: "[\n {\n \"date\": \"2019-07-13T11:28:00+0200\",\n \"question\": \"How can I survive without phpMyFAQ?\",\n \"answer\": \"A good question!\",\n \"visits\": 10,\n \"url\": \"https://www.example.org/content/1/36/de/how-can-i-survive-without-phpmyfaq.html\"\n }\n ]"
401401
'404':
402402
description: "If there's not a single popular FAQ."
403403
headers:
@@ -838,7 +838,7 @@ paths:
838838
content:
839839
application/json:
840840
schema: {}
841-
example: "\n [\n {\n \"id\": 1,\n \"lang\": \"en\",\n \"date\": \"2019-08-23T20:43:00+0200\",\n \"header\": \"Hallo, World!\",\n \"content\": \"Hello, phpMyFAQ!\",\n \"authorName\": \"phpMyFAQ User\",\n \"authorEmail\": \"user@example.org\",\n \"dateStart\": \"0\",\n \"dateEnd\": \"99991231235959\",\n \"active\": true,\n \"allowComments\": true,\n \"link\": \"\",\n \"linkTitle\": \"\",\n \"target\": \"\",\n \"url\": \"https://www.example.org/?action=news&newsid=1&newslang=de\"\n }\n ]"
841+
example: "\n [\n {\n \"id\": 1,\n \"lang\": \"en\",\n \"date\": \"2019-08-23T20:43:00+0200\",\n \"header\": \"Hallo, World!\",\n \"content\": \"Hello, phpMyFAQ!\",\n \"authorName\": \"phpMyFAQ User\",\n \"authorEmail\": \"user@example.org\",\n \"dateStart\": \"0\",\n \"dateEnd\": \"99991231235959\",\n \"active\": true,\n \"allowComments\": true,\n \"link\": \"\",\n \"linkTitle\": \"\",\n \"target\": \"\",\n \"url\": \"https://www.example.org/news/1/de/hallo-phpmyfaq.html\"\n }\n ]"
842842
'404':
843843
description: 'If no news are stored.'
844844
headers:
@@ -1078,7 +1078,7 @@ paths:
10781078
content:
10791079
application/json:
10801080
schema: {}
1081-
example: "\n [\n {\n \"id\": \"1\",\n \"lang\": \"en\",\n \"category_id\": \"15\",\n \"question\": \"Why are you using phpMyFAQ?\",\n \"answer\": \"Because it is cool!\",\n \"link\": \"https://www.example.org/index.php?action=faq&cat=15&id=1&artlang=en\"\n }\n ]"
1081+
example: "\n [\n {\n \"id\": \"1\",\n \"lang\": \"en\",\n \"category_id\": \"15\",\n \"question\": \"Why are you using phpMyFAQ?\",\n \"answer\": \"Because it is cool!\",\n \"link\": \"https://www.example.org/content/15/1/en/why-are-you-using-phpmyfaq.html\"\n }\n ]"
10821082
'404':
10831083
description: 'If the search returns no results'
10841084
content:

‎phpmyfaq/assets/templates/admin/configuration/forms.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
{% endif %}
101101
</td>
102102
<td>
103-
<a href="?action=forms-translations&formid={{ input.form_id }}&inputid={{ input.input_id }}">
103+
<a href="/forms/translate/{{ input.form_id }}/{{ input.input_id }}">
104104
<span class="badge bg-primary">
105105
<i aria-hidden="true" class="bi bi-globe bi-white"></i></span>
106106
</a>

‎phpmyfaq/assets/templates/admin/content/attachments.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</td>
4747
<td>
4848
<a title="{{ adminMsgFaqTitle }}" class="btn btn-info"
49-
href="../index.php?action=faq&id={{ item.record_id }}&lang={{ item.record_lang }}">
49+
href="../content/0/{{ item.record_id }}/{{ item.record_lang }}/faq.html">
5050
<i aria-hidden="true" class="bi bi-link"></i>
5151
</a>
5252
</td>

‎phpmyfaq/assets/templates/admin/content/comments.twig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@
102102
{{ comment.date | format_datetime(locale=currentLocale) }}
103103
</div>
104104
<div class="d-flex align-items-center me-3">
105-
<a href="../news/{{ comment.recordId }}/{{ currentLocale }}/news.html">
106-
<i class="bi bi-newspaper"></i>
105+
<i class="bi bi-newspaper me-1"></i>
106+
<a href="../news/{{ comment.recordId }}/{{ currentLocale }}/{{ newsHeader[comment.recordId].header | slugify }}.html">
107+
{{ newsHeader[comment.recordId].header }}
107108
</a>
108109
</div>
109110
</div>

‎phpmyfaq/src/phpMyFAQ/Controller/Administration/CommentsController.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public function index(Request $request): Response
5858
$faqComments = array_slice($allFaqComments, ($page - 1) * $itemsPerPage, $itemsPerPage);
5959
$newsComments = array_slice($allNewsComments, ($page - 1) * $itemsPerPage, $itemsPerPage);
6060

61+
$news = $this->container->get(id: 'phpmyfaq.news');
62+
$newsHeader = $news->getHeader();
63+
6164
$baseUrl = sprintf('%sadmin/comments?page=%d', $this->configuration->getDefaultUrl(), $page);
6265

6366
$faqCommentsPagination = new Pagination([
@@ -83,6 +86,7 @@ public function index(Request $request): Response
8386
'newsComments' => $newsComments,
8487
'faqCommentsPagination' => $faqCommentsPagination->render(),
8588
'newsCommentsPagination' => $newsCommentsPagination->render(),
89+
'newsHeader' => $newsHeader,
8690
'csrfToken' => Token::getInstance($this->session)->getTokenString(page: 'delete-comment'),
8791
]);
8892
}

‎phpmyfaq/src/phpMyFAQ/Controller/Api/AttachmentController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public function __construct()
6363
[
6464
{
6565
"filename": "attachment-1.pdf",
66-
"url": "https://www.example.org/index.php?action=attachment&id=1"
66+
"url": "https://www.example.org/attachment/1"
6767
},
6868
{
6969
"filename": "attachment-2.pdf",
70-
"url": "https://www.example.org/index.php?action=attachment&id=2"
70+
"url": "https://www.example.org/attachment/2"
7171
}
7272
]',
7373
))]

‎phpmyfaq/src/phpMyFAQ/Controller/Api/FaqController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function __construct()
7474
"category_id": 1,
7575
"record_title": "Is there life after death?",
7676
"record_preview": "Maybe!",
77-
"record_link": "/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en",
77+
"record_link": "/phpmyfaq//content/1/1/en/is-there-life-after-death.html",
7878
"record_updated": "20191010175452",
7979
"visits": 3,
8080
"record_created": "2018-09-03T21:30:17+02:00"
@@ -206,7 +206,7 @@ public function getById(Request $request): JsonResponse
206206
"category_id": 1,
207207
"record_title": "Is there life after death?",
208208
"record_preview": "Maybe!",
209-
"record_link": "/phpmyfaq/phpmyfaq/index.php?action=faq&cat=1&id=1&artlang=en",
209+
"record_link": "/phpmyfaq//content/1/1/en/is-there-life-after-death.html",
210210
"record_updated": "20191010175452",
211211
"visits": 3,
212212
"record_created": "2018-09-03T21:30:17+02:00"
@@ -256,7 +256,7 @@ public function getByTagId(Request $request): JsonResponse
256256
"question": "How can I survive without phpMyFAQ?",
257257
"answer": "A good question!",
258258
"visits": 10,
259-
"url": "https://www.example.org/index.php?action=faq&cat=1&id=36&artlang=de"
259+
"url": "https://www.example.org/content/1/36/de/how-can-i-survive-without-phpmyfaq.html"
260260
}
261261
]',
262262
))]

‎phpmyfaq/src/phpMyFAQ/Controller/Api/NewsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct()
6363
"link": "",
6464
"linkTitle": "",
6565
"target": "",
66-
"url": "https://www.example.org/?action=news&newsid=1&newslang=de"
66+
"url": "https://www.example.org/news/1/de/hallo-phpmyfaq.html"
6767
}
6868
]'),
6969
)]

‎phpmyfaq/src/phpMyFAQ/News.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getHeader(): array
143143
$headers = [];
144144
$language = $this->configuration->getLanguage()->getLanguage();
145145
foreach ($this->newsRepository->getHeaders($language) as $header) {
146-
$headers[] = [
146+
$headers[$header->id] = [
147147
'id' => $header->id,
148148
'lang' => $header->lang,
149149
'header' => $header->header,

0 commit comments

Comments
 (0)