refactor: migrated group page to controller (#3257)

thorsten · Nov 24, 2024 · 546bb8e · 546bb8e
1 parent b4f0285
commit 546bb8e
Show file tree

Hide file tree

Showing 12 changed files with 629 additions and 592 deletions.
diff --git a/nginx.conf b/nginx.conf
@@ -129,7 +129,7 @@ server {
             rewrite admin/api/(.*)                                  /admin/api/index.php last;
 
             # Administration pages
-            rewrite admin/(attachments|backup|backup/export|backup/restore|configuration|elasticsearch|export|import|instance/edit|instance/update|instances|password|session-keep-alive|stopwords|system|update|user) /admin/front.php last;
+            rewrite admin/(attachments|backup|configuration|elasticsearch|export|group|import|instance|instances|password|session-keep-alive|stopwords|system|update|user) /admin/front.php last;
 
             # REST API v3.0 and v3.1
             rewrite ^api/v3\.[01]/(.*)                              /api/index.php last;

diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
@@ -143,7 +143,7 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # Administration API
     RewriteRule ^admin/api/(.*) admin/api/index.php [L,QSA]
     # Administration pages
-    RewriteRule ^admin/(attachments|backup|backup/export|backup/restore|configuration|elasticsearch|export|import|instance/edit|instance/update|instances|password|session-keep-alive|stopwords|system|update|user) admin/front.php [L,QSA]
+    RewriteRule ^admin/(attachments|backup|configuration|elasticsearch|export|group|import|instance|instances|password|session-keep-alive|stopwords|system|update|user) admin/front.php [L,QSA]
     # Private APIs
     RewriteRule ^api/(autocomplete|bookmark/delete|bookmark/create|user/data/update|user/password/update|user/request-removal|user/remove-twofactor|contact|voting|register|captcha|share|comment/create|faq/create|question/create|webauthn/prepare|webauthn/register|webauthn/prepare-login|webauthn/login) api/index.php [L,QSA]
     # Setup APIs

diff --git a/phpmyfaq/admin/group.php b/phpmyfaq/admin/group.php
diff --git a/phpmyfaq/admin/header.php b/phpmyfaq/admin/header.php
@@ -55,7 +55,8 @@
     $secLevelEntries['user'] .= $adminHelper->addMenuEntry(
         'addgroup+editgroup+delgroup',
         'group',
-        'ad_menu_group_administration'
+        'ad_menu_group_administration',
+        'group'
     );
 }
 $secLevelEntries['content'] = $adminHelper->addMenuEntry(

diff --git a/phpmyfaq/admin/index.php b/phpmyfaq/admin/index.php
@@ -256,10 +256,6 @@
     if (!is_null($action)) {
         // the various sections of the admin area
         switch ($action) {
-            // functions for user administration
-            case 'group':
-                require 'group.php';
-                break;
             // functions for content administration
             case 'faqs-overview':
                 require 'faqs.overview.php';