gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper coding style for multi line if statements

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-08-22 06:46:39 +05:30
parent e82d3c7136
commit 05e78b2778
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libraries/common.lib.php
View File

@ -2254,7 +2254,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
} else {
$selected = '';
}
$gotopage .= ' <option ' . $selected
$gotopage .= ' <option ' . $selected
. ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n";
}
@ -3485,21 +3485,31 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
$query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` "
. "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'";
// Check global privileges first.
if (PMA_DBI_fetch_value(sprintf($query,
'USER_PRIVILEGES',
$username,
$priv))) {
if (PMA_DBI_fetch_value(
sprintf(
$query,
'USER_PRIVILEGES',
$username,
$priv
)
)
) {
return true;
}
// If a database name was provided and user does not have the
// required global privilege, try database-wise permissions.
if ($db !== null) {
$query .= " AND TABLE_SCHEMA='%s'";
if (PMA_DBI_fetch_value(sprintf($query,
'SCHEMA_PRIVILEGES',
$username,
$priv,
PMA_sqlAddSlashes($db)))) {
if (PMA_DBI_fetch_value(
sprintf(
$query,
'SCHEMA_PRIVILEGES',
$username,
$priv,
PMA_sqlAddSlashes($db)
)
)
) {
return true;
}
} else {
@ -3511,12 +3521,17 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
// find any valid privileges, try table-wise privileges.
if ($tbl !== null) {
$query .= " AND TABLE_NAME='%s'";
if ($retval = PMA_DBI_fetch_value(sprintf($query,
'TABLE_PRIVILEGES',
$username,
$priv,
PMA_sqlAddSlashes($db),
PMA_sqlAddSlashes($tbl)))) {
if ($retval = PMA_DBI_fetch_value(
sprintf(
$query,
'TABLE_PRIVILEGES',
$username,
$priv,
PMA_sqlAddSlashes($db),
PMA_sqlAddSlashes($tbl)
)
)
) {
return true;
}
}