refactor: migrated tag routes (#3834)

Author: thorsten

.docker/frankenphp/Caddyfile

@@ -33,14 +33,6 @@
     rewrite /sitemap.gz /index.php
     rewrite /sitemap.xml.gz /index.php
 
-    # Tags pages with page count
-    @tags_page path_regexp tags_page ^/tags/([0-9]+)/([0-9]+)/(.+)\.html?$
-    rewrite @tags_page /index.php?action=search&tagging_id={re.tags_page.1}&seite={re.tags_page.2}
-
-    # Tags pages
-    @tags path_regexp tags ^/tags/([0-9]+)/([^/]+)\.html?$
-    rewrite @tags /index.php?action=search&tagging_id={re.tags.1}
-
     # Setup and update pages
     @setup path /setup*
     rewrite @setup /setup/index.php
@@ -107,14 +99,6 @@
     rewrite /sitemap.gz /index.php
     rewrite /sitemap.xml.gz /index.php
 
-    # Tags pages with page count
-    @tags_page path_regexp tags_page ^/tags/([0-9]+)/([0-9]+)/(.+)\.html?$
-    rewrite @tags_page /index.php?action=search&tagging_id={re.tags_page.1}&seite={re.tags_page.2}
-
-    # Tags pages
-    @tags path_regexp tags ^/tags/([0-9]+)/([^/]+)\.html?$
-    rewrite @tags /index.php?action=search&tagging_id={re.tags.1}
-
     @setup path /setup*
     rewrite @setup /setup/index.php
 

.docker/nginx/default.conf

@@ -82,12 +82,6 @@ server {
         rewrite ^/sitemap\.gz$                                      /index.php last;
         rewrite ^/sitemap\.xml\.gz$                                 /index.php last;
 
-        # PMF tags page with page count
-        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;
-
         # Administration API
         rewrite ^/admin/api/(.*)$                                    /admin/api/index.php last;
 
@@ -222,12 +216,6 @@ server {
         rewrite ^/sitemap\.gz$                                      /index.php last;
         rewrite ^/sitemap\.xml\.gz$                                 /index.php last;
 
-        # PMF tags page with page count
-        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;
-
         # Administration API
         rewrite ^/admin/api/(.*)$                                    /admin/api/index.php last;
 

nginx.conf

@@ -93,12 +93,6 @@ server {
         rewrite ^/sitemap\.gz$                                      /index.php last;
         rewrite ^/sitemap\.xml\.gz$                                 /index.php last;
 
-        # PMF tags page with page count
-        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;
-
         # Administration API
         rewrite ^/admin/api/(.*)$                                    /admin/api/index.php last;
 

phpmyfaq/.htaccess

@@ -108,10 +108,6 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     RewriteRule ^sitemap.xml$ index.php [L,QSA]
     RewriteRule ^sitemap.gz$ index.php [L,QSA]
     RewriteRule ^sitemap.xml.gz$ index.php [L,QSA]
-    # phpMyFAQ tags page with page count
-    RewriteRule ^tags/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$ index.php?action=search&tagging_id=$1&seite=$2 [L,QSA]
-    # phpMyFAQ tags page
-    RewriteRule ^tags/([0-9]+)/([^/]+)\.htm(l?)$ index.php?action=search&tagging_id=$1 [L,QSA]
     # Administration API
     RewriteRule ^admin/api/(.*) admin/api/index.php [L,QSA]
     # Administration pages

phpmyfaq/src/phpMyFAQ/Controller/Frontend/SearchController.php

@@ -20,6 +20,7 @@
 namespace phpMyFAQ\Controller\Frontend;
 
 use Exception;
+use League\CommonMark\Exception\CommonMarkException;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Language\Plurals;
 use phpMyFAQ\Search\SearchService;
@@ -36,10 +37,37 @@
 final class SearchController extends AbstractFrontController
 {
     /**
-     * Displays search results for fulltext or tag-based search.
+     * Redirects tag URLs with pagination to search
+     *
+     * @throws Exception
+     */
+    #[Route(path: '/tags/{tagId}/{page}/{slug}.html', name: 'public.tags.paginated', methods: ['GET'])]
+    public function tagsPaginated(Request $request): Response
+    {
+        $tagId = Filter::filterVar($request->attributes->get('tagId'), FILTER_VALIDATE_INT, 0);
+        $page = Filter::filterVar($request->attributes->get('page'), FILTER_VALIDATE_INT, 1);
+
+        return new RedirectResponse(sprintf('/search.html?tagging_id=%d&seite=%d', $tagId, $page));
+    }
+
+    /**
+     * Redirects tag URLs to search
      *
      * @throws Exception
      */
+    #[Route(path: '/tags/{tagId}/{slug}.html', name: 'public.tags', methods: ['GET'])]
+    public function tags(Request $request): Response
+    {
+        $tagId = Filter::filterVar($request->attributes->get('tagId'), FILTER_VALIDATE_INT, 0);
+
+        return new RedirectResponse(sprintf('/search.html?tagging_id=%d', $tagId));
+    }
+
+    /**
+     * Displays search results for fulltext or tag-based search.
+     *
+     * @throws Exception|CommonMarkException
+     */
     #[Route(path: '/search.html', name: 'public.search', methods: ['GET'])]
     public function index(Request $request): Response
     {

phpmyfaq/src/public-routes.php

@@ -159,6 +159,16 @@
         'controller' => [SearchController::class, 'index'],
         'methods' => 'GET',
     ],
+    'public.tags.paginated' => [
+        'path' => '/tags/{tagId}/{page}/{slug}.html',
+        'controller' => [SearchController::class, 'tagsPaginated'],
+        'methods' => 'GET',
+    ],
+    'public.tags' => [
+        'path' => '/tags/{tagId}/{slug}.html',
+        'controller' => [SearchController::class, 'tags'],
+        'methods' => 'GET',
+    ],
     'public.user.register' => [
         'path' => '/user/register',
         'controller' => [UserController::class, 'register'],