diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 4c0b410d08..0a0c1394f9 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -3057,7 +3057,7 @@ function PMA_updatePrivileges($username, $hostname, $tablename, $dbname) * * @return array() */ -function PMA_updateDataForChangeOrCopyUser($Password) +function PMA_getDataForChangeOrCopyUser($Password) { $row = null; $queries = null; @@ -3099,7 +3099,7 @@ function PMA_updateDataForChangeOrCopyUser($Password) * * @return array */ -function PMA_updateDataForDeleteUsers($queries) +function PMA_getDataForDeleteUsers($queries) { if (isset($_REQUEST['change_copy'])) { $selected_usr = array( @@ -3161,7 +3161,7 @@ function PMA_updateMessageForReload() * * @return null */ -function PMA_updateDataForQueries($queries, $queries_for_display) +function PMA_getDataForQueries($queries, $queries_for_display) { $tmp_count = 0; foreach ($queries as $sql_query) { @@ -3190,7 +3190,7 @@ function PMA_updateDataForQueries($queries, $queries_for_display) * * @return array */ -function PMA_updateDataForAddUser( +function PMA_getDataForAddUser( $dbname, $username, $hostname, $password, $is_menuwork ) { @@ -3281,7 +3281,7 @@ function PMA_updateDataForAddUser( * * @return array */ -function PMA_updateDataForDBInfo() +function PMA_getDataForDBInfo() { $dbname = null; $tablename = null; diff --git a/server_privileges.php b/server_privileges.php index e0b5a6dc49..185699dd97 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -123,7 +123,7 @@ $strPrivDescUsage = __('No privileges.'); * Get DB information: dbname, tablename, db_and_table, dbname_is_wildcard */ list($dbname, $tablename, $db_and_table, $dbname_is_wildcard) - = PMA_updateDataForDBInfo(); + = PMA_getDataForDBInfo(); /** * Checks if the user is allowed to do what he tries to... @@ -138,7 +138,7 @@ if (! $is_superuser) { * Changes / copies a user, part I */ list($row, $queries, $password) - = PMA_updateDataForChangeOrCopyUser( + = PMA_getDataForChangeOrCopyUser( isset($Password)? $Password : null ); @@ -147,7 +147,7 @@ list($row, $queries, $password) * (Changes / copies a user, part II) */ list($ret_message, $ret_queries, $queries_for_display, $sql_query, $_add_user_error) - = PMA_updateDataForAddUser( + = PMA_getDataForAddUser( isset($dbname)? $dbname : null, isset($username)? $username : null, isset($hostname)? $hostname : null, @@ -221,7 +221,7 @@ if (isset($_REQUEST['change_pw'])) { if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4) ) { - $queries = PMA_updateDataForDeleteUsers($queries); + $queries = PMA_getDataForDeleteUsers($queries); if (empty($_REQUEST['change_copy'])) { list($sql_query, $message) = PMA_deleteUser($queries); } @@ -231,7 +231,7 @@ if (isset($_REQUEST['delete']) * Changes / copies a user, part V */ if (isset($_REQUEST['change_copy'])) { - $queries = PMA_updateDataForQueries($queries, $queries_for_display); + $queries = PMA_getDataForQueries($queries, $queries_for_display); $message = PMA_Message::success(); $sql_query = join("\n", $queries); }