From 966cce3aa854260e72ee1aecca29eb4caadf73df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Fri, 6 Jul 2001 20:18:57 +0000 Subject: [PATCH] Fixed many little scripting bugs in users_details.php3 --- ChangeLog | 3 ++ user_details.php3 | 112 +++++++++++++++++++++++++++------------------- 2 files changed, 70 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b41e9c95..2bbd1a830 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-07-05 Loïc Chapeaux + * users_details.php3: Fixed many little scripting bugs. + 2001-07-06 Marc Delisle * bug #438749 Database lockout: main.php3, we now show "Create database" if user has Create priv on an inexistant db diff --git a/user_details.php3 b/user_details.php3 index 69b4c8001..1828b2e0b 100644 --- a/user_details.php3 +++ b/user_details.php3 @@ -32,7 +32,7 @@ function check_db($dbcheck) table_grants_header($dbcheck); while ($row = mysql_fetch_array($result)) - table_grants($row['host'], $row['user'], $dbcheck); + table_grants($row['host'], $row['user'], $dbcheck); table_grants_tail(); } @@ -167,6 +167,7 @@ function grant_operations() global $strDatabase, $strAnyDatabase; global $strTable, $strAnyTable; global $strColumn, $strAnyColumn, $strColumnEmpty; + global $strPrivileges; ?> @@ -407,8 +408,10 @@ function table_grants($host, $user, $dbcheck = false) # Password Line if ((trim($priv) == "") && !$grantopt) continue; - if (!$dbcheck && !($show_header++)) table_grants_header(); - + if (!$dbcheck && !isset($show_header)) { + $show_header = true; + table_grants_header(); + } $bgcolor = $cfgBgcolorOne; $i % 2 ? 0: $bgcolor = $cfgBgcolorTwo; @@ -416,32 +419,51 @@ function table_grants($host, $user, $dbcheck = false) # Revoke $query = "server=$server&lang=$lang&db=mysql&table=user"; $revoke_url = "sql.php3"; - $revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON ". - db_name($db)."." . tbl_name($table) . " FROM '$user'@'$host'"); + $revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON " . db_name($db) . "." . tbl_name($table) . " FROM '$user'@'$host'"); $revoke_url .= "&$query"; $revoke_url .= "&zero_rows=" . urlencode("$strRevokeMessage $user@$host"); $revoke_url .= "&goto=$self"; # Revoke GRANT OPTION - $revoke_grant_url = "sql.php3"; - $revoke_grant_url .= "?sql_query=" - .urlencode("REVOKE GRANT OPTION ON ". - db_name($db)."." . tbl_name($table) . " FROM '$user'@'$host'"); - $revoke_grant_url .= "&$query"; - $revoke_grant_url .= "&zero_rows=" . urlencode("$strRevokeGrantMessage $user@$host"); - $revoke_grant_url .= "&goto=$self"; + if ($grantopt) { + $revoke_grant_url = "sql.php3"; + $revoke_grant_url .= "?sql_query=" . urlencode("REVOKE GRANT OPTION ON " . db_name($db) . "." . tbl_name($table) . " FROM '$user'@'$host'"); + $revoke_grant_url .= "&$query"; + $revoke_grant_url .= "&zero_rows=" . urlencode("$strRevokeGrantMessage $user@$host"); + $revoke_grant_url .= "&goto=$self"; + } ?> - - > - > - - > - - $strAny"; ?> - + + > + + > + + + + + + + + $strAny"; ?> + $strAll" : $db; ?> $strAll" : $table; ?> @@ -456,7 +478,7 @@ function table_grants($host, $user, $dbcheck = false) $i++; } - if (!$dbcheck && $show_header) table_grants_tail(); + if (!$dbcheck && isset($show_header)) table_grants_tail(); return $rows; } @@ -516,7 +538,7 @@ function table_privileges($form, $row = false) $item = 0; while ((list(,$priv) = each($list_priv)) && ++$item) { $priv_priv = $priv . "_priv"; - $checked = ($row[$priv_priv] == "Y") ? "checked" : ""; + $checked = ($row && $row[$priv_priv] == "Y") ? "checked" : ""; if ($item % 2 == 1) echo ""; else echo " "; echo ""; @@ -607,7 +629,7 @@ function edit_operations($host, $user)
  • ">
    • - +
    • @@ -683,20 +705,20 @@ function table_users($host = false, $user = false) $i % 2 ? 0: $bgcolor = $cfgBgcolorTwo; $strPriv = ""; - if ($row["Select_priv"] == "Y") $strPriv .= "Select "; - if ($row["Insert_priv"] == "Y") $strPriv .= "Insert "; - if ($row["Update_priv"] == "Y") $strPriv .= "Update "; - if ($row["Delete_priv"] == "Y") $strPriv .= "Delete "; - if ($row["Create_priv"] == "Y") $strPriv .= "Create "; - if ($row["Drop_priv"] == "Y") $strPriv .= "Drop "; - if ($row["Reload_priv"] == "Y") $strPriv .= "Reload "; - if ($row["Shutdown_priv"] == "Y") $strPriv .= "Shutdown "; - if ($row["Process_priv"] == "Y") $strPriv .= "Process "; - if ($row["File_priv"] == "Y") $strPriv .= "File "; - if ($row["Grant_priv"] == "Y") $strPriv .= "Grant "; - if ($row["References_priv"] == "Y") $strPriv .= "References "; - if ($row["Index_priv"] == "Y") $strPriv .= "Index "; - if ($row["Alter_priv"] == "Y") $strPriv .= "Alter "; + if ($row['Select_priv'] == "Y") $strPriv .= "Select "; + if ($row['Insert_priv'] == "Y") $strPriv .= "Insert "; + if ($row['Update_priv'] == "Y") $strPriv .= "Update "; + if ($row['Delete_priv'] == "Y") $strPriv .= "Delete "; + if ($row['Create_priv'] == "Y") $strPriv .= "Create "; + if ($row['Drop_priv'] == "Y") $strPriv .= "Drop "; + if ($row['Reload_priv'] == "Y") $strPriv .= "Reload "; + if ($row['Shutdown_priv'] == "Y") $strPriv .= "Shutdown "; + if ($row['Process_priv'] == "Y") $strPriv .= "Process "; + if ($row['File_priv'] == "Y") $strPriv .= "File "; + if ($row['Grant_priv'] == "Y") $strPriv .= "Grant "; + if ($row['References_priv'] == "Y") $strPriv .= "References "; + if ($row['Index_priv'] == "Y") $strPriv .= "Index "; + if ($row['Alter_priv'] == "Y") $strPriv .= "Alter "; if ($strPriv == "") $strPriv = "$strNoPrivileges"; @@ -705,18 +727,18 @@ function table_users($host = false, $user = false) # Edit $edit_url = $self; $edit_url .= "?server=$server&lang=$lang"; - $edit_url .= "&edit=1&host=" . urlencode($row["Host"]) . "&user=" . urlencode($row["User"]); + $edit_url .= "&edit=1&host=" . urlencode($row['Host']) . "&user=" . urlencode($row['User']); # Delete $delete_url = "$self?$query"; - $delete_url .= "&delete=1&confirm=1&delete_host=" . urlencode($row["Host"]) . "&delete_user=" . urlencode($row["User"]); + $delete_url .= "&delete=1&confirm=1&delete_host=" . urlencode($row['Host']) . "&delete_user=" . urlencode($row['User']); # Grants $check_url = $self; $check_url .= "?server=$server&lang=$lang"; - $check_url .= "&grants=1&host=" . urlencode($row["Host"]) . "&user=" . urlencode($row["User"]); + $check_url .= "&grants=1&host=" . urlencode($row['Host']) . "&user=" . urlencode($row['User']); -# $check_result = mysql_query("SHOW GRANTS FOR '" . $row{"User"} . "'@'" . $row{"Host"} ."'"); +# $check_result = mysql_query("SHOW GRANTS FOR '" . $row['User'] . "'@'" . $row['Host'] ."'"); # if (@mysql_num_rows($check_result) == 0) $check_url = "" ?> @@ -725,9 +747,9 @@ function table_users($host = false, $user = false) - - " . $row["User"]. "" : "$strAny"; ?> - $strNo"; ?> + + " . $row['User']. "" : "$strAny"; ?> + $strNo"; ?> @@ -791,7 +813,7 @@ if (!empty($host)) { } # Confirm the action ... -if (isset($confirm) && $confirm && !$clickyes) { +if (isset($confirm) && $confirm && (!isset($clickyes) || !$clickyes)) { confirm(); exit(); }