diff --git a/index.php b/index.php index 84a06cafe8..4ddbe89a4d 100644 --- a/index.php +++ b/index.php @@ -46,6 +46,9 @@ if (isset($_GET['route']) || isset($_POST['route'])) { $routes->addRoute('GET', '/plugins', function () { require_once ROOT_PATH . 'libraries/entry_points/server/plugins.php'; }); + $routes->addRoute(['GET', 'POST'], '/privileges', function () { + require_once ROOT_PATH . 'libraries/entry_points/server/privileges.php'; + }); $routes->addGroup('/status', function (RouteCollector $routes) { $routes->addRoute('GET', '/queries', function () { require_once ROOT_PATH . 'libraries/entry_points/server/status/queries.php'; diff --git a/js/server/privileges.js b/js/server/privileges.js index 20134bed7b..a3832bec9f 100644 --- a/js/server/privileges.js +++ b/js/server/privileges.js @@ -65,7 +65,7 @@ function checkPasswordStrength (value, meterObject, meterObjectLabel, username) } /** - * AJAX scripts for server_privileges page. + * AJAX scripts for /server/privileges page. * * Actions ajaxified here: * Add user @@ -245,7 +245,7 @@ AJAX.registerOnload('server/privileges.js', function () { var $message = Functions.ajaxShowMessage(); var argsep = CommonParams.get('arg_separator'); $.post( - 'server_privileges.php', + 'index.php?route=/server/privileges', $('#changeUserGroupDialog').find('form').serialize() + argsep + 'ajax_request=1', function (data) { Functions.ajaxRemoveMessage($message); diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 173db1f34f..9a36341f0a 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -45,7 +45,7 @@ class SpecialSchemaLinks * ) * ), * // Page to link - * 'default_page' => './server_privileges.php' + * 'default_page' => './' . Url::getFromRoute('/server/privileges') * ) * ) * ) @@ -73,7 +73,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], 'table_name' => [ 'link_param' => 'table', @@ -109,7 +109,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], ], 'event' => [ @@ -202,7 +202,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], 'routine_name' => [ 'link_param' => 'item_name', @@ -228,7 +228,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], ], 'tables_priv' => [ @@ -240,7 +240,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], 'table_name' => [ 'link_param' => 'table', @@ -262,7 +262,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], ], ], @@ -364,7 +364,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php', + 'default_page' => './' . Url::getFromRoute('/server/privileges'), ], ], 'referential_constraints' => [ diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index d1a0ae4516..f2bb05ec88 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -45,7 +45,6 @@ class Core 'server_binlog.php', 'server_export.php', 'server_import.php', - 'server_privileges.php', 'server_sql.php', 'server_status.php', 'server_status_advisor.php', diff --git a/libraries/classes/Display/ChangePassword.php b/libraries/classes/Display/ChangePassword.php index a786b6caad..c5c540a6e3 100644 --- a/libraries/classes/Display/ChangePassword.php +++ b/libraries/classes/Display/ChangePassword.php @@ -50,16 +50,21 @@ class ChangePassword */ $chg_evt_handler = 'onchange'; - $is_privileges = basename($_SERVER['SCRIPT_NAME']) === 'server_privileges.php'; + $is_privileges = isset($_REQUEST['route']) && $_REQUEST['route'] === '/server/privileges'; + + $action = basename($GLOBALS['PMA_PHP_SELF']); + if ($is_privileges) { + $action = Url::getFromRoute('/server/privileges'); + } $html = '