Merge branch '4.0' into 'main'

Author: thorsten

.docker/nginx/default.conf

@@ -67,7 +67,7 @@ server {
             rewrite ^/bookmarks.html$                               /index.php?action=bookmarks last;
 
             # PMF faq record page
-            rewrite ^/content/([0-9]+)/([0-9]+)/([a-z\-]+)/(.+).html$ /index.php?action=faq&cat=$1&id=$2&artlang=$3 last;
+            rewrite ^/content/([0-9]+)/([0-9]+)/([a-z\-_]+)/(.+).html$ /index.php?action=faq&cat=$1&id=$2&artlang=$3 last;
 
             # PMF category page with page count
             rewrite ^/category/([0-9]+)/([0-9]+)/(.+).html$           /index.php?action=show&cat=$1&seite=$2 last;
@@ -76,10 +76,10 @@ server {
             rewrite ^/category/([0-9]+)/(.+).html$                    /index.php?action=show&cat=$1 last;
 
             # PMF news page
-            rewrite ^/news/([0-9]+)/([a-z\-]+)/(.+).html$             /index.php?action=news&newsid=$1&newslang=$2 last;
+            rewrite ^/news/([0-9]+)/([a-z\-_]+)/(.+).html$             /index.php?action=news&newsid=$1&newslang=$2 last;
 
             # PMF sitemap
-            rewrite ^/sitemap/([^\/]+)/([a-z\-]+).htm(l?)$            /index.php?action=sitemap&letter=$1&lang=$2 last;
+            rewrite ^/sitemap/([^\/]+)/([a-z\-_]+).htm(l?)$            /index.php?action=sitemap&letter=$1&lang=$2 last;
 
             # PMF Google sitemap
             rewrite ^/sitemap.xml$ /sitemap.xml.php last;

nginx.conf

@@ -81,7 +81,7 @@ server {
             rewrite ^/bookmarks.html$                               /index.php?action=bookmarks last;
 
             # PMF faq record page
-            rewrite ^/content/([0-9]+)/([0-9]+)/([a-z\-]+)/(.+).html$ /index.php?action=faq&cat=$1&id=$2&artlang=$3 last;
+            rewrite ^/content/([0-9]+)/([0-9]+)/([a-z\-_]+)/(.+)\.htm(l?)$ /index.php?action=faq&cat=$1&id=$2&artlang=$3 last;
 
             # PMF category page with page count
             rewrite ^/category/([0-9]+)/([0-9]+)/(.+).html$           /index.php?action=show&cat=$1&seite=$2 last;
@@ -90,10 +90,10 @@ server {
             rewrite ^/category/([0-9]+)/(.+).html$                    /index.php?action=show&cat=$1 last;
 
             # PMF news page
-            rewrite ^/news/([0-9]+)/([a-z\-]+)/(.+).html$             /index.php?action=news&newsid=$1&newslang=$2 last;
+            rewrite ^/news/([0-9]+)/([a-z\-_]+)/(.+).html$             /index.php?action=news&newsid=$1&newslang=$2 last;
 
             # PMF sitemap
-            rewrite ^/sitemap/([^\/]+)/([a-z\-]+).htm(l?)$            /index.php?action=sitemap&letter=$1&lang=$2 last;
+            rewrite s^/itemap/([^\/]+)/([a-z\-_]+).htm(l?)$            /index.php?action=sitemap&letter=$1&lang=$2 last;
 
             # PMF Google sitemap
             rewrite ^/sitemap.xml$ /sitemap.xml.php last;
@@ -107,16 +107,16 @@ server {
             rewrite ^/tags/([0-9]+)/([0-9]+)/(.+).htm(l?)$            /index.php?action=search&tagging_id=$1&seite=$2 last;
 
             # PMF tags page
-            rewrite ^/tags/([0-9]+)/([^\/]+).htm(l?)$                 /index.php?action=search&tagging_id=$1 last;
+            rewrite tags/([0-9]+)/([^\/]+).htm(l?)$                 /index.php?action=search&tagging_id=$1 last;
 
             # Authentication services
-            rewrite ^/services/webauthn(.*)                           /services/webauthn/index.php last;
+            rewrite services/webauthn(.*)                           /services/webauthn/index.php last;
 
             # User pages
-            rewrite ^/user/(ucp|bookmarks|request-removal|logout|register) /index.php?action=$1 last;
+            rewrite user/(ucp|bookmarks|request-removal|logout|register) /index.php?action=$1 last;
 
             # Administration API
-            rewrite ^/admin/api/(.*)                                  /admin/api/index.php last;
+            rewrite admin/api/(.*)                                  /admin/api/index.php last;
 
             # Administration pages
             rewrite ^/admin/(.*)                                      /admin/index.php last;

phpmyfaq/.htaccess

@@ -116,15 +116,15 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # the bookmarks page
     RewriteRule ^bookmarks\.html$ index.php?action=bookmarks [L,QSA]
     # phpMyFAQ faq record page
-    RewriteRule ^content/([0-9]+)/([0-9]+)/([a-z\-]+)/(.+)\.htm(l?)$ index.php?action=faq&cat=$1&id=$2&artlang=$3 [L,QSA]
+    RewriteRule ^content/([0-9]+)/([0-9]+)/([a-z\-_]+)/(.+)\.htm(l?)$ index.php?action=faq&cat=$1&id=$2&artlang=$3 [L,QSA]
     # phpMyFAQ category page with page count
     RewriteRule ^category/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$ index.php?action=show&cat=$1&seite=$2 [L,QSA]
     # phpMyFAQ category page
     RewriteRule ^category/([0-9]+)/(.+)\.htm(l?)$ index.php?action=show&cat=$1 [L,QSA]
     # phpMyFAQ news page
-    RewriteRule ^news/([0-9]+)/([a-z\-]+)/(.+)\.htm(l?)$ index.php?action=news&newsid=$1&newslang=$2 [L,QSA]
+    RewriteRule ^news/([0-9]+)/([a-z\-_]+)/(.+)\.htm(l?)$ index.php?action=news&newsid=$1&newslang=$2 [L,QSA]
     # phpMyFAQ sitemap
-    RewriteRule ^sitemap/([^\/]+)/([a-z\-]+)\.htm(l?)$ index.php?action=sitemap&letter=$1&lang=$2 [L,QSA]
+    RewriteRule ^sitemap/([^\/]+)/([a-z\-_]+)\.htm(l?)$ index.php?action=sitemap&letter=$1&lang=$2 [L,QSA]
     # phpMyFAQ Google sitemap
     RewriteRule ^sitemap.xml$ sitemap.xml.php [L,QSA]
     RewriteRule ^sitemap.gz$ sitemap.xml.php?gz=1 [L,QSA]