From 53ef924a62a4e991baa1fd58a296fbf15aa3017e Mon Sep 17 00:00:00 2001 From: Visman Date: Wed, 12 Sep 2018 00:44:44 +0700 Subject: [PATCH] * Fix the order of routing rules --- app/Controllers/Routing.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/Routing.php b/app/Controllers/Routing.php index 7acdf20b..1fd5c6ec 100644 --- a/app/Controllers/Routing.php +++ b/app/Controllers/Routing.php @@ -124,14 +124,14 @@ class Routing $r->add('GET', '/admin/', 'AdminIndex:index', 'Admin'); $r->add('GET', '/admin/statistics', 'AdminStatistics:statistics', 'AdminStatistics'); - $r->add(['GET', 'POST'], '/admin/users', 'AdminUsers:view', 'AdminUsers'); - $r->add(['GET', 'POST'], '/admin/users/result/{data}[/{page:[1-9]\d*}]', 'AdminUsersResult:view', 'AdminUsersResult'); - $r->add(['GET', 'POST'], '/admin/users/{action:\w+}/{ids:\d+(?:-\d+)*}', 'AdminUsersAction:view', 'AdminUsersAction'); - if ($user->canViewIP) { $r->add('GET', '/admin/get/host/{ip:[0-9a-fA-F:.]+}', 'AdminHost:view', 'AdminHost'); $r->add('GET', '/admin/users/user/{id:[2-9]|[1-9]\d+}[/{page:[1-9]\d*}]', 'AdminUsersStat:view', 'AdminUserStat'); } + + $r->add(['GET', 'POST'], '/admin/users', 'AdminUsers:view', 'AdminUsers'); + $r->add(['GET', 'POST'], '/admin/users/result/{data}[/{page:[1-9]\d*}]', 'AdminUsersResult:view', 'AdminUsersResult'); + $r->add(['GET', 'POST'], '/admin/users/{action:\w+}/{ids:\d+(?:-\d+)*}', 'AdminUsersAction:view', 'AdminUsersAction'); } // только админ if ($user->isAdmin) {