Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2021-09-15 20:22:39 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2021-09-15 23:05:40 +0300
commitf00d70cccb65b01504afc8c1a1a2ce8042f4c3fe (patch)
treed425a6c17c523a7580617b696cc8c861927bc14d /libraries/classes/CheckUserPrivileges.php
parent70c43a98633dc475834a0a8d008d96e846dd2ec3 (diff)
Remove useless whitespaces
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'libraries/classes/CheckUserPrivileges.php')
-rw-r--r--libraries/classes/CheckUserPrivileges.php86
1 files changed, 20 insertions, 66 deletions
diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
index 22f9602fff..91942b8277 100644
--- a/libraries/classes/CheckUserPrivileges.php
+++ b/libraries/classes/CheckUserPrivileges.php
@@ -55,11 +55,7 @@ class CheckUserPrivileges
$tableNameStartOffset = mb_strpos($row, '.', $dbNameOffset);
}
- $showGrantsDbName = mb_substr(
- $row,
- $dbNameOffset,
- $tableNameStartOffset - $dbNameOffset
- );
+ $showGrantsDbName = mb_substr($row, $dbNameOffset, $tableNameStartOffset - $dbNameOffset);
$showGrantsDbName = Util::unQuote($showGrantsDbName, '`');
@@ -102,27 +98,18 @@ class CheckUserPrivileges
if (
$showGrantsString !== 'ALL'
&& $showGrantsString !== 'ALL PRIVILEGES'
- && (mb_strpos(
- $showGrantsString,
- 'SELECT, INSERT, UPDATE, DELETE'
- ) === false)
+ && (mb_strpos($showGrantsString, 'SELECT, INSERT, UPDATE, DELETE') === false)
) {
return;
}
- if (
- $showGrantsDbName === '*'
- && $showGrantsTableName === '*'
- ) {
+ if ($showGrantsDbName === '*' && $showGrantsTableName === '*') {
$GLOBALS['col_priv'] = true;
$GLOBALS['db_priv'] = true;
$GLOBALS['proc_priv'] = true;
$GLOBALS['table_priv'] = true;
- if (
- $showGrantsString === 'ALL PRIVILEGES'
- || $showGrantsString === 'ALL'
- ) {
+ if ($showGrantsString === 'ALL PRIVILEGES' || $showGrantsString === 'ALL') {
$GLOBALS['is_reload_priv'] = true;
}
}
@@ -175,40 +162,22 @@ class CheckUserPrivileges
private function analyseShowGrant(): void
{
if (SessionCache::has('is_create_db_priv')) {
- $GLOBALS['is_create_db_priv'] = SessionCache::get(
- 'is_create_db_priv'
- );
- $GLOBALS['is_reload_priv'] = SessionCache::get(
- 'is_reload_priv'
- );
- $GLOBALS['db_to_create'] = SessionCache::get(
- 'db_to_create'
- );
- $GLOBALS['dbs_where_create_table_allowed'] = SessionCache::get(
- 'dbs_where_create_table_allowed'
- );
- $GLOBALS['dbs_to_test'] = SessionCache::get(
- 'dbs_to_test'
- );
-
- $GLOBALS['db_priv'] = SessionCache::get(
- 'db_priv'
- );
- $GLOBALS['col_priv'] = SessionCache::get(
- 'col_priv'
- );
- $GLOBALS['table_priv'] = SessionCache::get(
- 'table_priv'
- );
- $GLOBALS['proc_priv'] = SessionCache::get(
- 'proc_priv'
- );
+ $GLOBALS['is_create_db_priv'] = SessionCache::get('is_create_db_priv');
+ $GLOBALS['is_reload_priv'] = SessionCache::get('is_reload_priv');
+ $GLOBALS['db_to_create'] = SessionCache::get('db_to_create');
+ $GLOBALS['dbs_where_create_table_allowed'] = SessionCache::get('dbs_where_create_table_allowed');
+ $GLOBALS['dbs_to_test'] = SessionCache::get('dbs_to_test');
+
+ $GLOBALS['db_priv'] = SessionCache::get('db_priv');
+ $GLOBALS['col_priv'] = SessionCache::get('col_priv');
+ $GLOBALS['table_priv'] = SessionCache::get('table_priv');
+ $GLOBALS['proc_priv'] = SessionCache::get('proc_priv');
return;
}
// defaults
- $GLOBALS['is_create_db_priv'] = false;
+ $GLOBALS['is_create_db_priv'] = false;
$GLOBALS['is_reload_priv'] = false;
$GLOBALS['db_to_create'] = '';
$GLOBALS['dbs_where_create_table_allowed'] = [];
@@ -247,11 +216,7 @@ class CheckUserPrivileges
}
// check for the required privileges for adjust
- $this->checkRequiredPrivilegesForAdjust(
- $showGrantsString,
- $showGrantsDbName,
- $showGrantsTableName
- );
+ $this->checkRequiredPrivilegesForAdjust($showGrantsString, $showGrantsDbName, $showGrantsTableName);
/**
* @todo if we find CREATE VIEW but not CREATE, do not offer
@@ -270,7 +235,7 @@ class CheckUserPrivileges
// a global CREATE privilege
$GLOBALS['is_create_db_priv'] = true;
$GLOBALS['is_reload_priv'] = true;
- $GLOBALS['db_to_create'] = '';
+ $GLOBALS['db_to_create'] = '';
$GLOBALS['dbs_where_create_table_allowed'][] = '*';
// @todo we should not break here, cause GRANT ALL *.*
// could be revoked by a later rule like GRANT SELECT ON db.*
@@ -307,16 +272,8 @@ class CheckUserPrivileges
* Do not handle the underscore wildcard
* (this case must be rare anyway)
*/
- $GLOBALS['db_to_create'] = preg_replace(
- '/' . $re0 . '%/',
- '\\1',
- $showGrantsDbName
- );
- $GLOBALS['db_to_create'] = preg_replace(
- '/' . $re1 . '(%|_)/',
- '\\1\\3',
- $GLOBALS['db_to_create']
- );
+ $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1', $showGrantsDbName);
+ $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']);
$GLOBALS['is_create_db_priv'] = true;
/**
@@ -334,10 +291,7 @@ class CheckUserPrivileges
SessionCache::set('is_create_db_priv', $GLOBALS['is_create_db_priv']);
SessionCache::set('is_reload_priv', $GLOBALS['is_reload_priv']);
SessionCache::set('db_to_create', $GLOBALS['db_to_create']);
- SessionCache::set(
- 'dbs_where_create_table_allowed',
- $GLOBALS['dbs_where_create_table_allowed']
- );
+ SessionCache::set('dbs_where_create_table_allowed', $GLOBALS['dbs_where_create_table_allowed']);
SessionCache::set('dbs_to_test', $GLOBALS['dbs_to_test']);
SessionCache::set('proc_priv', $GLOBALS['proc_priv']);