From 7484e9d981d53829e268c0b2d5b3d6098f3b5374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Thu, 6 Dec 2001 21:50:55 +0000
Subject: [PATCH] fixed a double declaration of variables

---
 ChangeLog         |  2 ++
 user_details.php3 | 17 +++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55c8ba9a5..7c493d7b2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $Source$
 	  File name too long in tbl_replace.php.
 	* tbl_printview.php3; tbl_properties.php3; tbl_properties.inc.php3: fixed
 	  bug #489440 - enum fields in tbl_properties.php.
+	* user_details.php3, lines 616, 617 & 624: fixed a double declaration of
+	  variables.
 
 2001-12-05  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lang/japanese.inc.php3; lang/bulgarian-*.inc.php3: completed thanks to
diff --git a/user_details.php3 b/user_details.php3
index 58a638a82..3860ada20 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -605,23 +605,20 @@ function PMA_grantOperations($grants)
 /**
  * Displays the page to edit operations
  *
- * @param   string   the host name
- * @param   string   the user name
+ * @param   string   the host name to check grants for
+ * @param   string   the user name to check grants for
  *
  * @return  boolean  always true
  *
  * @global  string   the current language
  * @global  integer  the server to use (refers to the number in the
  *                   configuration file)
- * @global  string   the host name to check grants for
- * @global  string   the username to check grants for
  *
  * @see     PMA_tablePrivileges()
  */
 function PMA_editOperations($host, $user)
 {
     global $lang, $server;
-    global $host, $pma_user;
 
     $result = mysql_query('SELECT * FROM mysql.user WHERE User = \'' . PMA_sqlAddslashes($user) . '\' AND Host = \'' . PMA_sqlAddslashes($host) . '\'');
     $rows   = @mysql_num_rows($result);
@@ -662,16 +659,16 @@ function PMA_editOperations($host, $user)
             </tr>
             <tr>
                 <td>
-                    <input type="radio" value="1" name="anyuser"<?php if ($pma_user == '' || $pma_user == '%') echo ' checked="checked"'; ?> />
+                    <input type="radio" value="1" name="anyuser"<?php if ($user == '' || $user == '%') echo ' checked="checked"'; ?> />
                     <?php echo $GLOBALS['strAnyUser']; ?>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" value="0" name="anyuser" checked="checked"<?php if ($pma_user != '' && $pma_user != '%') echo ' checked="checked"'; ?> />
+                    <input type="radio" value="0" name="anyuser" checked="checked"<?php if ($user != '' && $user != '%') echo ' checked="checked"'; ?> />
                     <?php echo $GLOBALS['strUserName']; ?>&nbsp;:&nbsp;
                 </td>
                 <td>
-                    <input type="text" name="new_user" size="10" value="<?php echo str_replace('"', '&quot;', $pma_user); ?>" onchange="this.form.anyuser[1].checked = true" />
+                    <input type="text" name="new_user" size="10" value="<?php echo str_replace('"', '&quot;', $user); ?>" onchange="this.form.anyuser[1].checked = true" />
                 </td>
             </tr>
             <tr>
@@ -705,7 +702,7 @@ function PMA_editOperations($host, $user)
             <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
             <input type="hidden" name="server" value="<?php echo $server; ?>" />
             <input type="hidden" name="host" value="<?php echo str_replace('"', '&quot;', $host); ?>" />
-            <input type="hidden" name="pma_user" value="<?php echo str_replace('"', '&quot;', $pma_user); ?>" />
+            <input type="hidden" name="pma_user" value="<?php echo str_replace('"', '&quot;', $user); ?>" />
             <input type="submit" name="submit_updProfile" value="<?php echo $GLOBALS['strGo']; ?>" />
         </form>
     </li>
@@ -720,7 +717,7 @@ function PMA_editOperations($host, $user)
             <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
             <input type="hidden" name="server" value="<?php echo $server; ?>" />
             <input type="hidden" name="host" value="<?php echo str_replace('"', '&quot;', $host); ?>" />
-            <input type="hidden" name="pma_user" value="<?php echo str_replace('"', '&quot;', $pma_user); ?>" />
+            <input type="hidden" name="pma_user" value="<?php echo str_replace('"', '&quot;', $user); ?>" />
             <input type="submit" name="submit_chgPriv" value="<?php echo $GLOBALS['strGo']; ?>" />
         </form>
     </li>