From cd899dea267af52c3b6aee4291a69a81691f3fc6 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 23 Jun 2012 22:01:49 +0530
Subject: [PATCH 001/102] code refactoring for PMA_displayColumnPrivs function
 in server_privileges-php file

---
 server_privileges.php | 52 ++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 4b302af73e..21b896c93e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -454,45 +454,47 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false)
 /**
  * Displays on which column(s) a table-specific privilege is granted
  *
- * @param array  $columns
- * @param array  $row
- * @param string $name_for_select
- * @param string $priv_for_header
- * @param string $name
- * @param string $name_for_dfn
- * @param string $name_for_current
+ * @param array  $columns           columns array
+ * @param array  $row               first row from result or boolean false
+ * @param string $name_for_select   privilege types - Select_priv, Insert_priv
+ *                                  Update_priv, References_priv
+ * @param string $priv_for_header   privilege for header
+ * @param string $name              privilege name - insert, select, update, references
+ * @param string $name_for_dfn      name for dfn
+ * @param string $name_for_current  name for current
  *
- * @return void
+ * @return $html_output             html snippet
  */
-function PMA_displayColumnPrivs($columns, $row, $name_for_select,
+function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
     $priv_for_header, $name, $name_for_dfn, $name_for_current
 ) {
-    echo '    <div class="item" id="div_item_' . $name . '">' . "\n"
-       . '        <label for="select_' . $name . '_priv">' . "\n"
-       . '            <code><dfn title="' . $name_for_dfn . '">'
+    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
+        . '<label for="select_' . $name . '_priv">' . "\n"
+        . '<code><dfn title="' . $name_for_dfn . '">'
         . $priv_for_header . '</dfn></code>' . "\n"
-       . '        </label><br />' . "\n"
-       . '        <select id="select_' . $name . '_priv" name="'
+        . '</label><br />' . "\n"
+        . '<select id="select_' . $name . '_priv" name="'
         . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
 
     foreach ($columns as $current_column => $current_column_privileges) {
-        echo '            <option value="' . htmlspecialchars($current_column) . '"';
+        $html_output .= '<option value="' . htmlspecialchars($current_column) . '"';
         if ($row[$name_for_select] == 'Y' || $current_column_privileges[$name_for_current]) {
-            echo ' selected="selected"';
+            $html_output .= ' selected="selected"';
         }
-        echo '>' . htmlspecialchars($current_column) . '</option>' . "\n";
+        $html_output .= '>' . htmlspecialchars($current_column) . '</option>' . "\n";
     }
 
-    echo '        </select>' . "\n"
-       . '        <i>' . __('Or') . '</i>' . "\n"
-       . '        <label for="checkbox_' . $name_for_select
+    $html_output .= '</select>' . "\n"
+        . '<i>' . __('Or') . '</i>' . "\n"
+        . '<label for="checkbox_' . $name_for_select
         . '_none"><input type="checkbox"'
         . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
         . ' name="' . $name_for_select . '_none" id="checkbox_'
         . $name_for_select . '_none" title="'
         . _pgettext('None privileges', 'None') . '" />'
         . _pgettext('None privileges', 'None') . '</label>' . "\n"
-       . '    </div>' . "\n";
+        . '</div>' . "\n";
+    return $html_output;
 } // end function
 
 
@@ -640,22 +642,22 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
 
 
         // privs that are attached to a specific column
-        PMA_displayColumnPrivs(
+        echo PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Select_priv', 'SELECT',
             'select', __('Allows reading data.'), 'Select'
         );
 
-        PMA_displayColumnPrivs(
+        echo PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Insert_priv', 'INSERT',
             'insert', __('Allows inserting and replacing data.'), 'Insert'
         );
 
-        PMA_displayColumnPrivs(
+        echo PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Update_priv', 'UPDATE',
             'update', __('Allows changing data.'), 'Update'
         );
 
-        PMA_displayColumnPrivs(
+        echo PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'References_priv', 'REFERENCES', 'references',
             __('Has no effect in this MySQL version.'), 'References'
         );

From 44c084069d2438495cda54411dcced07f50e3893 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 24 Jun 2012 00:45:28 +0530
Subject: [PATCH 002/102] some refactoring for PMA_displayPrivTable function in
 server_privileges script

---
 server_privileges.php | 200 ++++++++++++++++++++++--------------------
 1 file changed, 105 insertions(+), 95 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 21b896c93e..9cdfdbcc3a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -497,7 +497,36 @@ function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
     return $html_output;
 } // end function
 
-
+/**
+ * Get sql query for display privileges table
+ * 
+ * @param string $db      the database
+ * @param string $table   the table
+ * 
+ * @return string sql query
+ */
+function PMA_getSqlQueryForDisplayPrivTable($db, $table)
+{
+    $username = $GLOBALS['username'];
+    $hostname = $GLOBALS['hostname'];
+    if ($db == '*') {
+        return "SELECT * FROM `mysql`.`user`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
+    } elseif ($table == '*') {
+        return "SELECT * FROM `mysql`.`db`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
+            ." LIKE `Db`;";
+    }
+    return "SELECT `Table_priv`"
+        ." FROM `mysql`.`tables_priv`"
+        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
+        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
+}
 /**
  * Displays the privileges form table
  *
@@ -508,37 +537,19 @@ function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
  * @global  array      $cfg         the phpMyAdmin configuration
  * @global  ressource  $user_link   the database connection
  *
- * @return void
+ * @return string html snippet
  */
-function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
+function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit = true)
 {
     global $random_n;
-
+    $html_output = '';
+    
     if ($db == '*') {
         $table = '*';
     }
 
     if (isset($GLOBALS['username'])) {
-        $username = $GLOBALS['username'];
-        $hostname = $GLOBALS['hostname'];
-        if ($db == '*') {
-            $sql_query = "SELECT * FROM `mysql`.`user`"
-                ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-                ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
-        } elseif ($table == '*') {
-            $sql_query = "SELECT * FROM `mysql`.`db`"
-                ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-                ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-                ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
-                ." LIKE `Db`;";
-        } else {
-            $sql_query = "SELECT `Table_priv`"
-                ." FROM `mysql`.`tables_priv`"
-                ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-                ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-                ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
-                ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
-        }
+        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
         $row = PMA_DBI_fetch_single_row($sql_query);
     }
     if (empty($row)) {
@@ -632,39 +643,37 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
         PMA_DBI_free_result($res);
         unset($res, $row1, $current);
 
-        echo '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
+        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
            . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
            . '<fieldset id="fieldset_user_priv">' . "\n"
            . '    <legend>' . __('Table-specific privileges')
            . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
            . '</legend>' . "\n";
 
-
-
         // privs that are attached to a specific column
-        echo PMA_getHtmlForDisplayColumnPrivileges(
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Select_priv', 'SELECT',
             'select', __('Allows reading data.'), 'Select'
         );
 
-        echo PMA_getHtmlForDisplayColumnPrivileges(
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Insert_priv', 'INSERT',
             'insert', __('Allows inserting and replacing data.'), 'Insert'
         );
 
-        echo PMA_getHtmlForDisplayColumnPrivileges(
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'Update_priv', 'UPDATE',
             'update', __('Allows changing data.'), 'Update'
         );
 
-        echo PMA_getHtmlForDisplayColumnPrivileges(
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
             $columns, $row, 'References_priv', 'REFERENCES', 'references',
             __('Has no effect in this MySQL version.'), 'References'
         );
 
         // privs that are not attached to a specific column
 
-        echo '    <div class="item">' . "\n";
+        $html_output .= '<div class="item">' . "\n";
         foreach ($row as $current_grant => $current_grant_value) {
             $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
             if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
@@ -684,30 +693,30 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                 $tmp_current_grant = $current_grant;
             }
 
-            echo '        <div class="item">' . "\n"
-               . '            <input type="checkbox"'
+            $html_output .= '<div class="item">' . "\n"
+               . '<input type="checkbox"'
                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
+               . 'name="' . $current_grant . '" id="checkbox_' . $current_grant
                . '" value="Y" '
                . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
                . 'title="';
 
-            echo (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
                 ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
                 : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
 
-            echo '            <label for="checkbox_' . $current_grant
+            $html_output .= '<label for="checkbox_' . $current_grant
                 . '"><code><dfn title="'
                 . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
                     ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
                     : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-               . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
-               . '        </div>' . "\n";
+                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
+                . '</div>' . "\n";
         } // end foreach ()
 
-        echo '    </div>' . "\n";
+        $html_output .= '</div>' . "\n";
         // for Safari 2.0.2
-        echo '    <div class="clearfloat"></div>' . "\n";
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
 
     } else {
 
@@ -770,84 +779,85 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
             $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
             $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
         }
-        echo '<input type="hidden" name="grant_count" value="'
+        $html_output .= '<input type="hidden" name="grant_count" value="'
             . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
             . '" />' . "\n"
-           . '<fieldset id="fieldset_user_global_rights">' . "\n"
-           . '    <legend>' . "\n"
-           . '        '
+            . '<fieldset id="fieldset_user_global_rights">' . "\n"
+            . '<legend>' . "\n"
+            . '        '
             . ($db == '*'
                 ? __('Global privileges')
                 : ($table == '*'
                     ? __('Database-specific privileges')
                     : __('Table-specific privileges'))) . "\n"
-           . '        (<a href="server_privileges.php?'
+            . '(<a href="server_privileges.php?'
             . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
             . __('Check All') . '</a> /' . "\n"
-           . '        <a href="server_privileges.php?'
+            . '<a href="server_privileges.php?'
             . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
             . __('Uncheck All') . '</a>)' . "\n"
-           . '    </legend>' . "\n"
-           . '    <p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
+            . '</legend>' . "\n"
+            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
 
         // Output the Global privilege tables with checkboxes
         foreach ($privTable as $i => $table) {
-            echo '    <fieldset>' . "\n"
-                . '        <legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
+            $html_output .= '<fieldset>' . "\n"
+                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
             foreach ($table as $priv) {
-                echo '        <div class="item">' . "\n"
-                    . '            <input type="checkbox"'
-                    .                   ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
-                    .                   ' value="Y" title="' . $priv[2] . '"'
-                    .                   ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
-                    .               '/>' . "\n"
-                    . '            <label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
-                    .                    $priv[1] . '</dfn></code></label>' . "\n"
-                    . '        </div>' . "\n";
+                $html_output .= '<div class="item">' . "\n"
+                    . '<input type="checkbox"'
+                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                    . ' value="Y" title="' . $priv[2] . '"'
+                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                    . '/>' . "\n"
+                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                    . $priv[1] . '</dfn></code></label>' . "\n"
+                    . '</div>' . "\n";
             }
-            echo '    </fieldset>' . "\n";
+            $html_output .= '</fieldset>' . "\n";
         }
 
         // The "Resource limits" box is not displayed for db-specific privs
         if ($db == '*') {
-            echo '    <fieldset>' . "\n"
-               . '        <legend>' . __('Resource limits') . '</legend>' . "\n"
-               . '        <p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
-               . '        <div class="item">' . "\n"
-               . '            <label for="text_max_questions"><code><dfn title="'
-                . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
-               . '            <input type="text" name="max_questions" id="text_max_questions" value="'
-                . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
-               . '        </div>' . "\n"
-               . '        <div class="item">' . "\n"
-               . '            <label for="text_max_updates"><code><dfn title="'
-                . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
-               . '            <input type="text" name="max_updates" id="text_max_updates" value="'
-                . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
-               . '        </div>' . "\n"
-               . '        <div class="item">' . "\n"
-               . '            <label for="text_max_connections"><code><dfn title="'
-                . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
-               . '            <input type="text" name="max_connections" id="text_max_connections" value="'
-                . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
-               . '        </div>' . "\n"
-               . '        <div class="item">' . "\n"
-               . '            <label for="text_max_user_connections"><code><dfn title="'
-                . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
-               . '            <input type="text" name="max_user_connections" id="text_max_user_connections" value="'
-                . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
-               . '        </div>' . "\n"
-               . '    </fieldset>' . "\n";
+            $html_output .= '<fieldset>' . "\n"
+               . '<legend>' . __('Resource limits') . '</legend>' . "\n"
+               . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
+               . '<div class="item">' . "\n"
+               . '<label for="text_max_questions"><code><dfn title="'
+               . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
+               . '<input type="text" name="max_questions" id="text_max_questions" value="'
+               . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
+               . '</div>' . "\n"
+               . '<div class="item">' . "\n"
+               . '<label for="text_max_updates"><code><dfn title="'
+               . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
+               . '<input type="text" name="max_updates" id="text_max_updates" value="'
+               . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
+               . '</div>' . "\n"
+               . '<div class="item">' . "\n"
+               . '<label for="text_max_connections"><code><dfn title="'
+               . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
+               . '<input type="text" name="max_connections" id="text_max_connections" value="'
+               . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
+               . '</div>' . "\n"
+               . '<div class="item">' . "\n"
+               . '<label for="text_max_user_connections"><code><dfn title="'
+               . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
+               . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
+               . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
+               . '</div>' . "\n"
+               . '</fieldset>' . "\n";
         }
         // for Safari 2.0.2
-        echo '    <div class="clearfloat"></div>' . "\n";
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
     }
-    echo '</fieldset>' . "\n";
+    $html_output .= '</fieldset>' . "\n";
     if ($submit) {
-        echo '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
-           . '    <input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
+        $html_output .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
+           . '<input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
            . '</fieldset>' . "\n";
     }
+    return $html_output;
 } // end of the 'PMA_displayPrivTable()' function
 
 
@@ -2059,7 +2069,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         }
         echo PMA_generate_common_hidden_inputs($_params);
 
-        PMA_displayPrivTable(
+        echo PMA_getHtmlToDisplayPrivilegesTable(
             PMA_ifSetOr($dbname, '*', 'length'),
             PMA_ifSetOr($tablename, '*', 'length')
         );
@@ -2412,7 +2422,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     }
 
     echo '</fieldset>' . "\n";
-    PMA_displayPrivTable('*', '*', false);
+    echo PMA_getHtmlToDisplayPrivilegesTable('*', '*', false);
     echo '    <fieldset id="fieldset_add_user_footer" class="tblFooters">' . "\n"
        . '        <input type="submit" name="adduser_submit" value="' . __('Go') . '" />' . "\n"
        . '    </fieldset>' . "\n"

From 9e25fa580a8604775668b9fc4800c8f9faaa0f01 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 26 Jun 2012 00:12:02 +0530
Subject: [PATCH 003/102] function for Resource limits in server_privileges

---
 server_privileges.php | 69 +++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index f48773b3b4..ebe5c4536a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -696,7 +696,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit =
             $html_output .= '<div class="item">' . "\n"
                . '<input type="checkbox"'
                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-               . 'name="' . $current_grant . '" id="checkbox_' . $current_grant
+               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
                . '" value="Y" '
                . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
                . 'title="';
@@ -819,34 +819,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit =
 
         // The "Resource limits" box is not displayed for db-specific privs
         if ($db == '*') {
-            $html_output .= '<fieldset>' . "\n"
-               . '<legend>' . __('Resource limits') . '</legend>' . "\n"
-               . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
-               . '<div class="item">' . "\n"
-               . '<label for="text_max_questions"><code><dfn title="'
-               . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
-               . '<input type="text" name="max_questions" id="text_max_questions" value="'
-               . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
-               . '</div>' . "\n"
-               . '<div class="item">' . "\n"
-               . '<label for="text_max_updates"><code><dfn title="'
-               . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
-               . '<input type="text" name="max_updates" id="text_max_updates" value="'
-               . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
-               . '</div>' . "\n"
-               . '<div class="item">' . "\n"
-               . '<label for="text_max_connections"><code><dfn title="'
-               . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
-               . '<input type="text" name="max_connections" id="text_max_connections" value="'
-               . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
-               . '</div>' . "\n"
-               . '<div class="item">' . "\n"
-               . '<label for="text_max_user_connections"><code><dfn title="'
-               . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
-               . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
-               . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
-               . '</div>' . "\n"
-               . '</fieldset>' . "\n";
+            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
         }
         // for Safari 2.0.2
         $html_output .= '<div class="clearfloat"></div>' . "\n";
@@ -860,6 +833,44 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit =
     return $html_output;
 } // end of the 'PMA_displayPrivTable()' function
 
+/**
+ * Get HTML for "Resource limits"
+ * 
+ * @param array $row    first row from result or boolean false
+ * 
+ * @return string       html snippet 
+ */
+function PMA_getHtmlForDisplayResourceLimits($row)
+{
+    return '<fieldset>' . "\n"
+       . '<legend>' . __('Resource limits') . '</legend>' . "\n"
+       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_questions"><code><dfn title="'
+       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_questions" id="text_max_questions" value="'
+       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_updates"><code><dfn title="'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_updates" id="text_max_updates" value="'
+       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_connections"><code><dfn title="'
+       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_connections" id="text_max_connections" value="'
+       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_user_connections"><code><dfn title="'
+       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
+       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '</fieldset>' . "\n";
+}
 
 /**
  * Displays the fields used by the "new user" form as well as the

From 1578cee9ac0c7680337b5b483a178d7f45c57746 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 26 Jun 2012 01:20:35 +0530
Subject: [PATCH 004/102] new lib file for server_privileges

---
 libraries/server_privileges.lib.php | 877 ++++++++++++++++++++++++++++
 server_privileges.php               | 877 +---------------------------
 2 files changed, 887 insertions(+), 867 deletions(-)
 create mode 100644 libraries/server_privileges.lib.php

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
new file mode 100644
index 0000000000..e799940d51
--- /dev/null
+++ b/libraries/server_privileges.lib.php
@@ -0,0 +1,877 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * set of functions with the Privileges section in pma
+ *
+ * @package PhpMyAdmin
+ */
+
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+/**
+ * Escapes wildcard in a database+table specification
+ * before using it in a GRANT statement.
+ *
+ * Escaping a wildcard character in a GRANT is only accepted at the global
+ * or database level, not at table level; this is why I remove
+ * the escaping character. Internally, in mysql.tables_priv.Db there are
+ * no escaping (for example test_db) but in mysql.db you'll see test\_db
+ * for a db-specific privilege.
+ *
+ * @param string $dbname    Database name
+ * @param string $tablename Table name
+ *
+ * @return string the escaped (if necessary) database.table
+ */
+function PMA_wildcardEscapeForGrant($dbname, $tablename)
+{
+
+    if (! strlen($dbname)) {
+        $db_and_table = '*.*';
+    } else {
+        if (strlen($tablename)) {
+            $db_and_table
+                = PMA_backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
+                . PMA_backquote($tablename);
+        } else {
+            $db_and_table = PMA_backquote($dbname) . '.*';
+        }
+    }
+    return $db_and_table;
+}
+
+/**
+ * Generates a condition on the user name
+ *
+ * @param string $initial the user's initial
+ *
+ * @return string   the generated condition
+ */
+function PMA_rangeOfUsers($initial = '')
+{
+    // strtolower() is used because the User field
+    // might be BINARY, so LIKE would be case sensitive
+    if (! empty($initial)) {
+        $ret = " WHERE `User` LIKE '"
+            . PMA_sqlAddSlashes($initial, true) . "%'"
+            . " OR `User` LIKE '"
+            . PMA_sqlAddSlashes(strtolower($initial), true) . "%'";
+    } else {
+        $ret = '';
+    }
+    return $ret;
+} // end function
+
+/**
+ * Extracts the privilege information of a priv table row
+ *
+ * @param array   $row        the row
+ * @param boolean $enableHTML add <dfn> tag with tooltips
+ *
+ * @global  resource $user_link the database connection
+ *
+ * @return array
+ */
+function PMA_extractPrivInfo($row = '', $enableHTML = false)
+{
+    $grants = array(
+        array(
+            'Select_priv',
+            'SELECT',
+            __('Allows reading data.')),
+        array(
+            'Insert_priv',
+            'INSERT',
+            __('Allows inserting and replacing data.')),
+        array(
+            'Update_priv',
+            'UPDATE',
+            __('Allows changing data.')),
+        array(
+            'Delete_priv',
+            'DELETE',
+            __('Allows deleting data.')),
+        array(
+            'Create_priv',
+            'CREATE',
+            __('Allows creating new databases and tables.')),
+        array(
+            'Drop_priv',
+            'DROP',
+            __('Allows dropping databases and tables.')),
+        array(
+            'Reload_priv',
+            'RELOAD',
+            __('Allows reloading server settings and flushing the server\'s caches.')),
+        array(
+            'Shutdown_priv',
+            'SHUTDOWN',
+            __('Allows shutting down the server.')),
+        array(
+            'Process_priv',
+            'PROCESS',
+            __('Allows viewing processes of all users')),
+        array(
+            'File_priv',
+            'FILE',
+            __('Allows importing data from and exporting data into files.')),
+        array(
+            'References_priv',
+            'REFERENCES',
+            __('Has no effect in this MySQL version.')),
+        array(
+            'Index_priv',
+            'INDEX',
+            __('Allows creating and dropping indexes.')),
+        array(
+            'Alter_priv',
+            'ALTER',
+            __('Allows altering the structure of existing tables.')),
+        array(
+            'Show_db_priv',
+            'SHOW DATABASES',
+            __('Gives access to the complete list of databases.')),
+        array(
+            'Super_priv',
+            'SUPER',
+            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
+        array(
+            'Create_tmp_table_priv',
+            'CREATE TEMPORARY TABLES',
+            __('Allows creating temporary tables.')),
+        array(
+            'Lock_tables_priv',
+            'LOCK TABLES',
+            __('Allows locking tables for the current thread.')),
+        array(
+            'Repl_slave_priv',
+            'REPLICATION SLAVE',
+            __('Needed for the replication slaves.')),
+        array(
+            'Repl_client_priv',
+            'REPLICATION CLIENT',
+            __('Allows the user to ask where the slaves / masters are.')),
+        array(
+            'Create_view_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Event_priv',
+            'EVENT',
+            __('Allows to set up events for the event scheduler')),
+        array(
+            'Trigger_priv',
+            'TRIGGER',
+            __('Allows creating and dropping triggers')),
+        // for table privs:
+        array(
+            'Create View_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Show_view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        // for table privs:
+        array(
+            'Show view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        array(
+            'Create_routine_priv',
+            'CREATE ROUTINE',
+            __('Allows creating stored routines.')),
+        array(
+            'Alter_routine_priv',
+            'ALTER ROUTINE',
+            __('Allows altering and dropping stored routines.')),
+        array(
+            'Create_user_priv',
+            'CREATE USER',
+            __('Allows creating, dropping and renaming user accounts.')),
+        array(
+            'Execute_priv',
+            'EXECUTE',
+            __('Allows executing stored routines.')),
+    );
+
+    if (! empty($row) && isset($row['Table_priv'])) {
+        $row1 = PMA_DBI_fetch_single_row(
+            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
+            'ASSOC', $GLOBALS['userlink']
+        );
+        $av_grants = explode(
+            '\',\'',
+            substr($row1['Type'], 5, strlen($row1['Type']) - 7)
+        );
+        unset($row1);
+        $users_grants = explode(',', $row['Table_priv']);
+        foreach ($av_grants as $current_grant) {
+            $row[$current_grant . '_priv']
+                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
+        }
+        unset($current_grant);
+        unset($av_grants);
+        unset($users_grants);
+    }
+    $privs = array();
+    $allPrivileges = true;
+    foreach ($grants as $current_grant) {
+        if ((! empty($row) && isset($row[$current_grant[0]]))
+            || (empty($row) && isset($GLOBALS[$current_grant[0]]))
+        ) {
+            if ((! empty($row) && $row[$current_grant[0]] == 'Y')
+                || (empty($row)
+                && ($GLOBALS[$current_grant[0]] == 'Y'
+                || (is_array($GLOBALS[$current_grant[0]])
+                && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count']
+                && empty($GLOBALS[$current_grant[0] . '_none']))))
+            ) {
+                if ($enableHTML) {
+                    $privs[] = '<dfn title="' . $current_grant[2] . '">'
+                        . $current_grant[1] . '</dfn>';
+                } else {
+                    $privs[] = $current_grant[1];
+                }
+            } elseif (! empty($GLOBALS[$current_grant[0]])
+             && is_array($GLOBALS[$current_grant[0]])
+             && empty($GLOBALS[$current_grant[0] . '_none'])) {
+                if ($enableHTML) {
+                    $priv_string = '<dfn title="' . $current_grant[2] . '">'
+                        . $current_grant[1] . '</dfn>';
+                } else {
+                    $priv_string = $current_grant[1];
+                }
+                $privs[] = $priv_string . ' (`'
+                    . join('`, `', $GLOBALS[$current_grant[0]]) . '`)';
+            } else {
+                $allPrivileges = false;
+            }
+        }
+    }
+    if (empty($privs)) {
+        if ($enableHTML) {
+            $privs[] = '<dfn title="' . __('No privileges.') . '">USAGE</dfn>';
+        } else {
+            $privs[] = 'USAGE';
+        }
+    } elseif ($allPrivileges
+            && (! isset($GLOBALS['grant_count'])
+            || count($privs) == $GLOBALS['grant_count'])
+        ) {
+        if ($enableHTML) {
+            $privs = array('<dfn title="'
+                . __('Includes all privileges except GRANT.')
+                . '">ALL PRIVILEGES</dfn>'
+            );
+        } else {
+            $privs = array('ALL PRIVILEGES');
+        }
+    }
+    return $privs;
+} // end of the 'PMA_extractPrivInfo()' function
+
+/**
+ * Displays on which column(s) a table-specific privilege is granted
+ *
+ * @param array  $columns           columns array
+ * @param array  $row               first row from result or boolean false
+ * @param string $name_for_select   privilege types - Select_priv, Insert_priv
+ *                                  Update_priv, References_priv
+ * @param string $priv_for_header   privilege for header
+ * @param string $name              privilege name - insert, select, update, references
+ * @param string $name_for_dfn      name for dfn
+ * @param string $name_for_current  name for current
+ *
+ * @return $html_output             html snippet
+ */
+function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
+    $priv_for_header, $name, $name_for_dfn, $name_for_current
+) {
+    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
+        . '<label for="select_' . $name . '_priv">' . "\n"
+        . '<code><dfn title="' . $name_for_dfn . '">'
+        . $priv_for_header . '</dfn></code>' . "\n"
+        . '</label><br />' . "\n"
+        . '<select id="select_' . $name . '_priv" name="'
+        . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
+
+    foreach ($columns as $current_column => $current_column_privileges) {
+        $html_output .= '<option value="' . htmlspecialchars($current_column) . '"';
+        if ($row[$name_for_select] == 'Y' || $current_column_privileges[$name_for_current]) {
+            $html_output .= ' selected="selected"';
+        }
+        $html_output .= '>' . htmlspecialchars($current_column) . '</option>' . "\n";
+    }
+
+    $html_output .= '</select>' . "\n"
+        . '<i>' . __('Or') . '</i>' . "\n"
+        . '<label for="checkbox_' . $name_for_select
+        . '_none"><input type="checkbox"'
+        . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+        . ' name="' . $name_for_select . '_none" id="checkbox_'
+        . $name_for_select . '_none" title="'
+        . _pgettext('None privileges', 'None') . '" />'
+        . _pgettext('None privileges', 'None') . '</label>' . "\n"
+        . '</div>' . "\n";
+    return $html_output;
+} // end function
+
+/**
+ * Get sql query for display privileges table
+ * 
+ * @param string $db      the database
+ * @param string $table   the table
+ * 
+ * @return string sql query
+ */
+function PMA_getSqlQueryForDisplayPrivTable($db, $table)
+{
+    $username = $GLOBALS['username'];
+    $hostname = $GLOBALS['hostname'];
+    if ($db == '*') {
+        return "SELECT * FROM `mysql`.`user`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
+    } elseif ($table == '*') {
+        return "SELECT * FROM `mysql`.`db`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
+            ." LIKE `Db`;";
+    }
+    return "SELECT `Table_priv`"
+        ." FROM `mysql`.`tables_priv`"
+        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
+        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
+}
+/**
+ * Displays the privileges form table
+ *
+ * @param string  $db     the database
+ * @param string  $table  the table
+ * @param boolean $submit wheather to display the submit button or not
+ *
+ * @global  array      $cfg         the phpMyAdmin configuration
+ * @global  ressource  $user_link   the database connection
+ *
+ * @return string html snippet
+ */
+function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit = true)
+{
+    global $random_n;
+    $html_output = '';
+    
+    if ($db == '*') {
+        $table = '*';
+    }
+
+    if (isset($GLOBALS['username'])) {
+        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
+        $row = PMA_DBI_fetch_single_row($sql_query);
+    }
+    if (empty($row)) {
+        if ($table == '*') {
+            if ($db == '*') {
+                $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
+            } elseif ($table == '*') {
+                $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;';
+            }
+            $res = PMA_DBI_query($sql_query);
+            while ($row1 = PMA_DBI_fetch_row($res)) {
+                if (substr($row1[0], 0, 4) == 'max_') {
+                    $row[$row1[0]] = 0;
+                } else {
+                    $row[$row1[0]] = 'N';
+                }
+            }
+            PMA_DBI_free_result($res);
+        } else {
+            $row = array('Table_priv' => '');
+        }
+    }
+    if (isset($row['Table_priv'])) {
+        $row1 = PMA_DBI_fetch_single_row(
+            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
+            'ASSOC', $GLOBALS['userlink']
+        );
+        // note: in MySQL 5.0.3 we get "Create View', 'Show view';
+        // the View for Create is spelled with uppercase V
+        // the view for Show is spelled with lowercase v
+        // and there is a space between the words
+
+        $av_grants = explode(
+            '\',\'',
+            substr(
+                $row1['Type'],
+                strpos($row1['Type'], '(') + 2,
+                strpos($row1['Type'], ')') - strpos($row1['Type'], '(') - 3
+            )
+        );
+        unset($row1);
+        $users_grants = explode(',', $row['Table_priv']);
+
+        foreach ($av_grants as $current_grant) {
+            $row[$current_grant . '_priv']
+                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
+        }
+        unset($row['Table_priv'], $current_grant, $av_grants, $users_grants);
+
+        // get collumns
+        $res = PMA_DBI_try_query(
+            'SHOW COLUMNS FROM '
+            . PMA_backquote(PMA_unescapeMysqlWildcards($db))
+            . '.' . PMA_backquote($table) . ';'
+        );
+        $columns = array();
+        if ($res) {
+            while ($row1 = PMA_DBI_fetch_row($res)) {
+                $columns[$row1[0]] = array(
+                    'Select' => false,
+                    'Insert' => false,
+                    'Update' => false,
+                    'References' => false
+                );
+            }
+            PMA_DBI_free_result($res);
+        }
+        unset($res, $row1);
+    }
+    // t a b l e - s p e c i f i c    p r i v i l e g e s
+    if (! empty($columns)) {
+        $res = PMA_DBI_query(
+            'SELECT `Column_name`, `Column_priv`'
+            .' FROM `mysql`.`columns_priv`'
+            .' WHERE `User`'
+            .' = \'' . PMA_sqlAddSlashes($username) . "'"
+            .' AND `Host`'
+            .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
+            .' AND `Db`'
+            .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
+            .' AND `Table_name`'
+            .' = \'' . PMA_sqlAddSlashes($table) . '\';'
+        );
+
+        while ($row1 = PMA_DBI_fetch_row($res)) {
+            $row1[1] = explode(',', $row1[1]);
+            foreach ($row1[1] as $current) {
+                $columns[$row1[0]][$current] = true;
+            }
+        }
+        PMA_DBI_free_result($res);
+        unset($res, $row1, $current);
+
+        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
+           . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
+           . '<fieldset id="fieldset_user_priv">' . "\n"
+           . '    <legend>' . __('Table-specific privileges')
+           . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
+           . '</legend>' . "\n";
+
+        // privs that are attached to a specific column
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Select_priv', 'SELECT',
+            'select', __('Allows reading data.'), 'Select'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Insert_priv', 'INSERT',
+            'insert', __('Allows inserting and replacing data.'), 'Insert'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Update_priv', 'UPDATE',
+            'update', __('Allows changing data.'), 'Update'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'References_priv', 'REFERENCES', 'references',
+            __('Has no effect in this MySQL version.'), 'References'
+        );
+
+        // privs that are not attached to a specific column
+
+        $html_output .= '<div class="item">' . "\n";
+        foreach ($row as $current_grant => $current_grant_value) {
+            $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
+            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
+                continue;
+            }
+            // make a substitution to match the messages variables;
+            // also we must substitute the grant we get, because we can't generate
+            // a form variable containing blanks (those would get changed to
+            // an underscore when receiving the POST)
+            if ($current_grant == 'Create View_priv') {
+                $tmp_current_grant = 'CreateView_priv';
+                $current_grant = 'Create_view_priv';
+            } elseif ($current_grant == 'Show view_priv') {
+                $tmp_current_grant = 'ShowView_priv';
+                $current_grant = 'Show_view_priv';
+            } else {
+                $tmp_current_grant = $current_grant;
+            }
+
+            $html_output .= '<div class="item">' . "\n"
+               . '<input type="checkbox"'
+               . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
+               . '" value="Y" '
+               . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
+               . 'title="';
+
+            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
+
+            $html_output .= '<label for="checkbox_' . $current_grant
+                . '"><code><dfn title="'
+                . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+                    ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+                    : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
+                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
+                . '</div>' . "\n";
+        } // end foreach ()
+
+        $html_output .= '</div>' . "\n";
+        // for Safari 2.0.2
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
+
+    } else {
+
+        // g l o b a l    o r    d b - s p e c i f i c
+        //
+        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
+
+        // d a t a
+        $privTable[0] = array(
+            array('Select', 'SELECT', __('Allows reading data.')),
+            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
+            array('Update', 'UPDATE', __('Allows changing data.')),
+            array('Delete', 'DELETE', __('Allows deleting data.'))
+        );
+        if ($db == '*') {
+            $privTable[0][] = array('File', 'FILE', __('Allows importing data from and exporting data into files.'));
+        }
+
+        // s t r u c t u r e
+        $privTable[1] = array(
+            array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
+            array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
+            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
+            array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
+            array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
+            array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
+            array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
+            array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
+            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
+        );
+        // this one is for a db-specific priv: Create_view_priv
+        if (isset($row['Create_view_priv'])) {
+            $privTable[1][] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
+        }
+        // this one is for a table-specific priv: Create View_priv
+        if (isset($row['Create View_priv'])) {
+            $privTable[1][] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
+        }
+        if (isset($row['Event_priv'])) {
+            // MySQL 5.1.6
+            $privTable[1][] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
+            $privTable[1][] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
+        }
+
+        // a d m i n i s t r a t i o n
+        $privTable[2] = array(
+            array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
+        );
+        if ($db == '*') {
+            $privTable[2][] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
+            $privTable[2][] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
+            $privTable[2][] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
+            $privTable[2][] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
+            $privTable[2][] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
+        }
+        $privTable[2][] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
+        $privTable[2][] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
+        if ($db == '*') {
+            $privTable[2][] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
+            $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
+            $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
+        }
+        $html_output .= '<input type="hidden" name="grant_count" value="'
+            . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
+            . '" />' . "\n"
+            . '<fieldset id="fieldset_user_global_rights">' . "\n"
+            . '<legend>' . "\n"
+            . '        '
+            . ($db == '*'
+                ? __('Global privileges')
+                : ($table == '*'
+                    ? __('Database-specific privileges')
+                    : __('Table-specific privileges'))) . "\n"
+            . '(<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
+            . __('Check All') . '</a> /' . "\n"
+            . '<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
+            . __('Uncheck All') . '</a>)' . "\n"
+            . '</legend>' . "\n"
+            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
+
+        // Output the Global privilege tables with checkboxes
+        foreach ($privTable as $i => $table) {
+            $html_output .= '<fieldset>' . "\n"
+                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
+            foreach ($table as $priv) {
+                $html_output .= '<div class="item">' . "\n"
+                    . '<input type="checkbox"'
+                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                    . ' value="Y" title="' . $priv[2] . '"'
+                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                    . '/>' . "\n"
+                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                    . $priv[1] . '</dfn></code></label>' . "\n"
+                    . '</div>' . "\n";
+            }
+            $html_output .= '</fieldset>' . "\n";
+        }
+
+        // The "Resource limits" box is not displayed for db-specific privs
+        if ($db == '*') {
+            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
+        }
+        // for Safari 2.0.2
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
+    }
+    $html_output .= '</fieldset>' . "\n";
+    if ($submit) {
+        $html_output .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
+           . '<input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
+           . '</fieldset>' . "\n";
+    }
+    return $html_output;
+} // end of the 'PMA_displayPrivTable()' function
+
+/**
+ * Get HTML for "Resource limits"
+ * 
+ * @param array $row    first row from result or boolean false
+ * 
+ * @return string       html snippet 
+ */
+function PMA_getHtmlForDisplayResourceLimits($row)
+{
+    return '<fieldset>' . "\n"
+       . '<legend>' . __('Resource limits') . '</legend>' . "\n"
+       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_questions"><code><dfn title="'
+       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_questions" id="text_max_questions" value="'
+       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_updates"><code><dfn title="'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_updates" id="text_max_updates" value="'
+       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_connections"><code><dfn title="'
+       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_connections" id="text_max_connections" value="'
+       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_user_connections"><code><dfn title="'
+       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
+       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '</fieldset>' . "\n";
+}
+
+/**
+ * Displays the fields used by the "new user" form as well as the
+ * "change login information / copy user" form.
+ *
+ * @param string $mode are we creating a new user or are we just
+ *                     changing  one? (allowed values: 'new', 'change')
+ *
+ * @global  array      $cfg     the phpMyAdmin configuration
+ * @global  ressource  $user_link the database connection
+ *
+ * @return void
+ */
+function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
+{
+    // Get user/host name lengths
+    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
+    $username_length = 16;
+    $hostname_length = 41;
+    foreach ($fields_info as $val) {
+        if ($val['Field'] == 'User') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $username_length = $v;
+            }
+        } elseif ($val['Field'] == 'Host') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $hostname_length = $v;
+            }
+        }
+    }
+    unset($fields_info);
+
+    if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
+        $GLOBALS['pred_username'] = 'any';
+    }
+    $html_output = '<fieldset id="fieldset_add_user_login">' . "\n"
+       . '<legend>' . __('Login Information') . '</legend>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="select_pred_username">' . "\n"
+       . '    ' . __('User name') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">' . "\n"
+       . '<select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
+       . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
+       . '<option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
+       . '<option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
+       . '</select>' . "\n"
+       . '</span>' . "\n"
+       . '<input type="text" name="username" maxlength="'
+       . $username_length . '" title="' . __('User name') . '"'
+       . (empty($GLOBALS['username'])
+           ? ''
+           : ' value="' . htmlspecialchars(
+               isset($GLOBALS['new_username'])
+               ? $GLOBALS['new_username']
+               : $GLOBALS['username']
+           ) . '"'
+       )
+       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="select_pred_hostname">' . "\n"
+       . '    ' . __('Host') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">' . "\n"
+       . '    <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"' . "\n";
+    $_current_user = PMA_DBI_fetch_value('SELECT USER();');
+    if (! empty($_current_user)) {
+        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
+        if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
+            unset($thishost);
+        }
+    }
+    $html_output = '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
+       . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
+       . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
+    unset($_current_user);
+
+    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
+    if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
+        switch (strtolower($GLOBALS['hostname'])) {
+        case 'localhost':
+        case '127.0.0.1':
+            $GLOBALS['pred_hostname'] = 'localhost';
+            break;
+        case '%':
+            $GLOBALS['pred_hostname'] = 'any';
+            break;
+        default:
+            $GLOBALS['pred_hostname'] = 'userdefined';
+            break;
+        }
+    }
+    $html_output =  '        <option value="any"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
+            ? ' selected="selected"' : '') . '>' . __('Any host')
+        . '</option>' . "\n"
+        . '<option value="localhost"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
+            ? ' selected="selected"' : '') . '>' . __('Local')
+        . '</option>' . "\n";
+    if (! empty($thishost)) {
+        $html_output = '        <option value="thishost"'
+            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
+                ? ' selected="selected"' : '') . '>' . __('This Host')
+            . '</option>' . "\n";
+    }
+    unset($thishost);
+    $html_output = '        <option value="hosttable"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
+            ? ' selected="selected"' : '') . '>' . __('Use Host Table')
+        . '</option>' . "\n"
+        . '        <option value="userdefined"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
+            ? ' selected="selected"' : '')
+        . '>' . __('Use text field') . ':</option>' . "\n"
+        . '</select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="text" name="hostname" maxlength="'
+        . $hostname_length . '" value="'
+        . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
+        . '" title="' . __('Host')
+        . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
+        . PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_password">' . "\n"
+        . '    ' . __('Password') . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '<select name="pred_password" id="select_pred_password" title="'
+        . __('Password') . '"' . "\n"
+        . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
+        . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
+        . '<option value="none"';
+    if (isset($GLOBALS['username']) && $mode != 'change') {
+        $html_output = '  selected="selected"';
+    }
+    $html_output = '>' . __('No Password') . '</option>' . "\n"
+       . '<option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
+       . '</select>' . "\n"
+       . '</span>' . "\n"
+       . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item" id="div_element_before_generate_password">' . "\n"
+       . '<label for="text_pma_pw2">' . "\n"
+       . '    ' . __('Re-type') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">&nbsp;</span>' . "\n"
+       . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+       . '</div>' . "\n"
+       // Generate password added here via jQuery
+       . '</fieldset>' . "\n";
+    
+    return $html_output;
+} // end of the 'PMA_displayUserAndHostFields()' function
+
+
+/**
+ * Returns all the grants for a certain user on a certain host
+ * Used in the export privileges for all users section
+ *
+ * @param string $user User name
+ * @param string $host Host name
+ *
+ * @return string containing all the grants text
+ */
+function PMA_getGrants($user, $host)
+{
+    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($user) . "'@'" . PMA_sqlAddSlashes($host) . "'");
+    $response = '';
+    foreach ($grants as $one_grant) {
+        $response .= $one_grant . ";\n\n";
+    }
+    return $response;
+} // end of the 'PMA_getGrants()' function
+
+?>
diff --git a/server_privileges.php b/server_privileges.php
index ebe5c4536a..243e067ed0 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -10,6 +10,11 @@
  */
 require_once 'libraries/common.inc.php';
 
+/**
+ * functions implementation for this script
+ */
+require_once 'libraries/server_privileges.lib.php';
+
 /**
  * Does the common work
  */
@@ -188,868 +193,6 @@ if (! $is_superuser) {
 // a random number that will be appended to the id of the user forms
 $random_n = mt_rand(0, 1000000);
 
-/**
- * Escapes wildcard in a database+table specification
- * before using it in a GRANT statement.
- *
- * Escaping a wildcard character in a GRANT is only accepted at the global
- * or database level, not at table level; this is why I remove
- * the escaping character. Internally, in mysql.tables_priv.Db there are
- * no escaping (for example test_db) but in mysql.db you'll see test\_db
- * for a db-specific privilege.
- *
- * @param string $dbname    Database name
- * @param string $tablename Table name
- *
- * @return string the escaped (if necessary) database.table
- */
-function PMA_wildcardEscapeForGrant($dbname, $tablename)
-{
-
-    if (! strlen($dbname)) {
-        $db_and_table = '*.*';
-    } else {
-        if (strlen($tablename)) {
-            $db_and_table
-                = PMA_backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
-                . PMA_backquote($tablename);
-        } else {
-            $db_and_table = PMA_backquote($dbname) . '.*';
-        }
-    }
-    return $db_and_table;
-}
-
-/**
- * Generates a condition on the user name
- *
- * @param string $initial the user's initial
- *
- * @return string   the generated condition
- */
-function PMA_rangeOfUsers($initial = '')
-{
-    // strtolower() is used because the User field
-    // might be BINARY, so LIKE would be case sensitive
-    if (! empty($initial)) {
-        $ret = " WHERE `User` LIKE '"
-            . PMA_sqlAddSlashes($initial, true) . "%'"
-            . " OR `User` LIKE '"
-            . PMA_sqlAddSlashes(strtolower($initial), true) . "%'";
-    } else {
-        $ret = '';
-    }
-    return $ret;
-} // end function
-
-/**
- * Extracts the privilege information of a priv table row
- *
- * @param array   $row        the row
- * @param boolean $enableHTML add <dfn> tag with tooltips
- *
- * @global  resource $user_link the database connection
- *
- * @return array
- */
-function PMA_extractPrivInfo($row = '', $enableHTML = false)
-{
-    $grants = array(
-        array(
-            'Select_priv',
-            'SELECT',
-            __('Allows reading data.')),
-        array(
-            'Insert_priv',
-            'INSERT',
-            __('Allows inserting and replacing data.')),
-        array(
-            'Update_priv',
-            'UPDATE',
-            __('Allows changing data.')),
-        array(
-            'Delete_priv',
-            'DELETE',
-            __('Allows deleting data.')),
-        array(
-            'Create_priv',
-            'CREATE',
-            __('Allows creating new databases and tables.')),
-        array(
-            'Drop_priv',
-            'DROP',
-            __('Allows dropping databases and tables.')),
-        array(
-            'Reload_priv',
-            'RELOAD',
-            __('Allows reloading server settings and flushing the server\'s caches.')),
-        array(
-            'Shutdown_priv',
-            'SHUTDOWN',
-            __('Allows shutting down the server.')),
-        array(
-            'Process_priv',
-            'PROCESS',
-            __('Allows viewing processes of all users')),
-        array(
-            'File_priv',
-            'FILE',
-            __('Allows importing data from and exporting data into files.')),
-        array(
-            'References_priv',
-            'REFERENCES',
-            __('Has no effect in this MySQL version.')),
-        array(
-            'Index_priv',
-            'INDEX',
-            __('Allows creating and dropping indexes.')),
-        array(
-            'Alter_priv',
-            'ALTER',
-            __('Allows altering the structure of existing tables.')),
-        array(
-            'Show_db_priv',
-            'SHOW DATABASES',
-            __('Gives access to the complete list of databases.')),
-        array(
-            'Super_priv',
-            'SUPER',
-            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
-        array(
-            'Create_tmp_table_priv',
-            'CREATE TEMPORARY TABLES',
-            __('Allows creating temporary tables.')),
-        array(
-            'Lock_tables_priv',
-            'LOCK TABLES',
-            __('Allows locking tables for the current thread.')),
-        array(
-            'Repl_slave_priv',
-            'REPLICATION SLAVE',
-            __('Needed for the replication slaves.')),
-        array(
-            'Repl_client_priv',
-            'REPLICATION CLIENT',
-            __('Allows the user to ask where the slaves / masters are.')),
-        array(
-            'Create_view_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Event_priv',
-            'EVENT',
-            __('Allows to set up events for the event scheduler')),
-        array(
-            'Trigger_priv',
-            'TRIGGER',
-            __('Allows creating and dropping triggers')),
-        // for table privs:
-        array(
-            'Create View_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Show_view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        // for table privs:
-        array(
-            'Show view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        array(
-            'Create_routine_priv',
-            'CREATE ROUTINE',
-            __('Allows creating stored routines.')),
-        array(
-            'Alter_routine_priv',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping stored routines.')),
-        array(
-            'Create_user_priv',
-            'CREATE USER',
-            __('Allows creating, dropping and renaming user accounts.')),
-        array(
-            'Execute_priv',
-            'EXECUTE',
-            __('Allows executing stored routines.')),
-    );
-
-    if (! empty($row) && isset($row['Table_priv'])) {
-        $row1 = PMA_DBI_fetch_single_row(
-            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
-            'ASSOC', $GLOBALS['userlink']
-        );
-        $av_grants = explode(
-            '\',\'',
-            substr($row1['Type'], 5, strlen($row1['Type']) - 7)
-        );
-        unset($row1);
-        $users_grants = explode(',', $row['Table_priv']);
-        foreach ($av_grants as $current_grant) {
-            $row[$current_grant . '_priv']
-                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
-        }
-        unset($current_grant);
-        unset($av_grants);
-        unset($users_grants);
-    }
-    $privs = array();
-    $allPrivileges = true;
-    foreach ($grants as $current_grant) {
-        if ((! empty($row) && isset($row[$current_grant[0]]))
-            || (empty($row) && isset($GLOBALS[$current_grant[0]]))
-        ) {
-            if ((! empty($row) && $row[$current_grant[0]] == 'Y')
-                || (empty($row)
-                && ($GLOBALS[$current_grant[0]] == 'Y'
-                || (is_array($GLOBALS[$current_grant[0]])
-                && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count']
-                && empty($GLOBALS[$current_grant[0] . '_none']))))
-            ) {
-                if ($enableHTML) {
-                    $privs[] = '<dfn title="' . $current_grant[2] . '">'
-                        . $current_grant[1] . '</dfn>';
-                } else {
-                    $privs[] = $current_grant[1];
-                }
-            } elseif (! empty($GLOBALS[$current_grant[0]])
-             && is_array($GLOBALS[$current_grant[0]])
-             && empty($GLOBALS[$current_grant[0] . '_none'])) {
-                if ($enableHTML) {
-                    $priv_string = '<dfn title="' . $current_grant[2] . '">'
-                        . $current_grant[1] . '</dfn>';
-                } else {
-                    $priv_string = $current_grant[1];
-                }
-                $privs[] = $priv_string . ' (`'
-                    . join('`, `', $GLOBALS[$current_grant[0]]) . '`)';
-            } else {
-                $allPrivileges = false;
-            }
-        }
-    }
-    if (empty($privs)) {
-        if ($enableHTML) {
-            $privs[] = '<dfn title="' . __('No privileges.') . '">USAGE</dfn>';
-        } else {
-            $privs[] = 'USAGE';
-        }
-    } elseif ($allPrivileges
-            && (! isset($GLOBALS['grant_count'])
-            || count($privs) == $GLOBALS['grant_count'])
-        ) {
-        if ($enableHTML) {
-            $privs = array('<dfn title="'
-                . __('Includes all privileges except GRANT.')
-                . '">ALL PRIVILEGES</dfn>'
-            );
-        } else {
-            $privs = array('ALL PRIVILEGES');
-        }
-    }
-    return $privs;
-} // end of the 'PMA_extractPrivInfo()' function
-
-/**
- * Displays on which column(s) a table-specific privilege is granted
- *
- * @param array  $columns           columns array
- * @param array  $row               first row from result or boolean false
- * @param string $name_for_select   privilege types - Select_priv, Insert_priv
- *                                  Update_priv, References_priv
- * @param string $priv_for_header   privilege for header
- * @param string $name              privilege name - insert, select, update, references
- * @param string $name_for_dfn      name for dfn
- * @param string $name_for_current  name for current
- *
- * @return $html_output             html snippet
- */
-function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
-    $priv_for_header, $name, $name_for_dfn, $name_for_current
-) {
-    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
-        . '<label for="select_' . $name . '_priv">' . "\n"
-        . '<code><dfn title="' . $name_for_dfn . '">'
-        . $priv_for_header . '</dfn></code>' . "\n"
-        . '</label><br />' . "\n"
-        . '<select id="select_' . $name . '_priv" name="'
-        . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
-
-    foreach ($columns as $current_column => $current_column_privileges) {
-        $html_output .= '<option value="' . htmlspecialchars($current_column) . '"';
-        if ($row[$name_for_select] == 'Y' || $current_column_privileges[$name_for_current]) {
-            $html_output .= ' selected="selected"';
-        }
-        $html_output .= '>' . htmlspecialchars($current_column) . '</option>' . "\n";
-    }
-
-    $html_output .= '</select>' . "\n"
-        . '<i>' . __('Or') . '</i>' . "\n"
-        . '<label for="checkbox_' . $name_for_select
-        . '_none"><input type="checkbox"'
-        . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-        . ' name="' . $name_for_select . '_none" id="checkbox_'
-        . $name_for_select . '_none" title="'
-        . _pgettext('None privileges', 'None') . '" />'
-        . _pgettext('None privileges', 'None') . '</label>' . "\n"
-        . '</div>' . "\n";
-    return $html_output;
-} // end function
-
-/**
- * Get sql query for display privileges table
- * 
- * @param string $db      the database
- * @param string $table   the table
- * 
- * @return string sql query
- */
-function PMA_getSqlQueryForDisplayPrivTable($db, $table)
-{
-    $username = $GLOBALS['username'];
-    $hostname = $GLOBALS['hostname'];
-    if ($db == '*') {
-        return "SELECT * FROM `mysql`.`user`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
-    } elseif ($table == '*') {
-        return "SELECT * FROM `mysql`.`db`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
-            ." LIKE `Db`;";
-    }
-    return "SELECT `Table_priv`"
-        ." FROM `mysql`.`tables_priv`"
-        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
-        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
-}
-/**
- * Displays the privileges form table
- *
- * @param string  $db     the database
- * @param string  $table  the table
- * @param boolean $submit wheather to display the submit button or not
- *
- * @global  array      $cfg         the phpMyAdmin configuration
- * @global  ressource  $user_link   the database connection
- *
- * @return string html snippet
- */
-function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit = true)
-{
-    global $random_n;
-    $html_output = '';
-    
-    if ($db == '*') {
-        $table = '*';
-    }
-
-    if (isset($GLOBALS['username'])) {
-        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
-        $row = PMA_DBI_fetch_single_row($sql_query);
-    }
-    if (empty($row)) {
-        if ($table == '*') {
-            if ($db == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
-            } elseif ($table == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;';
-            }
-            $res = PMA_DBI_query($sql_query);
-            while ($row1 = PMA_DBI_fetch_row($res)) {
-                if (substr($row1[0], 0, 4) == 'max_') {
-                    $row[$row1[0]] = 0;
-                } else {
-                    $row[$row1[0]] = 'N';
-                }
-            }
-            PMA_DBI_free_result($res);
-        } else {
-            $row = array('Table_priv' => '');
-        }
-    }
-    if (isset($row['Table_priv'])) {
-        $row1 = PMA_DBI_fetch_single_row(
-            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
-            'ASSOC', $GLOBALS['userlink']
-        );
-        // note: in MySQL 5.0.3 we get "Create View', 'Show view';
-        // the View for Create is spelled with uppercase V
-        // the view for Show is spelled with lowercase v
-        // and there is a space between the words
-
-        $av_grants = explode(
-            '\',\'',
-            substr(
-                $row1['Type'],
-                strpos($row1['Type'], '(') + 2,
-                strpos($row1['Type'], ')') - strpos($row1['Type'], '(') - 3
-            )
-        );
-        unset($row1);
-        $users_grants = explode(',', $row['Table_priv']);
-
-        foreach ($av_grants as $current_grant) {
-            $row[$current_grant . '_priv']
-                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
-        }
-        unset($row['Table_priv'], $current_grant, $av_grants, $users_grants);
-
-        // get collumns
-        $res = PMA_DBI_try_query(
-            'SHOW COLUMNS FROM '
-            . PMA_backquote(PMA_unescapeMysqlWildcards($db))
-            . '.' . PMA_backquote($table) . ';'
-        );
-        $columns = array();
-        if ($res) {
-            while ($row1 = PMA_DBI_fetch_row($res)) {
-                $columns[$row1[0]] = array(
-                    'Select' => false,
-                    'Insert' => false,
-                    'Update' => false,
-                    'References' => false
-                );
-            }
-            PMA_DBI_free_result($res);
-        }
-        unset($res, $row1);
-    }
-    // t a b l e - s p e c i f i c    p r i v i l e g e s
-    if (! empty($columns)) {
-        $res = PMA_DBI_query(
-            'SELECT `Column_name`, `Column_priv`'
-            .' FROM `mysql`.`columns_priv`'
-            .' WHERE `User`'
-            .' = \'' . PMA_sqlAddSlashes($username) . "'"
-            .' AND `Host`'
-            .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
-            .' AND `Db`'
-            .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
-            .' AND `Table_name`'
-            .' = \'' . PMA_sqlAddSlashes($table) . '\';'
-        );
-
-        while ($row1 = PMA_DBI_fetch_row($res)) {
-            $row1[1] = explode(',', $row1[1]);
-            foreach ($row1[1] as $current) {
-                $columns[$row1[0]][$current] = true;
-            }
-        }
-        PMA_DBI_free_result($res);
-        unset($res, $row1, $current);
-
-        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
-           . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
-           . '<fieldset id="fieldset_user_priv">' . "\n"
-           . '    <legend>' . __('Table-specific privileges')
-           . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
-           . '</legend>' . "\n";
-
-        // privs that are attached to a specific column
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Select_priv', 'SELECT',
-            'select', __('Allows reading data.'), 'Select'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Insert_priv', 'INSERT',
-            'insert', __('Allows inserting and replacing data.'), 'Insert'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Update_priv', 'UPDATE',
-            'update', __('Allows changing data.'), 'Update'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'References_priv', 'REFERENCES', 'references',
-            __('Has no effect in this MySQL version.'), 'References'
-        );
-
-        // privs that are not attached to a specific column
-
-        $html_output .= '<div class="item">' . "\n";
-        foreach ($row as $current_grant => $current_grant_value) {
-            $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
-            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
-                continue;
-            }
-            // make a substitution to match the messages variables;
-            // also we must substitute the grant we get, because we can't generate
-            // a form variable containing blanks (those would get changed to
-            // an underscore when receiving the POST)
-            if ($current_grant == 'Create View_priv') {
-                $tmp_current_grant = 'CreateView_priv';
-                $current_grant = 'Create_view_priv';
-            } elseif ($current_grant == 'Show view_priv') {
-                $tmp_current_grant = 'ShowView_priv';
-                $current_grant = 'Show_view_priv';
-            } else {
-                $tmp_current_grant = $current_grant;
-            }
-
-            $html_output .= '<div class="item">' . "\n"
-               . '<input type="checkbox"'
-               . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
-               . '" value="Y" '
-               . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
-               . 'title="';
-
-            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
-
-            $html_output .= '<label for="checkbox_' . $current_grant
-                . '"><code><dfn title="'
-                . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                    ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                    : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
-                . '</div>' . "\n";
-        } // end foreach ()
-
-        $html_output .= '</div>' . "\n";
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
-
-    } else {
-
-        // g l o b a l    o r    d b - s p e c i f i c
-        //
-        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
-
-        // d a t a
-        $privTable[0] = array(
-            array('Select', 'SELECT', __('Allows reading data.')),
-            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
-            array('Update', 'UPDATE', __('Allows changing data.')),
-            array('Delete', 'DELETE', __('Allows deleting data.'))
-        );
-        if ($db == '*') {
-            $privTable[0][] = array('File', 'FILE', __('Allows importing data from and exporting data into files.'));
-        }
-
-        // s t r u c t u r e
-        $privTable[1] = array(
-            array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
-            array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
-            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-            array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
-            array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
-            array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
-            array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
-            array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
-            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
-        );
-        // this one is for a db-specific priv: Create_view_priv
-        if (isset($row['Create_view_priv'])) {
-            $privTable[1][] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        // this one is for a table-specific priv: Create View_priv
-        if (isset($row['Create View_priv'])) {
-            $privTable[1][] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        if (isset($row['Event_priv'])) {
-            // MySQL 5.1.6
-            $privTable[1][] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
-            $privTable[1][] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
-        }
-
-        // a d m i n i s t r a t i o n
-        $privTable[2] = array(
-            array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
-        );
-        if ($db == '*') {
-            $privTable[2][] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
-            $privTable[2][] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
-            $privTable[2][] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
-            $privTable[2][] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
-            $privTable[2][] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
-        }
-        $privTable[2][] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
-        $privTable[2][] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
-        if ($db == '*') {
-            $privTable[2][] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
-            $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
-            $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
-        }
-        $html_output .= '<input type="hidden" name="grant_count" value="'
-            . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
-            . '" />' . "\n"
-            . '<fieldset id="fieldset_user_global_rights">' . "\n"
-            . '<legend>' . "\n"
-            . '        '
-            . ($db == '*'
-                ? __('Global privileges')
-                : ($table == '*'
-                    ? __('Database-specific privileges')
-                    : __('Table-specific privileges'))) . "\n"
-            . '(<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
-            . __('Check All') . '</a> /' . "\n"
-            . '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
-            . __('Uncheck All') . '</a>)' . "\n"
-            . '</legend>' . "\n"
-            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
-
-        // Output the Global privilege tables with checkboxes
-        foreach ($privTable as $i => $table) {
-            $html_output .= '<fieldset>' . "\n"
-                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
-            foreach ($table as $priv) {
-                $html_output .= '<div class="item">' . "\n"
-                    . '<input type="checkbox"'
-                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
-                    . ' value="Y" title="' . $priv[2] . '"'
-                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
-                    . '/>' . "\n"
-                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
-                    . $priv[1] . '</dfn></code></label>' . "\n"
-                    . '</div>' . "\n";
-            }
-            $html_output .= '</fieldset>' . "\n";
-        }
-
-        // The "Resource limits" box is not displayed for db-specific privs
-        if ($db == '*') {
-            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
-        }
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
-    }
-    $html_output .= '</fieldset>' . "\n";
-    if ($submit) {
-        $html_output .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
-           . '<input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
-           . '</fieldset>' . "\n";
-    }
-    return $html_output;
-} // end of the 'PMA_displayPrivTable()' function
-
-/**
- * Get HTML for "Resource limits"
- * 
- * @param array $row    first row from result or boolean false
- * 
- * @return string       html snippet 
- */
-function PMA_getHtmlForDisplayResourceLimits($row)
-{
-    return '<fieldset>' . "\n"
-       . '<legend>' . __('Resource limits') . '</legend>' . "\n"
-       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_questions"><code><dfn title="'
-       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_questions" id="text_max_questions" value="'
-       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_updates"><code><dfn title="'
-       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_updates" id="text_max_updates" value="'
-       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_connections"><code><dfn title="'
-       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_connections" id="text_max_connections" value="'
-       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_user_connections"><code><dfn title="'
-       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
-       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '</fieldset>' . "\n";
-}
-
-/**
- * Displays the fields used by the "new user" form as well as the
- * "change login information / copy user" form.
- *
- * @param string $mode are we creating a new user or are we just
- *                     changing  one? (allowed values: 'new', 'change')
- *
- * @global  array      $cfg     the phpMyAdmin configuration
- * @global  ressource  $user_link the database connection
- *
- * @return void
- */
-function PMA_displayLoginInformationFields($mode = 'new')
-{
-    // Get user/host name lengths
-    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
-    $username_length = 16;
-    $hostname_length = 41;
-    foreach ($fields_info as $val) {
-        if ($val['Field'] == 'User') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $username_length = $v;
-            }
-        } elseif ($val['Field'] == 'Host') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $hostname_length = $v;
-            }
-        }
-    }
-    unset($fields_info);
-
-    if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
-        $GLOBALS['pred_username'] = 'any';
-    }
-    echo '<fieldset id="fieldset_add_user_login">' . "\n"
-       . '<legend>' . __('Login Information') . '</legend>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_username">' . "\n"
-       . '    ' . __('User name') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '    <select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
-       . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
-       . '        <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
-       . '        <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '    </select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="text" name="username" maxlength="'
-       . $username_length . '" title="' . __('User name') . '"'
-       . (empty($GLOBALS['username'])
-           ? ''
-           : ' value="' . htmlspecialchars(
-               isset($GLOBALS['new_username'])
-               ? $GLOBALS['new_username']
-               : $GLOBALS['username']
-           ) . '"'
-       )
-       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_hostname">' . "\n"
-       . '    ' . __('Host') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '    <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"' . "\n";
-    $_current_user = PMA_DBI_fetch_value('SELECT USER();');
-    if (! empty($_current_user)) {
-        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
-        if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
-            unset($thishost);
-        }
-    }
-    echo '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
-       . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
-       . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
-    unset($_current_user);
-
-    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-    if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
-        switch (strtolower($GLOBALS['hostname'])) {
-        case 'localhost':
-        case '127.0.0.1':
-            $GLOBALS['pred_hostname'] = 'localhost';
-            break;
-        case '%':
-            $GLOBALS['pred_hostname'] = 'any';
-            break;
-        default:
-            $GLOBALS['pred_hostname'] = 'userdefined';
-            break;
-        }
-    }
-    echo '        <option value="any"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
-            ? ' selected="selected"' : '') . '>' . __('Any host')
-        . '</option>' . "\n"
-       . '        <option value="localhost"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
-            ? ' selected="selected"' : '') . '>' . __('Local')
-        . '</option>' . "\n";
-    if (! empty($thishost)) {
-        echo '        <option value="thishost"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
-                ? ' selected="selected"' : '') . '>' . __('This Host')
-            . '</option>' . "\n";
-    }
-    unset($thishost);
-    echo '        <option value="hosttable"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
-            ? ' selected="selected"' : '') . '>' . __('Use Host Table')
-        . '</option>' . "\n"
-       . '        <option value="userdefined"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
-            ? ' selected="selected"' : '')
-        . '>' . __('Use text field') . ':</option>' . "\n"
-       . '    </select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="text" name="hostname" maxlength="'
-        . $hostname_length . '" value="'
-        . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
-        . '" title="' . __('Host')
-        . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
-       . PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_password">' . "\n"
-       . '    ' . __('Password') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '    <select name="pred_password" id="select_pred_password" title="'
-        . __('Password') . '"' . "\n"
-       . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
-       . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
-       . '        <option value="none"';
-    if (isset($GLOBALS['username']) && $mode != 'change') {
-        echo '  selected="selected"';
-    }
-    echo '>' . __('No Password') . '</option>' . "\n"
-       . '        <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '    </select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item" id="div_element_before_generate_password">' . "\n"
-       . '<label for="text_pma_pw2">' . "\n"
-       . '    ' . __('Re-type') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">&nbsp;</span>' . "\n"
-       . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
-       // Generate password added here via jQuery
-       . '</fieldset>' . "\n";
-} // end of the 'PMA_displayUserAndHostFields()' function
-
-
-/**
- * Returns all the grants for a certain user on a certain host
- * Used in the export privileges for all users section
- *
- * @param string $user User name
- * @param string $host Host name
- *
- * @return string containing all the grants text
- */
-function PMA_getGrants($user, $host)
-{
-    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($user) . "'@'" . PMA_sqlAddSlashes($host) . "'");
-    $response = '';
-    foreach ($grants as $one_grant) {
-        $response .= $one_grant . ";\n\n";
-    }
-    return $response;
-} // end of the 'PMA_getGrants()' function
-
 /**
  * Changes / copies a user, part I
  */
@@ -2058,7 +1201,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         unset($sql);
         if ($user_does_not_exists) {
             PMA_Message::error(__('The selected user was not found in the privilege table.'))->display();
-            PMA_displayLoginInformationFields();
+            echo PMA_getHtmlForDisplayLoginInformationFields();
             //exit;
         }
 
@@ -2383,8 +1526,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                . '<input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '<input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
                . '<fieldset id="fieldset_change_copy_user">' . "\n"
-               . '    <legend>' . __('Change Login Information / Copy User') . '</legend>' . "\n";
-            PMA_displayLoginInformationFields('change');
+               . '    <legend>' . __('Change Login Information / Copy User') . '</legend>' . "\n"
+               . PMA_getHtmlForDisplayLoginInformationFields('change');
             echo '    <fieldset>' . "\n"
                 . '        <legend>' . __('Create a new user with the same privileges and ...') . '</legend>' . "\n";
             $choices = array(
@@ -2411,8 +1554,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
        . PMA_getIcon('b_usradd.png') . __('Add user') . "\n"
        . '</h2>' . "\n"
        . '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
-       . PMA_generate_common_hidden_inputs('', '');
-    PMA_displayLoginInformationFields('new');
+       . PMA_generate_common_hidden_inputs('', '')
+       . PMA_getHtmlForDisplayLoginInformationFields('new');
     echo '<fieldset id="fieldset_add_user_database">' . "\n"
         . '<legend>' . __('Database for user') . '</legend>' . "\n";
 

From 8fb4c87621fcab9a7b1d082abf1344edede7478f Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 26 Jun 2012 23:43:29 +0530
Subject: [PATCH 005/102] fixed bug in Add user panel in privileges

---
 libraries/server_privileges.lib.php |  16 +-
 server_privileges.php               | 870 +++++++++++++++++++++++++++-
 2 files changed, 875 insertions(+), 11 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index e799940d51..d9c8ec595f 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -9,7 +9,6 @@
 if (! defined('PHPMYADMIN')) {
     exit;
 }
-
 /**
  * Escapes wildcard in a database+table specification
  * before using it in a GRANT statement.
@@ -361,9 +360,8 @@ function PMA_getSqlQueryForDisplayPrivTable($db, $table)
  *
  * @return string html snippet
  */
-function PMA_getHtmlToDisplayPrivilegesTable($db = '*', $table = '*', $submit = true)
+function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*', $submit = true)
 {
-    global $random_n;
     $html_output = '';
     
     if ($db == '*') {
@@ -770,7 +768,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
             unset($thishost);
         }
     }
-    $html_output = '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
+    $html_output .= '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
        . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
        . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
     unset($_current_user);
@@ -790,7 +788,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
             break;
         }
     }
-    $html_output =  '        <option value="any"'
+    $html_output .=  '        <option value="any"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
             ? ' selected="selected"' : '') . '>' . __('Any host')
         . '</option>' . "\n"
@@ -799,13 +797,13 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
             ? ' selected="selected"' : '') . '>' . __('Local')
         . '</option>' . "\n";
     if (! empty($thishost)) {
-        $html_output = '        <option value="thishost"'
+        $html_output .= '        <option value="thishost"'
             . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
                 ? ' selected="selected"' : '') . '>' . __('This Host')
             . '</option>' . "\n";
     }
     unset($thishost);
-    $html_output = '        <option value="hosttable"'
+    $html_output .= '        <option value="hosttable"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
             ? ' selected="selected"' : '') . '>' . __('Use Host Table')
         . '</option>' . "\n"
@@ -833,9 +831,9 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
         . '<option value="none"';
     if (isset($GLOBALS['username']) && $mode != 'change') {
-        $html_output = '  selected="selected"';
+        $html_output .= '  selected="selected"';
     }
-    $html_output = '>' . __('No Password') . '</option>' . "\n"
+    $html_output .= '>' . __('No Password') . '</option>' . "\n"
        . '<option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
        . '</select>' . "\n"
        . '</span>' . "\n"
diff --git a/server_privileges.php b/server_privileges.php
index 243e067ed0..096f775205 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -13,7 +13,7 @@ require_once 'libraries/common.inc.php';
 /**
  * functions implementation for this script
  */
-require_once 'libraries/server_privileges.lib.php';
+//require_once 'libraries/server_privileges.lib.php';
 
 /**
  * Does the common work
@@ -1219,6 +1219,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         echo PMA_generate_common_hidden_inputs($_params);
 
         echo PMA_getHtmlToDisplayPrivilegesTable(
+            $random_n,
             PMA_ifSetOr($dbname, '*', 'length'),
             PMA_ifSetOr($tablename, '*', 'length')
         );
@@ -1571,7 +1572,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     }
 
     echo '</fieldset>' . "\n";
-    echo PMA_getHtmlToDisplayPrivilegesTable('*', '*', false);
+    echo PMA_getHtmlToDisplayPrivilegesTable($random_n, '*', '*', false);
     echo '    <fieldset id="fieldset_add_user_footer" class="tblFooters">' . "\n"
        . '        <input type="submit" name="adduser_submit" value="' . __('Go') . '" />' . "\n"
        . '    </fieldset>' . "\n"
@@ -1754,4 +1755,869 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
 } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...
 
+/**
+ * Escapes wildcard in a database+table specification
+ * before using it in a GRANT statement.
+ *
+ * Escaping a wildcard character in a GRANT is only accepted at the global
+ * or database level, not at table level; this is why I remove
+ * the escaping character. Internally, in mysql.tables_priv.Db there are
+ * no escaping (for example test_db) but in mysql.db you'll see test\_db
+ * for a db-specific privilege.
+ *
+ * @param string $dbname    Database name
+ * @param string $tablename Table name
+ *
+ * @return string the escaped (if necessary) database.table
+ */
+function PMA_wildcardEscapeForGrant($dbname, $tablename)
+{
+
+    if (! strlen($dbname)) {
+        $db_and_table = '*.*';
+    } else {
+        if (strlen($tablename)) {
+            $db_and_table
+                = PMA_backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
+                . PMA_backquote($tablename);
+        } else {
+            $db_and_table = PMA_backquote($dbname) . '.*';
+        }
+    }
+    return $db_and_table;
+}
+
+/**
+ * Generates a condition on the user name
+ *
+ * @param string $initial the user's initial
+ *
+ * @return string   the generated condition
+ */
+function PMA_rangeOfUsers($initial = '')
+{
+    // strtolower() is used because the User field
+    // might be BINARY, so LIKE would be case sensitive
+    if (! empty($initial)) {
+        $ret = " WHERE `User` LIKE '"
+            . PMA_sqlAddSlashes($initial, true) . "%'"
+            . " OR `User` LIKE '"
+            . PMA_sqlAddSlashes(strtolower($initial), true) . "%'";
+    } else {
+        $ret = '';
+    }
+    return $ret;
+} // end function
+
+/**
+ * Extracts the privilege information of a priv table row
+ *
+ * @param array   $row        the row
+ * @param boolean $enableHTML add <dfn> tag with tooltips
+ *
+ * @global  resource $user_link the database connection
+ *
+ * @return array
+ */
+function PMA_extractPrivInfo($row = '', $enableHTML = false)
+{
+    $grants = array(
+        array(
+            'Select_priv',
+            'SELECT',
+            __('Allows reading data.')),
+        array(
+            'Insert_priv',
+            'INSERT',
+            __('Allows inserting and replacing data.')),
+        array(
+            'Update_priv',
+            'UPDATE',
+            __('Allows changing data.')),
+        array(
+            'Delete_priv',
+            'DELETE',
+            __('Allows deleting data.')),
+        array(
+            'Create_priv',
+            'CREATE',
+            __('Allows creating new databases and tables.')),
+        array(
+            'Drop_priv',
+            'DROP',
+            __('Allows dropping databases and tables.')),
+        array(
+            'Reload_priv',
+            'RELOAD',
+            __('Allows reloading server settings and flushing the server\'s caches.')),
+        array(
+            'Shutdown_priv',
+            'SHUTDOWN',
+            __('Allows shutting down the server.')),
+        array(
+            'Process_priv',
+            'PROCESS',
+            __('Allows viewing processes of all users')),
+        array(
+            'File_priv',
+            'FILE',
+            __('Allows importing data from and exporting data into files.')),
+        array(
+            'References_priv',
+            'REFERENCES',
+            __('Has no effect in this MySQL version.')),
+        array(
+            'Index_priv',
+            'INDEX',
+            __('Allows creating and dropping indexes.')),
+        array(
+            'Alter_priv',
+            'ALTER',
+            __('Allows altering the structure of existing tables.')),
+        array(
+            'Show_db_priv',
+            'SHOW DATABASES',
+            __('Gives access to the complete list of databases.')),
+        array(
+            'Super_priv',
+            'SUPER',
+            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
+        array(
+            'Create_tmp_table_priv',
+            'CREATE TEMPORARY TABLES',
+            __('Allows creating temporary tables.')),
+        array(
+            'Lock_tables_priv',
+            'LOCK TABLES',
+            __('Allows locking tables for the current thread.')),
+        array(
+            'Repl_slave_priv',
+            'REPLICATION SLAVE',
+            __('Needed for the replication slaves.')),
+        array(
+            'Repl_client_priv',
+            'REPLICATION CLIENT',
+            __('Allows the user to ask where the slaves / masters are.')),
+        array(
+            'Create_view_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Event_priv',
+            'EVENT',
+            __('Allows to set up events for the event scheduler')),
+        array(
+            'Trigger_priv',
+            'TRIGGER',
+            __('Allows creating and dropping triggers')),
+        // for table privs:
+        array(
+            'Create View_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Show_view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        // for table privs:
+        array(
+            'Show view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        array(
+            'Create_routine_priv',
+            'CREATE ROUTINE',
+            __('Allows creating stored routines.')),
+        array(
+            'Alter_routine_priv',
+            'ALTER ROUTINE',
+            __('Allows altering and dropping stored routines.')),
+        array(
+            'Create_user_priv',
+            'CREATE USER',
+            __('Allows creating, dropping and renaming user accounts.')),
+        array(
+            'Execute_priv',
+            'EXECUTE',
+            __('Allows executing stored routines.')),
+    );
+
+    if (! empty($row) && isset($row['Table_priv'])) {
+        $row1 = PMA_DBI_fetch_single_row(
+            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
+            'ASSOC', $GLOBALS['userlink']
+        );
+        $av_grants = explode(
+            '\',\'',
+            substr($row1['Type'], 5, strlen($row1['Type']) - 7)
+        );
+        unset($row1);
+        $users_grants = explode(',', $row['Table_priv']);
+        foreach ($av_grants as $current_grant) {
+            $row[$current_grant . '_priv']
+                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
+        }
+        unset($current_grant);
+        unset($av_grants);
+        unset($users_grants);
+    }
+    $privs = array();
+    $allPrivileges = true;
+    foreach ($grants as $current_grant) {
+        if ((! empty($row) && isset($row[$current_grant[0]]))
+            || (empty($row) && isset($GLOBALS[$current_grant[0]]))
+        ) {
+            if ((! empty($row) && $row[$current_grant[0]] == 'Y')
+                || (empty($row)
+                && ($GLOBALS[$current_grant[0]] == 'Y'
+                || (is_array($GLOBALS[$current_grant[0]])
+                && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count']
+                && empty($GLOBALS[$current_grant[0] . '_none']))))
+            ) {
+                if ($enableHTML) {
+                    $privs[] = '<dfn title="' . $current_grant[2] . '">'
+                        . $current_grant[1] . '</dfn>';
+                } else {
+                    $privs[] = $current_grant[1];
+                }
+            } elseif (! empty($GLOBALS[$current_grant[0]])
+             && is_array($GLOBALS[$current_grant[0]])
+             && empty($GLOBALS[$current_grant[0] . '_none'])) {
+                if ($enableHTML) {
+                    $priv_string = '<dfn title="' . $current_grant[2] . '">'
+                        . $current_grant[1] . '</dfn>';
+                } else {
+                    $priv_string = $current_grant[1];
+                }
+                $privs[] = $priv_string . ' (`'
+                    . join('`, `', $GLOBALS[$current_grant[0]]) . '`)';
+            } else {
+                $allPrivileges = false;
+            }
+        }
+    }
+    if (empty($privs)) {
+        if ($enableHTML) {
+            $privs[] = '<dfn title="' . __('No privileges.') . '">USAGE</dfn>';
+        } else {
+            $privs[] = 'USAGE';
+        }
+    } elseif ($allPrivileges
+            && (! isset($GLOBALS['grant_count'])
+            || count($privs) == $GLOBALS['grant_count'])
+        ) {
+        if ($enableHTML) {
+            $privs = array('<dfn title="'
+                . __('Includes all privileges except GRANT.')
+                . '">ALL PRIVILEGES</dfn>'
+            );
+        } else {
+            $privs = array('ALL PRIVILEGES');
+        }
+    }
+    return $privs;
+} // end of the 'PMA_extractPrivInfo()' function
+
+/**
+ * Displays on which column(s) a table-specific privilege is granted
+ *
+ * @param array  $columns           columns array
+ * @param array  $row               first row from result or boolean false
+ * @param string $name_for_select   privilege types - Select_priv, Insert_priv
+ *                                  Update_priv, References_priv
+ * @param string $priv_for_header   privilege for header
+ * @param string $name              privilege name - insert, select, update, references
+ * @param string $name_for_dfn      name for dfn
+ * @param string $name_for_current  name for current
+ *
+ * @return $html_output             html snippet
+ */
+function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
+    $priv_for_header, $name, $name_for_dfn, $name_for_current
+) {
+    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
+        . '<label for="select_' . $name . '_priv">' . "\n"
+        . '<code><dfn title="' . $name_for_dfn . '">'
+        . $priv_for_header . '</dfn></code>' . "\n"
+        . '</label><br />' . "\n"
+        . '<select id="select_' . $name . '_priv" name="'
+        . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
+
+    foreach ($columns as $current_column => $current_column_privileges) {
+        $html_output .= '<option value="' . htmlspecialchars($current_column) . '"';
+        if ($row[$name_for_select] == 'Y' || $current_column_privileges[$name_for_current]) {
+            $html_output .= ' selected="selected"';
+        }
+        $html_output .= '>' . htmlspecialchars($current_column) . '</option>' . "\n";
+    }
+
+    $html_output .= '</select>' . "\n"
+        . '<i>' . __('Or') . '</i>' . "\n"
+        . '<label for="checkbox_' . $name_for_select
+        . '_none"><input type="checkbox"'
+        . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+        . ' name="' . $name_for_select . '_none" id="checkbox_'
+        . $name_for_select . '_none" title="'
+        . _pgettext('None privileges', 'None') . '" />'
+        . _pgettext('None privileges', 'None') . '</label>' . "\n"
+        . '</div>' . "\n";
+    return $html_output;
+} // end function
+
+/**
+ * Get sql query for display privileges table
+ * 
+ * @param string $db      the database
+ * @param string $table   the table
+ * 
+ * @return string sql query
+ */
+function PMA_getSqlQueryForDisplayPrivTable($db, $table)
+{
+    $username = $GLOBALS['username'];
+    $hostname = $GLOBALS['hostname'];
+    if ($db == '*') {
+        return "SELECT * FROM `mysql`.`user`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
+    } elseif ($table == '*') {
+        return "SELECT * FROM `mysql`.`db`"
+            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
+            ." LIKE `Db`;";
+    }
+    return "SELECT `Table_priv`"
+        ." FROM `mysql`.`tables_priv`"
+        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
+        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
+        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
+        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
+}
+/**
+ * Displays the privileges form table
+ *
+ * @param string  $db     the database
+ * @param string  $table  the table
+ * @param boolean $submit wheather to display the submit button or not
+ *
+ * @global  array      $cfg         the phpMyAdmin configuration
+ * @global  ressource  $user_link   the database connection
+ *
+ * @return string html snippet
+ */
+function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*', $submit = true)
+{
+    $html_output = '';
+    
+    if ($db == '*') {
+        $table = '*';
+    }
+
+    if (isset($GLOBALS['username'])) {
+        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
+        $row = PMA_DBI_fetch_single_row($sql_query);
+    }
+    if (empty($row)) {
+        if ($table == '*') {
+            if ($db == '*') {
+                $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
+            } elseif ($table == '*') {
+                $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;';
+            }
+            $res = PMA_DBI_query($sql_query);
+            while ($row1 = PMA_DBI_fetch_row($res)) {
+                if (substr($row1[0], 0, 4) == 'max_') {
+                    $row[$row1[0]] = 0;
+                } else {
+                    $row[$row1[0]] = 'N';
+                }
+            }
+            PMA_DBI_free_result($res);
+        } else {
+            $row = array('Table_priv' => '');
+        }
+    }
+    if (isset($row['Table_priv'])) {
+        $row1 = PMA_DBI_fetch_single_row(
+            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
+            'ASSOC', $GLOBALS['userlink']
+        );
+        // note: in MySQL 5.0.3 we get "Create View', 'Show view';
+        // the View for Create is spelled with uppercase V
+        // the view for Show is spelled with lowercase v
+        // and there is a space between the words
+
+        $av_grants = explode(
+            '\',\'',
+            substr(
+                $row1['Type'],
+                strpos($row1['Type'], '(') + 2,
+                strpos($row1['Type'], ')') - strpos($row1['Type'], '(') - 3
+            )
+        );
+        unset($row1);
+        $users_grants = explode(',', $row['Table_priv']);
+
+        foreach ($av_grants as $current_grant) {
+            $row[$current_grant . '_priv']
+                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
+        }
+        unset($row['Table_priv'], $current_grant, $av_grants, $users_grants);
+
+        // get collumns
+        $res = PMA_DBI_try_query(
+            'SHOW COLUMNS FROM '
+            . PMA_backquote(PMA_unescapeMysqlWildcards($db))
+            . '.' . PMA_backquote($table) . ';'
+        );
+        $columns = array();
+        if ($res) {
+            while ($row1 = PMA_DBI_fetch_row($res)) {
+                $columns[$row1[0]] = array(
+                    'Select' => false,
+                    'Insert' => false,
+                    'Update' => false,
+                    'References' => false
+                );
+            }
+            PMA_DBI_free_result($res);
+        }
+        unset($res, $row1);
+    }
+    // t a b l e - s p e c i f i c    p r i v i l e g e s
+    if (! empty($columns)) {
+        $res = PMA_DBI_query(
+            'SELECT `Column_name`, `Column_priv`'
+            .' FROM `mysql`.`columns_priv`'
+            .' WHERE `User`'
+            .' = \'' . PMA_sqlAddSlashes($username) . "'"
+            .' AND `Host`'
+            .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
+            .' AND `Db`'
+            .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
+            .' AND `Table_name`'
+            .' = \'' . PMA_sqlAddSlashes($table) . '\';'
+        );
+
+        while ($row1 = PMA_DBI_fetch_row($res)) {
+            $row1[1] = explode(',', $row1[1]);
+            foreach ($row1[1] as $current) {
+                $columns[$row1[0]][$current] = true;
+            }
+        }
+        PMA_DBI_free_result($res);
+        unset($res, $row1, $current);
+
+        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
+           . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
+           . '<fieldset id="fieldset_user_priv">' . "\n"
+           . '    <legend>' . __('Table-specific privileges')
+           . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
+           . '</legend>' . "\n";
+
+        // privs that are attached to a specific column
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Select_priv', 'SELECT',
+            'select', __('Allows reading data.'), 'Select'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Insert_priv', 'INSERT',
+            'insert', __('Allows inserting and replacing data.'), 'Insert'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'Update_priv', 'UPDATE',
+            'update', __('Allows changing data.'), 'Update'
+        );
+
+        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+            $columns, $row, 'References_priv', 'REFERENCES', 'references',
+            __('Has no effect in this MySQL version.'), 'References'
+        );
+
+        // privs that are not attached to a specific column
+
+        $html_output .= '<div class="item">' . "\n";
+        foreach ($row as $current_grant => $current_grant_value) {
+            $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
+            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
+                continue;
+            }
+            // make a substitution to match the messages variables;
+            // also we must substitute the grant we get, because we can't generate
+            // a form variable containing blanks (those would get changed to
+            // an underscore when receiving the POST)
+            if ($current_grant == 'Create View_priv') {
+                $tmp_current_grant = 'CreateView_priv';
+                $current_grant = 'Create_view_priv';
+            } elseif ($current_grant == 'Show view_priv') {
+                $tmp_current_grant = 'ShowView_priv';
+                $current_grant = 'Show_view_priv';
+            } else {
+                $tmp_current_grant = $current_grant;
+            }
+
+            $html_output .= '<div class="item">' . "\n"
+               . '<input type="checkbox"'
+               . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
+               . '" value="Y" '
+               . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
+               . 'title="';
+
+            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
+
+            $html_output .= '<label for="checkbox_' . $current_grant
+                . '"><code><dfn title="'
+                . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+                    ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+                    : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
+                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
+                . '</div>' . "\n";
+        } // end foreach ()
+
+        $html_output .= '</div>' . "\n";
+        // for Safari 2.0.2
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
+
+    } else {
+
+        // g l o b a l    o r    d b - s p e c i f i c
+        //
+        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
+
+        // d a t a
+        $privTable[0] = array(
+            array('Select', 'SELECT', __('Allows reading data.')),
+            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
+            array('Update', 'UPDATE', __('Allows changing data.')),
+            array('Delete', 'DELETE', __('Allows deleting data.'))
+        );
+        if ($db == '*') {
+            $privTable[0][] = array('File', 'FILE', __('Allows importing data from and exporting data into files.'));
+        }
+
+        // s t r u c t u r e
+        $privTable[1] = array(
+            array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
+            array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
+            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
+            array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
+            array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
+            array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
+            array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
+            array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
+            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
+        );
+        // this one is for a db-specific priv: Create_view_priv
+        if (isset($row['Create_view_priv'])) {
+            $privTable[1][] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
+        }
+        // this one is for a table-specific priv: Create View_priv
+        if (isset($row['Create View_priv'])) {
+            $privTable[1][] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
+        }
+        if (isset($row['Event_priv'])) {
+            // MySQL 5.1.6
+            $privTable[1][] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
+            $privTable[1][] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
+        }
+
+        // a d m i n i s t r a t i o n
+        $privTable[2] = array(
+            array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
+        );
+        if ($db == '*') {
+            $privTable[2][] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
+            $privTable[2][] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
+            $privTable[2][] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
+            $privTable[2][] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
+            $privTable[2][] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
+        }
+        $privTable[2][] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
+        $privTable[2][] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
+        if ($db == '*') {
+            $privTable[2][] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
+            $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
+            $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
+        }
+        $html_output .= '<input type="hidden" name="grant_count" value="'
+            . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
+            . '" />' . "\n"
+            . '<fieldset id="fieldset_user_global_rights">' . "\n"
+            . '<legend>' . "\n"
+            . '        '
+            . ($db == '*'
+                ? __('Global privileges')
+                : ($table == '*'
+                    ? __('Database-specific privileges')
+                    : __('Table-specific privileges'))) . "\n"
+            . '(<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
+            . __('Check All') . '</a> /' . "\n"
+            . '<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
+            . __('Uncheck All') . '</a>)' . "\n"
+            . '</legend>' . "\n"
+            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
+
+        // Output the Global privilege tables with checkboxes
+        foreach ($privTable as $i => $table) {
+            $html_output .= '<fieldset>' . "\n"
+                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
+            foreach ($table as $priv) {
+                $html_output .= '<div class="item">' . "\n"
+                    . '<input type="checkbox"'
+                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                    . ' value="Y" title="' . $priv[2] . '"'
+                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                    . '/>' . "\n"
+                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                    . $priv[1] . '</dfn></code></label>' . "\n"
+                    . '</div>' . "\n";
+            }
+            $html_output .= '</fieldset>' . "\n";
+        }
+
+        // The "Resource limits" box is not displayed for db-specific privs
+        if ($db == '*') {
+            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
+        }
+        // for Safari 2.0.2
+        $html_output .= '<div class="clearfloat"></div>' . "\n";
+    }
+    $html_output .= '</fieldset>' . "\n";
+    if ($submit) {
+        $html_output .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
+           . '<input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
+           . '</fieldset>' . "\n";
+    }
+    return $html_output;
+} // end of the 'PMA_displayPrivTable()' function
+
+/**
+ * Get HTML for "Resource limits"
+ * 
+ * @param array $row    first row from result or boolean false
+ * 
+ * @return string       html snippet 
+ */
+function PMA_getHtmlForDisplayResourceLimits($row)
+{
+    return '<fieldset>' . "\n"
+       . '<legend>' . __('Resource limits') . '</legend>' . "\n"
+       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_questions"><code><dfn title="'
+       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_questions" id="text_max_questions" value="'
+       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_updates"><code><dfn title="'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_updates" id="text_max_updates" value="'
+       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_connections"><code><dfn title="'
+       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_connections" id="text_max_connections" value="'
+       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="text_max_user_connections"><code><dfn title="'
+       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
+       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
+       . '</div>' . "\n"
+       . '</fieldset>' . "\n";
+}
+
+/**
+ * Displays the fields used by the "new user" form as well as the
+ * "change login information / copy user" form.
+ *
+ * @param string $mode are we creating a new user or are we just
+ *                     changing  one? (allowed values: 'new', 'change')
+ *
+ * @global  array      $cfg     the phpMyAdmin configuration
+ * @global  ressource  $user_link the database connection
+ *
+ * @return void
+ */
+function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
+{
+    // Get user/host name lengths
+    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
+    $username_length = 16;
+    $hostname_length = 41;
+    foreach ($fields_info as $val) {
+        if ($val['Field'] == 'User') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $username_length = $v;
+            }
+        } elseif ($val['Field'] == 'Host') {
+            strtok($val['Type'], '()');
+            $v = strtok('()');
+            if (is_int($v)) {
+                $hostname_length = $v;
+            }
+        }
+    }
+    unset($fields_info);
+
+    if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
+        $GLOBALS['pred_username'] = 'any';
+    }
+    $html_output = '<fieldset id="fieldset_add_user_login">' . "\n"
+       . '<legend>' . __('Login Information') . '</legend>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="select_pred_username">' . "\n"
+       . '    ' . __('User name') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">' . "\n"
+       . '<select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
+       . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
+       . '<option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
+       . '<option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
+       . '</select>' . "\n"
+       . '</span>' . "\n"
+       . '<input type="text" name="username" maxlength="'
+       . $username_length . '" title="' . __('User name') . '"'
+       . (empty($GLOBALS['username'])
+           ? ''
+           : ' value="' . htmlspecialchars(
+               isset($GLOBALS['new_username'])
+               ? $GLOBALS['new_username']
+               : $GLOBALS['username']
+           ) . '"'
+       )
+       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item">' . "\n"
+       . '<label for="select_pred_hostname">' . "\n"
+       . '    ' . __('Host') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">' . "\n"
+       . '    <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"' . "\n";
+    $_current_user = PMA_DBI_fetch_value('SELECT USER();');
+    if (! empty($_current_user)) {
+        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
+        if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
+            unset($thishost);
+        }
+    }
+    $html_output .= '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
+       . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
+       . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
+    unset($_current_user);
+
+    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
+    if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
+        switch (strtolower($GLOBALS['hostname'])) {
+        case 'localhost':
+        case '127.0.0.1':
+            $GLOBALS['pred_hostname'] = 'localhost';
+            break;
+        case '%':
+            $GLOBALS['pred_hostname'] = 'any';
+            break;
+        default:
+            $GLOBALS['pred_hostname'] = 'userdefined';
+            break;
+        }
+    }
+    $html_output .=  '        <option value="any"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
+            ? ' selected="selected"' : '') . '>' . __('Any host')
+        . '</option>' . "\n"
+        . '<option value="localhost"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
+            ? ' selected="selected"' : '') . '>' . __('Local')
+        . '</option>' . "\n";
+    if (! empty($thishost)) {
+        $html_output .= '        <option value="thishost"'
+            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
+                ? ' selected="selected"' : '') . '>' . __('This Host')
+            . '</option>' . "\n";
+    }
+    unset($thishost);
+    $html_output .= '        <option value="hosttable"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
+            ? ' selected="selected"' : '') . '>' . __('Use Host Table')
+        . '</option>' . "\n"
+        . '        <option value="userdefined"'
+        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
+            ? ' selected="selected"' : '')
+        . '>' . __('Use text field') . ':</option>' . "\n"
+        . '</select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="text" name="hostname" maxlength="'
+        . $hostname_length . '" value="'
+        . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
+        . '" title="' . __('Host')
+        . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
+        . PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
+        . '</div>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_password">' . "\n"
+        . '    ' . __('Password') . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n"
+        . '<select name="pred_password" id="select_pred_password" title="'
+        . __('Password') . '"' . "\n"
+        . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
+        . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
+        . '<option value="none"';
+    if (isset($GLOBALS['username']) && $mode != 'change') {
+        $html_output .= '  selected="selected"';
+    }
+    $html_output .= '>' . __('No Password') . '</option>' . "\n"
+       . '<option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
+       . '</select>' . "\n"
+       . '</span>' . "\n"
+       . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+       . '</div>' . "\n"
+       . '<div class="item" id="div_element_before_generate_password">' . "\n"
+       . '<label for="text_pma_pw2">' . "\n"
+       . '    ' . __('Re-type') . ':' . "\n"
+       . '</label>' . "\n"
+       . '<span class="options">&nbsp;</span>' . "\n"
+       . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
+       . '</div>' . "\n"
+       // Generate password added here via jQuery
+       . '</fieldset>' . "\n";
+    
+    return $html_output;
+} // end of the 'PMA_displayUserAndHostFields()' function
+
+
+/**
+ * Returns all the grants for a certain user on a certain host
+ * Used in the export privileges for all users section
+ *
+ * @param string $user User name
+ * @param string $host Host name
+ *
+ * @return string containing all the grants text
+ */
+function PMA_getGrants($user, $host)
+{
+    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($user) . "'@'" . PMA_sqlAddSlashes($host) . "'");
+    $response = '';
+    foreach ($grants as $one_grant) {
+        $response .= $one_grant . ";\n\n";
+    }
+    return $response;
+} // end of the 'PMA_getGrants()' function
+
+
+
 ?>

From 7bb7bafc5f0f16058f28076765105e8946597292 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 27 Jun 2012 01:29:04 +0530
Subject: [PATCH 006/102] implement PMA_getGrantsArray() in
 server_privileges-lib

---
 libraries/server_privileges.lib.php | 254 ++++----
 server_privileges.php               | 867 +---------------------------
 2 files changed, 134 insertions(+), 987 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d9c8ec595f..3a58f13642 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -26,7 +26,6 @@ if (! defined('PHPMYADMIN')) {
  */
 function PMA_wildcardEscapeForGrant($dbname, $tablename)
 {
-
     if (! strlen($dbname)) {
         $db_and_table = '*.*';
     } else {
@@ -75,126 +74,7 @@ function PMA_rangeOfUsers($initial = '')
  */
 function PMA_extractPrivInfo($row = '', $enableHTML = false)
 {
-    $grants = array(
-        array(
-            'Select_priv',
-            'SELECT',
-            __('Allows reading data.')),
-        array(
-            'Insert_priv',
-            'INSERT',
-            __('Allows inserting and replacing data.')),
-        array(
-            'Update_priv',
-            'UPDATE',
-            __('Allows changing data.')),
-        array(
-            'Delete_priv',
-            'DELETE',
-            __('Allows deleting data.')),
-        array(
-            'Create_priv',
-            'CREATE',
-            __('Allows creating new databases and tables.')),
-        array(
-            'Drop_priv',
-            'DROP',
-            __('Allows dropping databases and tables.')),
-        array(
-            'Reload_priv',
-            'RELOAD',
-            __('Allows reloading server settings and flushing the server\'s caches.')),
-        array(
-            'Shutdown_priv',
-            'SHUTDOWN',
-            __('Allows shutting down the server.')),
-        array(
-            'Process_priv',
-            'PROCESS',
-            __('Allows viewing processes of all users')),
-        array(
-            'File_priv',
-            'FILE',
-            __('Allows importing data from and exporting data into files.')),
-        array(
-            'References_priv',
-            'REFERENCES',
-            __('Has no effect in this MySQL version.')),
-        array(
-            'Index_priv',
-            'INDEX',
-            __('Allows creating and dropping indexes.')),
-        array(
-            'Alter_priv',
-            'ALTER',
-            __('Allows altering the structure of existing tables.')),
-        array(
-            'Show_db_priv',
-            'SHOW DATABASES',
-            __('Gives access to the complete list of databases.')),
-        array(
-            'Super_priv',
-            'SUPER',
-            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
-        array(
-            'Create_tmp_table_priv',
-            'CREATE TEMPORARY TABLES',
-            __('Allows creating temporary tables.')),
-        array(
-            'Lock_tables_priv',
-            'LOCK TABLES',
-            __('Allows locking tables for the current thread.')),
-        array(
-            'Repl_slave_priv',
-            'REPLICATION SLAVE',
-            __('Needed for the replication slaves.')),
-        array(
-            'Repl_client_priv',
-            'REPLICATION CLIENT',
-            __('Allows the user to ask where the slaves / masters are.')),
-        array(
-            'Create_view_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Event_priv',
-            'EVENT',
-            __('Allows to set up events for the event scheduler')),
-        array(
-            'Trigger_priv',
-            'TRIGGER',
-            __('Allows creating and dropping triggers')),
-        // for table privs:
-        array(
-            'Create View_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Show_view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        // for table privs:
-        array(
-            'Show view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        array(
-            'Create_routine_priv',
-            'CREATE ROUTINE',
-            __('Allows creating stored routines.')),
-        array(
-            'Alter_routine_priv',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping stored routines.')),
-        array(
-            'Create_user_priv',
-            'CREATE USER',
-            __('Allows creating, dropping and renaming user accounts.')),
-        array(
-            'Execute_priv',
-            'EXECUTE',
-            __('Allows executing stored routines.')),
-    );
+    $grants = PMA_getGrantsArray();
 
     if (! empty($row) && isset($row['Table_priv'])) {
         $row1 = PMA_DBI_fetch_single_row(
@@ -272,6 +152,138 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false)
     return $privs;
 } // end of the 'PMA_extractPrivInfo()' function
 
+/**
+ * Get the grants array which contains all the privilege types
+ * and relevent grant messages
+ * 
+ * @return array 
+ */
+function PMA_getGrantsArray()
+{
+    return array(
+        array(
+            'Select_priv',
+            'SELECT',
+            __('Allows reading data.')),
+        array(
+            'Insert_priv',
+            'INSERT',
+            __('Allows inserting and replacing data.')),
+        array(
+            'Update_priv',
+            'UPDATE',
+            __('Allows changing data.')),
+        array(
+            'Delete_priv',
+            'DELETE',
+            __('Allows deleting data.')),
+        array(
+            'Create_priv',
+            'CREATE',
+            __('Allows creating new databases and tables.')),
+        array(
+            'Drop_priv',
+            'DROP',
+            __('Allows dropping databases and tables.')),
+        array(
+            'Reload_priv',
+            'RELOAD',
+            __('Allows reloading server settings and flushing the server\'s caches.')),
+        array(
+            'Shutdown_priv',
+            'SHUTDOWN',
+            __('Allows shutting down the server.')),
+        array(
+            'Process_priv',
+            'PROCESS',
+            __('Allows viewing processes of all users')),
+        array(
+            'File_priv',
+            'FILE',
+            __('Allows importing data from and exporting data into files.')),
+        array(
+            'References_priv',
+            'REFERENCES',
+            __('Has no effect in this MySQL version.')),
+        array(
+            'Index_priv',
+            'INDEX',
+            __('Allows creating and dropping indexes.')),
+        array(
+            'Alter_priv',
+            'ALTER',
+            __('Allows altering the structure of existing tables.')),
+        array(
+            'Show_db_priv',
+            'SHOW DATABASES',
+            __('Gives access to the complete list of databases.')),
+        array(
+            'Super_priv',
+            'SUPER',
+            __('Allows connecting, even if maximum number of connections is reached;
+                required for most administrative operations like setting global 
+                variables or killing threads of other users.')),
+        array(
+            'Create_tmp_table_priv',
+            'CREATE TEMPORARY TABLES',
+            __('Allows creating temporary tables.')),
+        array(
+            'Lock_tables_priv',
+            'LOCK TABLES',
+            __('Allows locking tables for the current thread.')),
+        array(
+            'Repl_slave_priv',
+            'REPLICATION SLAVE',
+            __('Needed for the replication slaves.')),
+        array(
+            'Repl_client_priv',
+            'REPLICATION CLIENT',
+            __('Allows the user to ask where the slaves / masters are.')),
+        array(
+            'Create_view_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Event_priv',
+            'EVENT',
+            __('Allows to set up events for the event scheduler')),
+        array(
+            'Trigger_priv',
+            'TRIGGER',
+            __('Allows creating and dropping triggers')),
+        // for table privs:
+        array(
+            'Create View_priv',
+            'CREATE VIEW',
+            __('Allows creating new views.')),
+        array(
+            'Show_view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        // for table privs:
+        array(
+            'Show view_priv',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')),
+        array(
+            'Create_routine_priv',
+            'CREATE ROUTINE',
+            __('Allows creating stored routines.')),
+        array(
+            'Alter_routine_priv',
+            'ALTER ROUTINE',
+            __('Allows altering and dropping stored routines.')),
+        array(
+            'Create_user_priv',
+            'CREATE USER',
+            __('Allows creating, dropping and renaming user accounts.')),
+        array(
+            'Execute_priv',
+            'EXECUTE',
+            __('Allows executing stored routines.')),
+    );
+}
+
 /**
  * Displays on which column(s) a table-specific privilege is granted
  *
diff --git a/server_privileges.php b/server_privileges.php
index 096f775205..e84de0533b 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -13,7 +13,7 @@ require_once 'libraries/common.inc.php';
 /**
  * functions implementation for this script
  */
-//require_once 'libraries/server_privileges.lib.php';
+require_once 'libraries/server_privileges.lib.php';
 
 /**
  * Does the common work
@@ -1755,869 +1755,4 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
 } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...
 
-/**
- * Escapes wildcard in a database+table specification
- * before using it in a GRANT statement.
- *
- * Escaping a wildcard character in a GRANT is only accepted at the global
- * or database level, not at table level; this is why I remove
- * the escaping character. Internally, in mysql.tables_priv.Db there are
- * no escaping (for example test_db) but in mysql.db you'll see test\_db
- * for a db-specific privilege.
- *
- * @param string $dbname    Database name
- * @param string $tablename Table name
- *
- * @return string the escaped (if necessary) database.table
- */
-function PMA_wildcardEscapeForGrant($dbname, $tablename)
-{
-
-    if (! strlen($dbname)) {
-        $db_and_table = '*.*';
-    } else {
-        if (strlen($tablename)) {
-            $db_and_table
-                = PMA_backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
-                . PMA_backquote($tablename);
-        } else {
-            $db_and_table = PMA_backquote($dbname) . '.*';
-        }
-    }
-    return $db_and_table;
-}
-
-/**
- * Generates a condition on the user name
- *
- * @param string $initial the user's initial
- *
- * @return string   the generated condition
- */
-function PMA_rangeOfUsers($initial = '')
-{
-    // strtolower() is used because the User field
-    // might be BINARY, so LIKE would be case sensitive
-    if (! empty($initial)) {
-        $ret = " WHERE `User` LIKE '"
-            . PMA_sqlAddSlashes($initial, true) . "%'"
-            . " OR `User` LIKE '"
-            . PMA_sqlAddSlashes(strtolower($initial), true) . "%'";
-    } else {
-        $ret = '';
-    }
-    return $ret;
-} // end function
-
-/**
- * Extracts the privilege information of a priv table row
- *
- * @param array   $row        the row
- * @param boolean $enableHTML add <dfn> tag with tooltips
- *
- * @global  resource $user_link the database connection
- *
- * @return array
- */
-function PMA_extractPrivInfo($row = '', $enableHTML = false)
-{
-    $grants = array(
-        array(
-            'Select_priv',
-            'SELECT',
-            __('Allows reading data.')),
-        array(
-            'Insert_priv',
-            'INSERT',
-            __('Allows inserting and replacing data.')),
-        array(
-            'Update_priv',
-            'UPDATE',
-            __('Allows changing data.')),
-        array(
-            'Delete_priv',
-            'DELETE',
-            __('Allows deleting data.')),
-        array(
-            'Create_priv',
-            'CREATE',
-            __('Allows creating new databases and tables.')),
-        array(
-            'Drop_priv',
-            'DROP',
-            __('Allows dropping databases and tables.')),
-        array(
-            'Reload_priv',
-            'RELOAD',
-            __('Allows reloading server settings and flushing the server\'s caches.')),
-        array(
-            'Shutdown_priv',
-            'SHUTDOWN',
-            __('Allows shutting down the server.')),
-        array(
-            'Process_priv',
-            'PROCESS',
-            __('Allows viewing processes of all users')),
-        array(
-            'File_priv',
-            'FILE',
-            __('Allows importing data from and exporting data into files.')),
-        array(
-            'References_priv',
-            'REFERENCES',
-            __('Has no effect in this MySQL version.')),
-        array(
-            'Index_priv',
-            'INDEX',
-            __('Allows creating and dropping indexes.')),
-        array(
-            'Alter_priv',
-            'ALTER',
-            __('Allows altering the structure of existing tables.')),
-        array(
-            'Show_db_priv',
-            'SHOW DATABASES',
-            __('Gives access to the complete list of databases.')),
-        array(
-            'Super_priv',
-            'SUPER',
-            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
-        array(
-            'Create_tmp_table_priv',
-            'CREATE TEMPORARY TABLES',
-            __('Allows creating temporary tables.')),
-        array(
-            'Lock_tables_priv',
-            'LOCK TABLES',
-            __('Allows locking tables for the current thread.')),
-        array(
-            'Repl_slave_priv',
-            'REPLICATION SLAVE',
-            __('Needed for the replication slaves.')),
-        array(
-            'Repl_client_priv',
-            'REPLICATION CLIENT',
-            __('Allows the user to ask where the slaves / masters are.')),
-        array(
-            'Create_view_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Event_priv',
-            'EVENT',
-            __('Allows to set up events for the event scheduler')),
-        array(
-            'Trigger_priv',
-            'TRIGGER',
-            __('Allows creating and dropping triggers')),
-        // for table privs:
-        array(
-            'Create View_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')),
-        array(
-            'Show_view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        // for table privs:
-        array(
-            'Show view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')),
-        array(
-            'Create_routine_priv',
-            'CREATE ROUTINE',
-            __('Allows creating stored routines.')),
-        array(
-            'Alter_routine_priv',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping stored routines.')),
-        array(
-            'Create_user_priv',
-            'CREATE USER',
-            __('Allows creating, dropping and renaming user accounts.')),
-        array(
-            'Execute_priv',
-            'EXECUTE',
-            __('Allows executing stored routines.')),
-    );
-
-    if (! empty($row) && isset($row['Table_priv'])) {
-        $row1 = PMA_DBI_fetch_single_row(
-            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
-            'ASSOC', $GLOBALS['userlink']
-        );
-        $av_grants = explode(
-            '\',\'',
-            substr($row1['Type'], 5, strlen($row1['Type']) - 7)
-        );
-        unset($row1);
-        $users_grants = explode(',', $row['Table_priv']);
-        foreach ($av_grants as $current_grant) {
-            $row[$current_grant . '_priv']
-                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
-        }
-        unset($current_grant);
-        unset($av_grants);
-        unset($users_grants);
-    }
-    $privs = array();
-    $allPrivileges = true;
-    foreach ($grants as $current_grant) {
-        if ((! empty($row) && isset($row[$current_grant[0]]))
-            || (empty($row) && isset($GLOBALS[$current_grant[0]]))
-        ) {
-            if ((! empty($row) && $row[$current_grant[0]] == 'Y')
-                || (empty($row)
-                && ($GLOBALS[$current_grant[0]] == 'Y'
-                || (is_array($GLOBALS[$current_grant[0]])
-                && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count']
-                && empty($GLOBALS[$current_grant[0] . '_none']))))
-            ) {
-                if ($enableHTML) {
-                    $privs[] = '<dfn title="' . $current_grant[2] . '">'
-                        . $current_grant[1] . '</dfn>';
-                } else {
-                    $privs[] = $current_grant[1];
-                }
-            } elseif (! empty($GLOBALS[$current_grant[0]])
-             && is_array($GLOBALS[$current_grant[0]])
-             && empty($GLOBALS[$current_grant[0] . '_none'])) {
-                if ($enableHTML) {
-                    $priv_string = '<dfn title="' . $current_grant[2] . '">'
-                        . $current_grant[1] . '</dfn>';
-                } else {
-                    $priv_string = $current_grant[1];
-                }
-                $privs[] = $priv_string . ' (`'
-                    . join('`, `', $GLOBALS[$current_grant[0]]) . '`)';
-            } else {
-                $allPrivileges = false;
-            }
-        }
-    }
-    if (empty($privs)) {
-        if ($enableHTML) {
-            $privs[] = '<dfn title="' . __('No privileges.') . '">USAGE</dfn>';
-        } else {
-            $privs[] = 'USAGE';
-        }
-    } elseif ($allPrivileges
-            && (! isset($GLOBALS['grant_count'])
-            || count($privs) == $GLOBALS['grant_count'])
-        ) {
-        if ($enableHTML) {
-            $privs = array('<dfn title="'
-                . __('Includes all privileges except GRANT.')
-                . '">ALL PRIVILEGES</dfn>'
-            );
-        } else {
-            $privs = array('ALL PRIVILEGES');
-        }
-    }
-    return $privs;
-} // end of the 'PMA_extractPrivInfo()' function
-
-/**
- * Displays on which column(s) a table-specific privilege is granted
- *
- * @param array  $columns           columns array
- * @param array  $row               first row from result or boolean false
- * @param string $name_for_select   privilege types - Select_priv, Insert_priv
- *                                  Update_priv, References_priv
- * @param string $priv_for_header   privilege for header
- * @param string $name              privilege name - insert, select, update, references
- * @param string $name_for_dfn      name for dfn
- * @param string $name_for_current  name for current
- *
- * @return $html_output             html snippet
- */
-function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
-    $priv_for_header, $name, $name_for_dfn, $name_for_current
-) {
-    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
-        . '<label for="select_' . $name . '_priv">' . "\n"
-        . '<code><dfn title="' . $name_for_dfn . '">'
-        . $priv_for_header . '</dfn></code>' . "\n"
-        . '</label><br />' . "\n"
-        . '<select id="select_' . $name . '_priv" name="'
-        . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
-
-    foreach ($columns as $current_column => $current_column_privileges) {
-        $html_output .= '<option value="' . htmlspecialchars($current_column) . '"';
-        if ($row[$name_for_select] == 'Y' || $current_column_privileges[$name_for_current]) {
-            $html_output .= ' selected="selected"';
-        }
-        $html_output .= '>' . htmlspecialchars($current_column) . '</option>' . "\n";
-    }
-
-    $html_output .= '</select>' . "\n"
-        . '<i>' . __('Or') . '</i>' . "\n"
-        . '<label for="checkbox_' . $name_for_select
-        . '_none"><input type="checkbox"'
-        . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-        . ' name="' . $name_for_select . '_none" id="checkbox_'
-        . $name_for_select . '_none" title="'
-        . _pgettext('None privileges', 'None') . '" />'
-        . _pgettext('None privileges', 'None') . '</label>' . "\n"
-        . '</div>' . "\n";
-    return $html_output;
-} // end function
-
-/**
- * Get sql query for display privileges table
- * 
- * @param string $db      the database
- * @param string $table   the table
- * 
- * @return string sql query
- */
-function PMA_getSqlQueryForDisplayPrivTable($db, $table)
-{
-    $username = $GLOBALS['username'];
-    $hostname = $GLOBALS['hostname'];
-    if ($db == '*') {
-        return "SELECT * FROM `mysql`.`user`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
-    } elseif ($table == '*') {
-        return "SELECT * FROM `mysql`.`db`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
-            ." LIKE `Db`;";
-    }
-    return "SELECT `Table_priv`"
-        ." FROM `mysql`.`tables_priv`"
-        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
-        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
-}
-/**
- * Displays the privileges form table
- *
- * @param string  $db     the database
- * @param string  $table  the table
- * @param boolean $submit wheather to display the submit button or not
- *
- * @global  array      $cfg         the phpMyAdmin configuration
- * @global  ressource  $user_link   the database connection
- *
- * @return string html snippet
- */
-function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*', $submit = true)
-{
-    $html_output = '';
-    
-    if ($db == '*') {
-        $table = '*';
-    }
-
-    if (isset($GLOBALS['username'])) {
-        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
-        $row = PMA_DBI_fetch_single_row($sql_query);
-    }
-    if (empty($row)) {
-        if ($table == '*') {
-            if ($db == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
-            } elseif ($table == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;';
-            }
-            $res = PMA_DBI_query($sql_query);
-            while ($row1 = PMA_DBI_fetch_row($res)) {
-                if (substr($row1[0], 0, 4) == 'max_') {
-                    $row[$row1[0]] = 0;
-                } else {
-                    $row[$row1[0]] = 'N';
-                }
-            }
-            PMA_DBI_free_result($res);
-        } else {
-            $row = array('Table_priv' => '');
-        }
-    }
-    if (isset($row['Table_priv'])) {
-        $row1 = PMA_DBI_fetch_single_row(
-            'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
-            'ASSOC', $GLOBALS['userlink']
-        );
-        // note: in MySQL 5.0.3 we get "Create View', 'Show view';
-        // the View for Create is spelled with uppercase V
-        // the view for Show is spelled with lowercase v
-        // and there is a space between the words
-
-        $av_grants = explode(
-            '\',\'',
-            substr(
-                $row1['Type'],
-                strpos($row1['Type'], '(') + 2,
-                strpos($row1['Type'], ')') - strpos($row1['Type'], '(') - 3
-            )
-        );
-        unset($row1);
-        $users_grants = explode(',', $row['Table_priv']);
-
-        foreach ($av_grants as $current_grant) {
-            $row[$current_grant . '_priv']
-                = in_array($current_grant, $users_grants) ? 'Y' : 'N';
-        }
-        unset($row['Table_priv'], $current_grant, $av_grants, $users_grants);
-
-        // get collumns
-        $res = PMA_DBI_try_query(
-            'SHOW COLUMNS FROM '
-            . PMA_backquote(PMA_unescapeMysqlWildcards($db))
-            . '.' . PMA_backquote($table) . ';'
-        );
-        $columns = array();
-        if ($res) {
-            while ($row1 = PMA_DBI_fetch_row($res)) {
-                $columns[$row1[0]] = array(
-                    'Select' => false,
-                    'Insert' => false,
-                    'Update' => false,
-                    'References' => false
-                );
-            }
-            PMA_DBI_free_result($res);
-        }
-        unset($res, $row1);
-    }
-    // t a b l e - s p e c i f i c    p r i v i l e g e s
-    if (! empty($columns)) {
-        $res = PMA_DBI_query(
-            'SELECT `Column_name`, `Column_priv`'
-            .' FROM `mysql`.`columns_priv`'
-            .' WHERE `User`'
-            .' = \'' . PMA_sqlAddSlashes($username) . "'"
-            .' AND `Host`'
-            .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
-            .' AND `Db`'
-            .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
-            .' AND `Table_name`'
-            .' = \'' . PMA_sqlAddSlashes($table) . '\';'
-        );
-
-        while ($row1 = PMA_DBI_fetch_row($res)) {
-            $row1[1] = explode(',', $row1[1]);
-            foreach ($row1[1] as $current) {
-                $columns[$row1[0]][$current] = true;
-            }
-        }
-        PMA_DBI_free_result($res);
-        unset($res, $row1, $current);
-
-        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
-           . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
-           . '<fieldset id="fieldset_user_priv">' . "\n"
-           . '    <legend>' . __('Table-specific privileges')
-           . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
-           . '</legend>' . "\n";
-
-        // privs that are attached to a specific column
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Select_priv', 'SELECT',
-            'select', __('Allows reading data.'), 'Select'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Insert_priv', 'INSERT',
-            'insert', __('Allows inserting and replacing data.'), 'Insert'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Update_priv', 'UPDATE',
-            'update', __('Allows changing data.'), 'Update'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'References_priv', 'REFERENCES', 'references',
-            __('Has no effect in this MySQL version.'), 'References'
-        );
-
-        // privs that are not attached to a specific column
-
-        $html_output .= '<div class="item">' . "\n";
-        foreach ($row as $current_grant => $current_grant_value) {
-            $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
-            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
-                continue;
-            }
-            // make a substitution to match the messages variables;
-            // also we must substitute the grant we get, because we can't generate
-            // a form variable containing blanks (those would get changed to
-            // an underscore when receiving the POST)
-            if ($current_grant == 'Create View_priv') {
-                $tmp_current_grant = 'CreateView_priv';
-                $current_grant = 'Create_view_priv';
-            } elseif ($current_grant == 'Show view_priv') {
-                $tmp_current_grant = 'ShowView_priv';
-                $current_grant = 'Show_view_priv';
-            } else {
-                $tmp_current_grant = $current_grant;
-            }
-
-            $html_output .= '<div class="item">' . "\n"
-               . '<input type="checkbox"'
-               . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
-               . '" value="Y" '
-               . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
-               . 'title="';
-
-            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
-
-            $html_output .= '<label for="checkbox_' . $current_grant
-                . '"><code><dfn title="'
-                . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                    ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                    : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
-                . '</div>' . "\n";
-        } // end foreach ()
-
-        $html_output .= '</div>' . "\n";
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
-
-    } else {
-
-        // g l o b a l    o r    d b - s p e c i f i c
-        //
-        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
-
-        // d a t a
-        $privTable[0] = array(
-            array('Select', 'SELECT', __('Allows reading data.')),
-            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
-            array('Update', 'UPDATE', __('Allows changing data.')),
-            array('Delete', 'DELETE', __('Allows deleting data.'))
-        );
-        if ($db == '*') {
-            $privTable[0][] = array('File', 'FILE', __('Allows importing data from and exporting data into files.'));
-        }
-
-        // s t r u c t u r e
-        $privTable[1] = array(
-            array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
-            array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
-            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-            array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
-            array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
-            array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
-            array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
-            array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
-            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
-        );
-        // this one is for a db-specific priv: Create_view_priv
-        if (isset($row['Create_view_priv'])) {
-            $privTable[1][] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        // this one is for a table-specific priv: Create View_priv
-        if (isset($row['Create View_priv'])) {
-            $privTable[1][] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        if (isset($row['Event_priv'])) {
-            // MySQL 5.1.6
-            $privTable[1][] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
-            $privTable[1][] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
-        }
-
-        // a d m i n i s t r a t i o n
-        $privTable[2] = array(
-            array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
-        );
-        if ($db == '*') {
-            $privTable[2][] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
-            $privTable[2][] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
-            $privTable[2][] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
-            $privTable[2][] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
-            $privTable[2][] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
-        }
-        $privTable[2][] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
-        $privTable[2][] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
-        if ($db == '*') {
-            $privTable[2][] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
-            $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
-            $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
-        }
-        $html_output .= '<input type="hidden" name="grant_count" value="'
-            . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
-            . '" />' . "\n"
-            . '<fieldset id="fieldset_user_global_rights">' . "\n"
-            . '<legend>' . "\n"
-            . '        '
-            . ($db == '*'
-                ? __('Global privileges')
-                : ($table == '*'
-                    ? __('Database-specific privileges')
-                    : __('Table-specific privileges'))) . "\n"
-            . '(<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
-            . __('Check All') . '</a> /' . "\n"
-            . '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
-            . __('Uncheck All') . '</a>)' . "\n"
-            . '</legend>' . "\n"
-            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
-
-        // Output the Global privilege tables with checkboxes
-        foreach ($privTable as $i => $table) {
-            $html_output .= '<fieldset>' . "\n"
-                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
-            foreach ($table as $priv) {
-                $html_output .= '<div class="item">' . "\n"
-                    . '<input type="checkbox"'
-                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
-                    . ' value="Y" title="' . $priv[2] . '"'
-                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
-                    . '/>' . "\n"
-                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
-                    . $priv[1] . '</dfn></code></label>' . "\n"
-                    . '</div>' . "\n";
-            }
-            $html_output .= '</fieldset>' . "\n";
-        }
-
-        // The "Resource limits" box is not displayed for db-specific privs
-        if ($db == '*') {
-            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
-        }
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
-    }
-    $html_output .= '</fieldset>' . "\n";
-    if ($submit) {
-        $html_output .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">' . "\n"
-           . '<input type="submit" name="update_privs" value="' . __('Go') . '" />' . "\n"
-           . '</fieldset>' . "\n";
-    }
-    return $html_output;
-} // end of the 'PMA_displayPrivTable()' function
-
-/**
- * Get HTML for "Resource limits"
- * 
- * @param array $row    first row from result or boolean false
- * 
- * @return string       html snippet 
- */
-function PMA_getHtmlForDisplayResourceLimits($row)
-{
-    return '<fieldset>' . "\n"
-       . '<legend>' . __('Resource limits') . '</legend>' . "\n"
-       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_questions"><code><dfn title="'
-       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_questions" id="text_max_questions" value="'
-       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_updates"><code><dfn title="'
-       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_updates" id="text_max_updates" value="'
-       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_connections"><code><dfn title="'
-       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_connections" id="text_max_connections" value="'
-       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_user_connections"><code><dfn title="'
-       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
-       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '</fieldset>' . "\n";
-}
-
-/**
- * Displays the fields used by the "new user" form as well as the
- * "change login information / copy user" form.
- *
- * @param string $mode are we creating a new user or are we just
- *                     changing  one? (allowed values: 'new', 'change')
- *
- * @global  array      $cfg     the phpMyAdmin configuration
- * @global  ressource  $user_link the database connection
- *
- * @return void
- */
-function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
-{
-    // Get user/host name lengths
-    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
-    $username_length = 16;
-    $hostname_length = 41;
-    foreach ($fields_info as $val) {
-        if ($val['Field'] == 'User') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $username_length = $v;
-            }
-        } elseif ($val['Field'] == 'Host') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $hostname_length = $v;
-            }
-        }
-    }
-    unset($fields_info);
-
-    if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
-        $GLOBALS['pred_username'] = 'any';
-    }
-    $html_output = '<fieldset id="fieldset_add_user_login">' . "\n"
-       . '<legend>' . __('Login Information') . '</legend>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_username">' . "\n"
-       . '    ' . __('User name') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '<select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
-       . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
-       . '<option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
-       . '<option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '</select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="text" name="username" maxlength="'
-       . $username_length . '" title="' . __('User name') . '"'
-       . (empty($GLOBALS['username'])
-           ? ''
-           : ' value="' . htmlspecialchars(
-               isset($GLOBALS['new_username'])
-               ? $GLOBALS['new_username']
-               : $GLOBALS['username']
-           ) . '"'
-       )
-       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_hostname">' . "\n"
-       . '    ' . __('Host') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '    <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"' . "\n";
-    $_current_user = PMA_DBI_fetch_value('SELECT USER();');
-    if (! empty($_current_user)) {
-        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
-        if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
-            unset($thishost);
-        }
-    }
-    $html_output .= '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
-       . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
-       . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
-    unset($_current_user);
-
-    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-    if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
-        switch (strtolower($GLOBALS['hostname'])) {
-        case 'localhost':
-        case '127.0.0.1':
-            $GLOBALS['pred_hostname'] = 'localhost';
-            break;
-        case '%':
-            $GLOBALS['pred_hostname'] = 'any';
-            break;
-        default:
-            $GLOBALS['pred_hostname'] = 'userdefined';
-            break;
-        }
-    }
-    $html_output .=  '        <option value="any"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
-            ? ' selected="selected"' : '') . '>' . __('Any host')
-        . '</option>' . "\n"
-        . '<option value="localhost"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
-            ? ' selected="selected"' : '') . '>' . __('Local')
-        . '</option>' . "\n";
-    if (! empty($thishost)) {
-        $html_output .= '        <option value="thishost"'
-            . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
-                ? ' selected="selected"' : '') . '>' . __('This Host')
-            . '</option>' . "\n";
-    }
-    unset($thishost);
-    $html_output .= '        <option value="hosttable"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
-            ? ' selected="selected"' : '') . '>' . __('Use Host Table')
-        . '</option>' . "\n"
-        . '        <option value="userdefined"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
-            ? ' selected="selected"' : '')
-        . '>' . __('Use text field') . ':</option>' . "\n"
-        . '</select>' . "\n"
-        . '</span>' . "\n"
-        . '<input type="text" name="hostname" maxlength="'
-        . $hostname_length . '" value="'
-        . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
-        . '" title="' . __('Host')
-        . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
-        . PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
-        . '</div>' . "\n"
-        . '<div class="item">' . "\n"
-        . '<label for="select_pred_password">' . "\n"
-        . '    ' . __('Password') . ':' . "\n"
-        . '</label>' . "\n"
-        . '<span class="options">' . "\n"
-        . '<select name="pred_password" id="select_pred_password" title="'
-        . __('Password') . '"' . "\n"
-        . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
-        . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
-        . '<option value="none"';
-    if (isset($GLOBALS['username']) && $mode != 'change') {
-        $html_output .= '  selected="selected"';
-    }
-    $html_output .= '>' . __('No Password') . '</option>' . "\n"
-       . '<option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '</select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item" id="div_element_before_generate_password">' . "\n"
-       . '<label for="text_pma_pw2">' . "\n"
-       . '    ' . __('Re-type') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">&nbsp;</span>' . "\n"
-       . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
-       // Generate password added here via jQuery
-       . '</fieldset>' . "\n";
-    
-    return $html_output;
-} // end of the 'PMA_displayUserAndHostFields()' function
-
-
-/**
- * Returns all the grants for a certain user on a certain host
- * Used in the export privileges for all users section
- *
- * @param string $user User name
- * @param string $host Host name
- *
- * @return string containing all the grants text
- */
-function PMA_getGrants($user, $host)
-{
-    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($user) . "'@'" . PMA_sqlAddSlashes($host) . "'");
-    $response = '';
-    foreach ($grants as $one_grant) {
-        $response .= $one_grant . ";\n\n";
-    }
-    return $response;
-} // end of the 'PMA_getGrants()' function
-
-
-
 ?>

From d37b4a4255bd7f862ff8ee270559b289869bc706 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Thu, 28 Jun 2012 05:32:40 +0530
Subject: [PATCH 007/102] remove new line

---
 libraries/server_privileges.lib.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 3a58f13642..4000df9151 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -92,9 +92,8 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false)
                 = in_array($current_grant, $users_grants) ? 'Y' : 'N';
         }
         unset($current_grant);
-        unset($av_grants);
-        unset($users_grants);
     }
+    
     $privs = array();
     $allPrivileges = true;
     foreach ($grants as $current_grant) {
@@ -221,8 +220,7 @@ function PMA_getGrantsArray()
             'Super_priv',
             'SUPER',
             __('Allows connecting, even if maximum number of connections is reached;
-                required for most administrative operations like setting global 
-                variables or killing threads of other users.')),
+                required for most administrative operations like setting global variables or killing threads of other users.')),
         array(
             'Create_tmp_table_priv',
             'CREATE TEMPORARY TABLES',

From 58908f962bd89f0e6620eb8d0683fc16f91ae958 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 00:38:49 +0530
Subject: [PATCH 008/102] function implementations for table specific
 privileges

---
 libraries/server_privileges.lib.php | 247 ++++++++++++++++------------
 1 file changed, 146 insertions(+), 101 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 4000df9151..2997a93eac 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -333,13 +333,13 @@ function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
  * 
  * @param string $db      the database
  * @param string $table   the table
+ * @param string $username   username for database connection
+ * @param string $hostname   hostname for database connection
  * 
  * @return string sql query
  */
-function PMA_getSqlQueryForDisplayPrivTable($db, $table)
+function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
 {
-    $username = $GLOBALS['username'];
-    $hostname = $GLOBALS['hostname'];
     if ($db == '*') {
         return "SELECT * FROM `mysql`.`user`"
             ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
@@ -379,7 +379,9 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
     }
 
     if (isset($GLOBALS['username'])) {
-        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table);
+        $username = $GLOBALS['username'];
+        $hostname = $GLOBALS['hostname'];
+        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname);
         $row = PMA_DBI_fetch_single_row($sql_query);
     }
     if (empty($row)) {
@@ -451,103 +453,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
     }
     // t a b l e - s p e c i f i c    p r i v i l e g e s
     if (! empty($columns)) {
-        $res = PMA_DBI_query(
-            'SELECT `Column_name`, `Column_priv`'
-            .' FROM `mysql`.`columns_priv`'
-            .' WHERE `User`'
-            .' = \'' . PMA_sqlAddSlashes($username) . "'"
-            .' AND `Host`'
-            .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
-            .' AND `Db`'
-            .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
-            .' AND `Table_name`'
-            .' = \'' . PMA_sqlAddSlashes($table) . '\';'
-        );
-
-        while ($row1 = PMA_DBI_fetch_row($res)) {
-            $row1[1] = explode(',', $row1[1]);
-            foreach ($row1[1] as $current) {
-                $columns[$row1[0]][$current] = true;
-            }
-        }
-        PMA_DBI_free_result($res);
-        unset($res, $row1, $current);
-
-        $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
-           . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
-           . '<fieldset id="fieldset_user_priv">' . "\n"
-           . '    <legend>' . __('Table-specific privileges')
-           . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
-           . '</legend>' . "\n";
-
-        // privs that are attached to a specific column
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Select_priv', 'SELECT',
-            'select', __('Allows reading data.'), 'Select'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Insert_priv', 'INSERT',
-            'insert', __('Allows inserting and replacing data.'), 'Insert'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'Update_priv', 'UPDATE',
-            'update', __('Allows changing data.'), 'Update'
-        );
-
-        $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
-            $columns, $row, 'References_priv', 'REFERENCES', 'references',
-            __('Has no effect in this MySQL version.'), 'References'
-        );
-
-        // privs that are not attached to a specific column
-
-        $html_output .= '<div class="item">' . "\n";
-        foreach ($row as $current_grant => $current_grant_value) {
-            $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
-            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
-                continue;
-            }
-            // make a substitution to match the messages variables;
-            // also we must substitute the grant we get, because we can't generate
-            // a form variable containing blanks (those would get changed to
-            // an underscore when receiving the POST)
-            if ($current_grant == 'Create View_priv') {
-                $tmp_current_grant = 'CreateView_priv';
-                $current_grant = 'Create_view_priv';
-            } elseif ($current_grant == 'Show view_priv') {
-                $tmp_current_grant = 'ShowView_priv';
-                $current_grant = 'Show_view_priv';
-            } else {
-                $tmp_current_grant = $current_grant;
-            }
-
-            $html_output .= '<div class="item">' . "\n"
-               . '<input type="checkbox"'
-               . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-               . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
-               . '" value="Y" '
-               . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
-               . 'title="';
-
-            $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
-
-            $html_output .= '<label for="checkbox_' . $current_grant
-                . '"><code><dfn title="'
-                . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                    ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                    : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-                . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
-                . '</div>' . "\n";
-        } // end foreach ()
-
-        $html_output .= '</div>' . "\n";
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
-
+        $html_output .= PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns);
     } else {
 
         // g l o b a l    o r    d b - s p e c i f i c
@@ -702,6 +608,145 @@ function PMA_getHtmlForDisplayResourceLimits($row)
        . '</fieldset>' . "\n";
 }
 
+/**
+ * Get the HTML snippet for table specific privileges
+ * 
+ * @param string $username  username for database connection
+ * @param string $hostname  hostname for database connection
+ * @param string $db        the database
+ * @param string $table     the table
+ * @param boolean $columns  columns array
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns)
+{
+    $res = PMA_DBI_query(
+        'SELECT `Column_name`, `Column_priv`'
+        .' FROM `mysql`.`columns_priv`'
+        .' WHERE `User`'
+        .' = \'' . PMA_sqlAddSlashes($username) . "'"
+        .' AND `Host`'
+        .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
+        .' AND `Db`'
+        .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
+        .' AND `Table_name`'
+        .' = \'' . PMA_sqlAddSlashes($table) . '\';'
+    );
+
+    while ($row1 = PMA_DBI_fetch_row($res)) {
+        $row1[1] = explode(',', $row1[1]);
+        foreach ($row1[1] as $current) {
+            $columns[$row1[0]][$current] = true;
+        }
+    }
+    PMA_DBI_free_result($res);
+    unset($res, $row1, $current);
+
+    $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
+       . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
+       . '<fieldset id="fieldset_user_priv">' . "\n"
+       . '    <legend>' . __('Table-specific privileges')
+       . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
+       . '</legend>' . "\n";
+
+    // privs that are attached to a specific column
+    $html_output .= PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row);
+    
+    // privs that are not attached to a specific column   
+    $html_output .= '<div class="item">' . "\n"
+        . PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_type)
+        . '</div>' . "\n";
+    
+    // for Safari 2.0.2
+    $html_output .= '<div class="clearfloat"></div>' . "\n";
+    
+    return $html_output;
+}
+
+/**
+ * Get HTML snippet for privileges that are attached to a specific column
+ * 
+ * @param string $columns   columns array
+ * @param array $row        first row from result or boolean false
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row)
+{
+    $html_output = PMA_getHtmlForDisplayColumnPrivileges(
+        $columns, $row, 'Select_priv', 'SELECT',
+        'select', __('Allows reading data.'), 'Select'
+    );
+
+    $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+        $columns, $row, 'Insert_priv', 'INSERT',
+        'insert', __('Allows inserting and replacing data.'), 'Insert'
+    );
+
+    $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+        $columns, $row, 'Update_priv', 'UPDATE',
+        'update', __('Allows changing data.'), 'Update'
+    );
+
+    $html_output .= PMA_getHtmlForDisplayColumnPrivileges(
+        $columns, $row, 'References_priv', 'REFERENCES', 'references',
+        __('Has no effect in this MySQL version.'), 'References'
+    );
+    return $html_output;
+}
+
+/** 
+ * Get HTML for privileges that are not attached to a specific column
+ * 
+ * @param array $row         first row from result or boolean false
+ * @param array $grant_type  privilrge type
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_type)
+{
+    foreach ($row as $current_grant => $current_grant_value) {
+        $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
+        if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {
+            continue;
+        }
+        // make a substitution to match the messages variables;
+        // also we must substitute the grant we get, because we can't generate
+        // a form variable containing blanks (those would get changed to
+        // an underscore when receiving the POST)
+        if ($current_grant == 'Create View_priv') {
+            $tmp_current_grant = 'CreateView_priv';
+            $current_grant = 'Create_view_priv';
+        } elseif ($current_grant == 'Show view_priv') {
+            $tmp_current_grant = 'ShowView_priv';
+            $current_grant = 'Show_view_priv';
+        } else {
+            $tmp_current_grant = $current_grant;
+        }
+
+        $html_output .= '<div class="item">' . "\n"
+           . '<input type="checkbox"'
+           . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+           . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
+           . '" value="Y" '
+           . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
+           . 'title="';
+
+        $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+            ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+            : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
+
+        $html_output .= '<label for="checkbox_' . $current_grant
+            . '"><code><dfn title="'
+            . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
+                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
+                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
+            . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
+            . '</div>' . "\n";
+    } // end foreach ()
+    return $html_output;
+}
 /**
  * Displays the fields used by the "new user" form as well as the
  * "change login information / copy user" form.

From 5a6c11259bde32114dfe1cc3aac6189432fcf2b5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 00:42:46 +0530
Subject: [PATCH 009/102] removing new line

---
 libraries/server_privileges.lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 2997a93eac..82e6d2e077 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -219,8 +219,7 @@ function PMA_getGrantsArray()
         array(
             'Super_priv',
             'SUPER',
-            __('Allows connecting, even if maximum number of connections is reached;
-                required for most administrative operations like setting global variables or killing threads of other users.')),
+            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
         array(
             'Create_tmp_table_priv',
             'CREATE TEMPORARY TABLES',

From adec50eb2487473a26004d53cb33817076072c6b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 10:50:02 +0530
Subject: [PATCH 010/102] functions for global specific privs

---
 libraries/server_privileges.lib.php | 284 ++++++++++++++++++----------
 1 file changed, 181 insertions(+), 103 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 82e6d2e077..b5028a4b7c 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -454,110 +454,8 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
     if (! empty($columns)) {
         $html_output .= PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns);
     } else {
-
         // g l o b a l    o r    d b - s p e c i f i c
-        //
-        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
-
-        // d a t a
-        $privTable[0] = array(
-            array('Select', 'SELECT', __('Allows reading data.')),
-            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
-            array('Update', 'UPDATE', __('Allows changing data.')),
-            array('Delete', 'DELETE', __('Allows deleting data.'))
-        );
-        if ($db == '*') {
-            $privTable[0][] = array('File', 'FILE', __('Allows importing data from and exporting data into files.'));
-        }
-
-        // s t r u c t u r e
-        $privTable[1] = array(
-            array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
-            array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
-            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-            array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
-            array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
-            array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
-            array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
-            array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
-            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
-        );
-        // this one is for a db-specific priv: Create_view_priv
-        if (isset($row['Create_view_priv'])) {
-            $privTable[1][] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        // this one is for a table-specific priv: Create View_priv
-        if (isset($row['Create View_priv'])) {
-            $privTable[1][] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
-        }
-        if (isset($row['Event_priv'])) {
-            // MySQL 5.1.6
-            $privTable[1][] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
-            $privTable[1][] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
-        }
-
-        // a d m i n i s t r a t i o n
-        $privTable[2] = array(
-            array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
-        );
-        if ($db == '*') {
-            $privTable[2][] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
-            $privTable[2][] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
-            $privTable[2][] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
-            $privTable[2][] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
-            $privTable[2][] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
-        }
-        $privTable[2][] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
-        $privTable[2][] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
-        if ($db == '*') {
-            $privTable[2][] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
-            $privTable[2][] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
-            $privTable[2][] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
-        }
-        $html_output .= '<input type="hidden" name="grant_count" value="'
-            . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
-            . '" />' . "\n"
-            . '<fieldset id="fieldset_user_global_rights">' . "\n"
-            . '<legend>' . "\n"
-            . '        '
-            . ($db == '*'
-                ? __('Global privileges')
-                : ($table == '*'
-                    ? __('Database-specific privileges')
-                    : __('Table-specific privileges'))) . "\n"
-            . '(<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
-            . __('Check All') . '</a> /' . "\n"
-            . '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
-            . __('Uncheck All') . '</a>)' . "\n"
-            . '</legend>' . "\n"
-            . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
-
-        // Output the Global privilege tables with checkboxes
-        foreach ($privTable as $i => $table) {
-            $html_output .= '<fieldset>' . "\n"
-                . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
-            foreach ($table as $priv) {
-                $html_output .= '<div class="item">' . "\n"
-                    . '<input type="checkbox"'
-                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
-                    . ' value="Y" title="' . $priv[2] . '"'
-                    . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
-                    . '/>' . "\n"
-                    . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
-                    . $priv[1] . '</dfn></code></label>' . "\n"
-                    . '</div>' . "\n";
-            }
-            $html_output .= '</fieldset>' . "\n";
-        }
-
-        // The "Resource limits" box is not displayed for db-specific privs
-        if ($db == '*') {
-            $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
-        }
-        // for Safari 2.0.2
-        $html_output .= '<div class="clearfloat"></div>' . "\n";
+        $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n);
     }
     $html_output .= '</fieldset>' . "\n";
     if ($submit) {
@@ -746,6 +644,186 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_t
     } // end foreach ()
     return $html_output;
 }
+
+/**
+ * Get HTML for global or database specific privileges
+ * 
+ * @param string $db        the database
+ * @param string $table     the table
+ * @param string $row       first row from result or boolean false
+ * @param string $random_n  a random number that will be appended
+ *                          to the id of the user forms
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n)
+{
+    $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
+    $privTable = array();
+    // d a t a
+    $privTable[0] = PMA_getDataPrivilegeTable($db);
+
+    // s t r u c t u r e
+    $privTable[1] = PMA_getStructurePrivilegeTable($table, $row);
+
+    // a d m i n i s t r a t i o n
+    $privTable[2] = PMA_getAdministrationPrivilegeTable($db);
+    
+    $html_output = '<input type="hidden" name="grant_count" value="'
+        . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
+        . '" />' . "\n"
+        . '<fieldset id="fieldset_user_global_rights">' . "\n"
+        . '<legend>' . "\n"
+        . '        '
+        . ($db == '*'
+            ? __('Global privileges')
+            : ($table == '*'
+                ? __('Database-specific privileges')
+                : __('Table-specific privileges'))) . "\n"
+        . '(<a href="server_privileges.php?'
+        . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
+        . __('Check All') . '</a> /' . "\n"
+        . '<a href="server_privileges.php?'
+        . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
+        . __('Uncheck All') . '</a>)' . "\n"
+        . '</legend>' . "\n"
+        . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
+
+    // Output the Global privilege tables with checkboxes
+    $html_output .= PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_names, $row);
+
+    // The "Resource limits" box is not displayed for db-specific privs
+    if ($db == '*') {
+        $html_output .= PMA_getHtmlForDisplayResourceLimits($row);
+    }
+    // for Safari 2.0.2
+    $html_output .= '<div class="clearfloat"></div>' . "\n";
+    
+    return $html_output;
+}
+
+/**
+ * Get data privilege table as an array
+ * 
+ * @param string $db    the database
+ * 
+ * @return string       data privilege table
+ */
+function PMA_getDataPrivilegeTable($db)
+{
+    $data_privTable = array(
+        array('Select', 'SELECT', __('Allows reading data.')),
+        array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
+        array('Update', 'UPDATE', __('Allows changing data.')),
+        array('Delete', 'DELETE', __('Allows deleting data.'))
+    );
+    if ($db == '*') {
+        $data_privTable[]
+            = array('File',
+                'FILE',
+                __('Allows importing data from and exporting data into files.')
+            );
+    }
+    return $data_privTable;
+}
+
+/**
+ * Get structure privilege table as an array
+ * 
+ * @param string $table the table
+ * @param array $row    first row from result or boolean false
+ * 
+ * @return string       structure privilege table
+ */
+function PMA_getStructurePrivilegeTable($table, $row)
+{
+    $structure_privTable = array(
+        array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
+        array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
+        array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
+        array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
+        array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
+        array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
+        array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
+        array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
+        array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
+    );
+    // this one is for a db-specific priv: Create_view_priv
+    if (isset($row['Create_view_priv'])) {
+        $structure_privTable[] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
+    }
+    // this one is for a table-specific priv: Create View_priv
+    if (isset($row['Create View_priv'])) {
+        $structure_privTable[] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
+    }
+    if (isset($row['Event_priv'])) {
+        // MySQL 5.1.6
+        $structure_privTable[] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
+        $structure_privTable[] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
+    }
+    return $structure_privTable;
+}
+
+/**
+ * Get administration privilege table as an array
+ * 
+ * @param string $db    the table
+ * 
+ * @return string       administration privilege table
+ */
+function PMA_getAdministrationPrivilegeTable($db)
+{
+    $administration_privTable = array(
+        array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
+    );
+    if ($db == '*') {
+        $administration_privTable[] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
+        $administration_privTable[] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
+        $administration_privTable[] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
+        $administration_privTable[] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
+        $administration_privTable[] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
+    }
+    $administration_privTable[] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
+    $administration_privTable[] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
+    if ($db == '*') {
+        $administration_privTable[] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
+        $administration_privTable[] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
+        $administration_privTable[] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
+    }
+    return $administration_privTable;
+}
+
+/**
+ * Get HTML snippet for global privileges table with check boxes
+ * 
+ * @param array $privTable          privileges table array
+ * @param array $privTable_names    names of the privilege tables (Data, Structure, Administration)
+ * @param array $row                first row from result or boolean false
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_names, $row)
+{
+    $html_output = '';
+    foreach ($privTable as $i => $table) {
+        $html_output .= '<fieldset>' . "\n"
+            . '<legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
+        foreach ($table as $priv) {
+            $html_output .= '<div class="item">' . "\n"
+                . '<input type="checkbox"'
+                . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                . ' value="Y" title="' . $priv[2] . '"'
+                . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                . '/>' . "\n"
+                . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                . $priv[1] . '</dfn></code></label>' . "\n"
+                . '</div>' . "\n";
+        }
+        $html_output .= '</fieldset>' . "\n";
+    }
+    return $html_output;
+}
+
 /**
  * Displays the fields used by the "new user" form as well as the
  * "change login information / copy user" form.

From 21dc59ed28370c96a2dfef21787336c63d85062c Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 10:52:38 +0530
Subject: [PATCH 011/102] correct wrong variable define

---
 libraries/server_privileges.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index b5028a4b7c..ad7c5eafc0 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -540,7 +540,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
     PMA_DBI_free_result($res);
     unset($res, $row1, $current);
 
-    $html_output .= '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
+    $html_output = '<input type="hidden" name="grant_count" value="' . count($row) . '" />' . "\n"
        . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
        . '<fieldset id="fieldset_user_priv">' . "\n"
        . '    <legend>' . __('Table-specific privileges')
@@ -603,6 +603,7 @@ function PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row)
  */
 function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_type)
 {
+    $html_output = '';
     foreach ($row as $current_grant => $current_grant_value) {
         $grant_type = substr($current_grant, 0, (strlen($current_grant) - 5));
         if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))) {

From e953deca3c50ee424d7597ce890a8a2641c05ed8 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 14:05:32 +0530
Subject: [PATCH 012/102] rplace use of PMA_showMessage with PMA_getMessage in
 insert_edit-lib and tbl_change

---
 libraries/insert_edit.lib.php | 2 +-
 tbl_change.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index c6d94b441e..823ff37251 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -140,7 +140,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
     // No row returned
     if (! $rows[$key_id]) {
         unset($rows[$key_id], $where_clause_array[$key_id]);
-        PMA_showMessage(
+        echo PMA_getMessage(
             __('MySQL returned an empty result set (i.e. zero rows).'),
             $local_query
         );
diff --git a/tbl_change.php b/tbl_change.php
index cbea2058cb..a33b438601 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -126,7 +126,7 @@ if (! empty($disp_message)) {
     if (! isset($disp_query)) {
         $disp_query     = null;
     }
-    PMA_showMessage($disp_message, $disp_query);
+    echo PMA_getMessage($disp_message, $disp_query);
 }
 
 /**

From 121333d51fbc17e5926d286e1963120670b8a893 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 18:54:13 +0530
Subject: [PATCH 013/102] implement PMA_getUsernameAndHostnameLength() in
 server_privilegs-lib

---
 libraries/server_privileges.lib.php | 48 +++++++++++++++++------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ad7c5eafc0..c066e28cef 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -839,26 +839,7 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_name
  */
 function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
 {
-    // Get user/host name lengths
-    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
-    $username_length = 16;
-    $hostname_length = 41;
-    foreach ($fields_info as $val) {
-        if ($val['Field'] == 'User') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $username_length = $v;
-            }
-        } elseif ($val['Field'] == 'Host') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $hostname_length = $v;
-            }
-        }
-    }
-    unset($fields_info);
+    list($username_length, $hostname_length) = PMA_getUsernameAndHostnameLength();
 
     if (isset($GLOBALS['username']) && strlen($GLOBALS['username']) === 0) {
         $GLOBALS['pred_username'] = 'any';
@@ -985,6 +966,33 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
     return $html_output;
 } // end of the 'PMA_displayUserAndHostFields()' function
 
+/**
+ * Get username and hostname length
+ * 
+ * @return array username length and hostname length 
+ */
+function PMA_getUsernameAndHostnameLength()
+{
+    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
+    $username_length = 16;
+    $hostname_length = 41;
+    foreach ($fields_info as $val) {
+        if ($val['Field'] == 'User') {
+            strtok($val['Type'], '()');
+            $value = strtok('()');
+            if (is_int($value)) {
+                $username_length = $value;
+            }
+        } elseif ($val['Field'] == 'Host') {
+            strtok($val['Type'], '()');
+            $value = strtok('()');
+            if (is_int($value)) {
+                $hostname_length = $value;
+            }
+        }
+    }
+    return array($username_length, $hostname_length);
+}
 
 /**
  * Returns all the grants for a certain user on a certain host

From 9ca636fe21cf6fc63f359715447b654be1395ae0 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 30 Jun 2012 23:00:30 +0530
Subject: [PATCH 014/102] modify a doc comment

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c066e28cef..90e814756d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -835,7 +835,7 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_name
  * @global  array      $cfg     the phpMyAdmin configuration
  * @global  ressource  $user_link the database connection
  *
- * @return void
+ * @return string $html_output  a HTML snippet
  */
 function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
 {

From e4631d837e5251fb39c33f24e4de5df5b5e7cba2 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 1 Jul 2012 13:56:53 +0530
Subject: [PATCH 015/102] function for update password in privileges

---
 libraries/server_privileges.lib.php | 46 +++++++++++++++++++++++++++++
 server_privileges.php               | 31 ++-----------------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 90e814756d..cdd151d3a3 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1013,4 +1013,50 @@ function PMA_getGrants($user, $host)
     return $response;
 } // end of the 'PMA_getGrants()' function
 
+/**
+ * Update password and get message for password updating
+ * 
+ * @param string $pma_pw    password that user entered for change, comming from request
+ * @param string $pma_pw2   Re typed password, comming from request
+ * @param string $err_url   error url
+ * @param string $username  username
+ * @param string $hostname  hostname
+ * 
+ * @return string $message  success or error message after updating password
+ */
+function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username, $hostname)
+{
+    // similar logic in user_password.php
+    $message = '';
+
+    if (empty($_REQUEST['nopass']) && isset($pma_pw) && isset($pma_pw2)) {
+        if ($pma_pw != $pma_pw2) {
+            $message = PMA_Message::error(__('The passwords aren\'t the same!'));
+        } elseif (empty($pma_pw) || empty($pma_pw2)) {
+            $message = PMA_Message::error(__('The password is empty!'));
+        }
+    }
+
+    // here $nopass could be == 1
+    if (empty($message)) {
+
+        $hashing_function = (! empty($_REQUEST['pw_hash']) && $_REQUEST['pw_hash'] == 'old' ? 'OLD_' : '')
+                      . 'PASSWORD';
+
+        // in $sql_query which will be displayed, hide the password
+        $sql_query        = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) 
+            . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' 
+            . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
+        $local_query      = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username)
+            . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = '
+            . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddSlashes($pma_pw) . '\')');
+        
+        PMA_DBI_try_query($local_query)
+            or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
+        $message = PMA_Message::success(__('The password for %s was changed successfully.'));
+        $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
+    }
+    return $message;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index e84de0533b..4534c736cc 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -140,7 +140,6 @@ $strPrivDescUsage = __('No privileges.');
  */
 if (PMA_isValid($_REQUEST['pred_tablename'])) {
     $tablename = $_REQUEST['pred_tablename'];
-    unset($pred_tablename);
 } elseif (PMA_isValid($_REQUEST['tablename'])) {
     $tablename = $_REQUEST['tablename'];
 } else {
@@ -586,39 +585,15 @@ if (isset($_REQUEST['revokeall'])) {
     }
 }
 
-
 /**
  * Updates the password
  */
 if (isset($_REQUEST['change_pw'])) {
-    // similar logic in user_password.php
-    $message = '';
-
-    if (empty($_REQUEST['nopass']) && isset($pma_pw) && isset($pma_pw2)) {
-        if ($pma_pw != $pma_pw2) {
-            $message = PMA_Message::error(__('The passwords aren\'t the same!'));
-        } elseif (empty($pma_pw) || empty($pma_pw2)) {
-            $message = PMA_Message::error(__('The password is empty!'));
-        }
-    } // end if
-
-    // here $nopass could be == 1
-    if (empty($message)) {
-
-        $hashing_function = (! empty($pw_hash) && $pw_hash == 'old' ? 'OLD_' : '')
-                      . 'PASSWORD';
-
-        // in $sql_query which will be displayed, hide the password
-        $sql_query        = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
-        $local_query      = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddSlashes($pma_pw) . '\')');
-        PMA_DBI_try_query($local_query)
-            or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
-        $message = PMA_Message::success(__('The password for %s was changed successfully.'));
-        $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
-    }
+    $message = PMA_getMessageForUpdatePassword(
+        $pma_pw, $pma_pw2, $err_url, $username, $hostname
+    );
 }
 
-
 /**
  * Deletes users
  *   (Changes / copies a user, part IV)

From 8f2af471a46311208d5bdfca852592a7694fd679 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 1 Jul 2012 15:18:20 +0530
Subject: [PATCH 016/102] a function for privileges revoke

---
 libraries/server_privileges.lib.php | 34 +++++++++++++++++++++++++++++
 server_privileges.php               | 25 ++++-----------------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index cdd151d3a3..ac54c66d22 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1059,4 +1059,38 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
     return $message;
 }
 
+/**
+ * Revokes privileges and get message and SQL query for privileges revokes
+ * 
+ * @param string $db_and_table  wildcard Escaped database+table specification
+ * @param string $dbname        database name
+ * @param string $tablename     table name
+ * @param string $sql_query0    sql query
+ * @param string $sql_query1    sql query
+ * @param string $username      username
+ * @param string $hostname      hostname
+ * @return array ($message, $sql_query)
+ */
+function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
+    $tablename, $sql_query0, $sql_query1, $username, $hostname
+) {
+    $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
+
+    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
+        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
+    $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
+        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
+
+    PMA_DBI_query($sql_query0);
+    if (! PMA_DBI_try_query($sql_query1)) {
+        // this one may fail, too...
+        $sql_query1 = '';
+    }
+    $sql_query = $sql_query0 . ' ' . $sql_query1;
+    $message = PMA_Message::success(__('You have revoked the privileges for %s'));
+    $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
+    
+    return array($message, $sql_query);
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 4534c736cc..921c41c6e5 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -563,26 +563,10 @@ if (! empty($update_privs)) {
  * Revokes Privileges
  */
 if (isset($_REQUEST['revokeall'])) {
-    $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
-
-    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
-        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
-    $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
-        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
-
-    PMA_DBI_query($sql_query0);
-    if (! PMA_DBI_try_query($sql_query1)) {
-        // this one may fail, too...
-        $sql_query1 = '';
-    }
-    $sql_query = $sql_query0 . ' ' . $sql_query1;
-    $message = PMA_Message::success(__('You have revoked the privileges for %s'));
-    $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
-    if (! isset($tablename)) {
-        unset($dbname);
-    } else {
-        unset($tablename);
-    }
+    list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
+        $db_and_table, $dbname, $tablename, $sql_query0, $sql_query1, $username,
+        $hostname
+    );
 }
 
 /**
@@ -650,7 +634,6 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
     }
 }
 
-
 /**
  * Changes / copies a user, part V
  */

From c09e857763c6ab995862bdc211b76e7b816adfb5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 1 Jul 2012 17:09:23 +0530
Subject: [PATCH 017/102] remove duplicate code snippet from server_privileges
 script

---
 libraries/server_privileges.lib.php | 37 +++++++++++++++++
 server_privileges.php               | 64 +++++------------------------
 2 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ac54c66d22..85aea4ad16 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1093,4 +1093,41 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     return array($message, $sql_query);
 }
 
+/**'
+ * Get a common SQL query for 'update privileges' and 'add user'
+ * 
+ * @param type $Grant_priv              grant privileges
+ * @param type $max_questions           maximum questions
+ * @param type $max_connections         maximum connections
+ * @param type $max_updates             maximum updates
+ * @param type $max_user_connections    maximum userconnections
+ * 
+ * @return string $sql_query
+ */
+function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($Grant_priv, $max_questions, $max_connections,
+    $max_updates, $max_user_connections
+) {
+    $sql_query = 'WITH';
+    if (isset($Grant_priv) && $Grant_priv == 'Y') {
+        $sql_query .= ' GRANT OPTION';
+    }
+    if (isset($Grant_priv)) {
+        $max_questions = max(0, (int)$max_questions);
+        $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
+    }
+    if (isset($max_connections)) {
+        $max_connections = max(0, (int)$max_connections);
+        $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
+    }
+    if (isset($max_updates)) {
+        $max_updates = max(0, (int)$max_updates);
+        $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
+    }
+    if (isset($max_user_connections)) {
+        $max_user_connections = max(0, (int)$max_user_connections);
+        $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
+    }
+    return $sql_query;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 921c41c6e5..04779c5f6b 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -216,7 +216,6 @@ if (isset($_REQUEST['change_copy'])) {
     }
 }
 
-
 /**
  * Adds a user
  *   (Changes / copies a user, part II)
@@ -275,40 +274,16 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 $create_user_show = $create_user_real;
             }
         }
-        /**
-         * @todo similar code appears twice in this script
-         */
+
         if ((isset($Grant_priv) && $Grant_priv == 'Y')
             || (isset($max_questions) || isset($max_connections)
             || isset($max_updates) || isset($max_user_connections))
         ) {
-            $real_sql_query .= ' WITH';
-            $sql_query .= ' WITH';
-            if (isset($Grant_priv) && $Grant_priv == 'Y') {
-                $real_sql_query .= ' GRANT OPTION';
-                $sql_query .= ' GRANT OPTION';
-            }
-            if (isset($max_questions)) {
-                // avoid negative values
-                $max_questions = max(0, (int)$max_questions);
-                $real_sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-                $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-            }
-            if (isset($max_connections)) {
-                $max_connections = max(0, (int)$max_connections);
-                $real_sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-                $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-            }
-            if (isset($max_updates)) {
-                $max_updates = max(0, (int)$max_updates);
-                $real_sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-                $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-            }
-            if (isset($max_user_connections)) {
-                $max_user_connections = max(0, (int)$max_user_connections);
-                $real_sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-                $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-            }
+            $real_sql_query .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs(
+                $Grant_priv, $max_questions, $max_connections,$max_updates, 
+                $max_user_connections
+            );
+            $sql_query .= $real_sql_query;
         }
         if (isset($create_user_real)) {
             $create_user_real .= ';';
@@ -508,34 +483,15 @@ if (! empty($update_privs)) {
             . ' ON ' . $db_and_table
             . ' TO \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\'';
 
-        /**
-         * @todo similar code appears twice in this script
-         */
         if ((isset($Grant_priv) && $Grant_priv == 'Y')
             || (! isset($dbname)
             && (isset($max_questions) || isset($max_connections)
             || isset($max_updates) || isset($max_user_connections)))
         ) {
-            $sql_query2 .= 'WITH';
-            if (isset($Grant_priv) && $Grant_priv == 'Y') {
-                $sql_query2 .= ' GRANT OPTION';
-            }
-            if (isset($max_questions)) {
-                $max_questions = max(0, (int)$max_questions);
-                $sql_query2 .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-            }
-            if (isset($max_connections)) {
-                $max_connections = max(0, (int)$max_connections);
-                $sql_query2 .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-            }
-            if (isset($max_updates)) {
-                $max_updates = max(0, (int)$max_updates);
-                $sql_query2 .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-            }
-            if (isset($max_user_connections)) {
-                $max_user_connections = max(0, (int)$max_user_connections);
-                $sql_query2 .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-            }
+            $sql_query2 .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs(
+                $Grant_priv, $max_questions, $max_connections, $max_updates,
+                $max_user_connections
+            );
         }
         $sql_query2 .= ';';
     }

From d96b0aa7242cf58e15d35f019e6723e59dcf3b74 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 1 Jul 2012 19:08:14 +0530
Subject: [PATCH 018/102] remove unwanted function parameters

---
 libraries/server_privileges.lib.php | 6 ++----
 server_privileges.php               | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 85aea4ad16..86f598699d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1065,14 +1065,12 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
  * @param string $db_and_table  wildcard Escaped database+table specification
  * @param string $dbname        database name
  * @param string $tablename     table name
- * @param string $sql_query0    sql query
- * @param string $sql_query1    sql query
  * @param string $username      username
- * @param string $hostname      hostname
+ * @param string $hostname      host name
  * @return array ($message, $sql_query)
  */
 function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
-    $tablename, $sql_query0, $sql_query1, $username, $hostname
+    $tablename, $username, $hostname
 ) {
     $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
 
diff --git a/server_privileges.php b/server_privileges.php
index 04779c5f6b..e999df2de4 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -520,8 +520,7 @@ if (! empty($update_privs)) {
  */
 if (isset($_REQUEST['revokeall'])) {
     list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-        $db_and_table, $dbname, $tablename, $sql_query0, $sql_query1, $username,
-        $hostname
+        $db_and_table, $dbname, $tablename, $username, $hostname
     );
 }
 

From 39cb681f265246296a5fbb02bee70e707b98e5b4 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 1 Jul 2012 23:58:05 +0530
Subject: [PATCH 019/102] modify
 PMA_getCommonSQlQueryForAddUserAndUpdatePrivs() function

---
 libraries/server_privileges.lib.php | 36 +++++++++++++----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 86f598699d..d183708f57 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1091,7 +1091,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     return array($message, $sql_query);
 }
 
-/**'
+/**
  * Get a common SQL query for 'update privileges' and 'add user'
  * 
  * @param type $Grant_priv              grant privileges
@@ -1102,29 +1102,25 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  * 
  * @return string $sql_query
  */
-function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($Grant_priv, $max_questions, $max_connections,
-    $max_updates, $max_user_connections
+function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($Grant_priv, $max_questions,
+    $max_connections, $max_updates, $max_user_connections
 ) {
     $sql_query = 'WITH';
-    if (isset($Grant_priv) && $Grant_priv == 'Y') {
+    if ($Grant_priv == 'Y') {
         $sql_query .= ' GRANT OPTION';
     }
-    if (isset($Grant_priv)) {
-        $max_questions = max(0, (int)$max_questions);
-        $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-    }
-    if (isset($max_connections)) {
-        $max_connections = max(0, (int)$max_connections);
-        $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-    }
-    if (isset($max_updates)) {
-        $max_updates = max(0, (int)$max_updates);
-        $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-    }
-    if (isset($max_user_connections)) {
-        $max_user_connections = max(0, (int)$max_user_connections);
-        $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-    }
+    $max_questions = max(0, (int)$max_questions);
+    $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
+
+    $max_connections = max(0, (int)$max_connections);
+    $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
+
+    $max_updates = max(0, (int)$max_updates);
+    $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
+
+    $max_user_connections = max(0, (int)$max_user_connections);
+    $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
+
     return $sql_query;
 }
 

From ac4a01ca790648b475ba60a2ad803aba6ceae641 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 09:50:56 +0530
Subject: [PATCH 020/102] correct wrong common function calls in
 sever_privileges-lib

---
 libraries/server_privileges.lib.php | 77 +++++++++++++++++------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d183708f57..6860e49cd9 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -31,10 +31,10 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename)
     } else {
         if (strlen($tablename)) {
             $db_and_table
-                = PMA_backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
-                . PMA_backquote($tablename);
+                = PMA_CommonFunctions::getInstance()->backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
+                . PMA_CommonFunctions::getInstance()->backquote($tablename);
         } else {
-            $db_and_table = PMA_backquote($dbname) . '.*';
+            $db_and_table = PMA_CommonFunctions::getInstance()->backquote($dbname) . '.*';
         }
     }
     return $db_and_table;
@@ -53,9 +53,9 @@ function PMA_rangeOfUsers($initial = '')
     // might be BINARY, so LIKE would be case sensitive
     if (! empty($initial)) {
         $ret = " WHERE `User` LIKE '"
-            . PMA_sqlAddSlashes($initial, true) . "%'"
+            . PMA_CommonFunctions::getInstance()->sqlAddSlashes($initial, true) . "%'"
             . " OR `User` LIKE '"
-            . PMA_sqlAddSlashes(strtolower($initial), true) . "%'";
+            . PMA_CommonFunctions::getInstance()->sqlAddSlashes(strtolower($initial), true) . "%'";
     } else {
         $ret = '';
     }
@@ -339,23 +339,24 @@ function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
  */
 function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
 {
+    $common_functions = PMA_CommonFunctions::getInstance();
     if ($db == '*') {
         return "SELECT * FROM `mysql`.`user`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';";
+            ." WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";
     } elseif ($table == '*') {
         return "SELECT * FROM `mysql`.`db`"
-            ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-            ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-            ." AND '" . PMA_unescapeMysqlWildcards($db) . "'"
+            ." WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
+            ." AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "'"
+            ." AND '" . $common_functions->unescapeMysqlWildcards($db) . "'"
             ." LIKE `Db`;";
     }
     return "SELECT `Table_priv`"
         ." FROM `mysql`.`tables_priv`"
-        ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'"
-        ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'"
-        ." AND `Db` = '" . PMA_unescapeMysqlWildcards($db) . "'"
-        ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';";
+        ." WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
+        ." AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "'"
+        ." AND `Db` = '" . $common_functions->unescapeMysqlWildcards($db) . "'"
+        ." AND `Table_name` = '" . $common_functions->sqlAddSlashes($table) . "';";
 }
 /**
  * Displays the privileges form table
@@ -522,13 +523,13 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
         'SELECT `Column_name`, `Column_priv`'
         .' FROM `mysql`.`columns_priv`'
         .' WHERE `User`'
-        .' = \'' . PMA_sqlAddSlashes($username) . "'"
+        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
         .' AND `Host`'
-        .' = \'' . PMA_sqlAddSlashes($hostname) . "'"
+        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "'"
         .' AND `Db`'
-        .' = \'' . PMA_sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
+        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
         .' AND `Table_name`'
-        .' = \'' . PMA_sqlAddSlashes($table) . '\';'
+        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($table) . '\';'
     );
 
     while ($row1 = PMA_DBI_fetch_row($res)) {
@@ -544,7 +545,9 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
        . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
        . '<fieldset id="fieldset_user_priv">' . "\n"
        . '    <legend>' . __('Table-specific privileges')
-       . PMA_showHint(__('Note: MySQL privilege names are expressed in English'))
+       . PMA_CommonFunctions::getInstance()->showHint(
+               __('Note: MySQL privilege names are expressed in English')
+           )
        . '</legend>' . "\n";
 
     // privs that are attached to a specific column
@@ -932,7 +935,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
         . '" title="' . __('Host')
         . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
-        . PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
+        . PMA_CommonFunctions::getInstance()->showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
         . '</div>' . "\n"
         . '<div class="item">' . "\n"
         . '<label for="select_pred_password">' . "\n"
@@ -1005,7 +1008,9 @@ function PMA_getUsernameAndHostnameLength()
  */
 function PMA_getGrants($user, $host)
 {
-    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($user) . "'@'" . PMA_sqlAddSlashes($host) . "'");
+    $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" 
+        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($user) . "'@'" 
+        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($host) . "'");
     $response = '';
     foreach ($grants as $one_grant) {
         $response .= $one_grant . ";\n\n";
@@ -1028,7 +1033,7 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
 {
     // similar logic in user_password.php
     $message = '';
-
+    
     if (empty($_REQUEST['nopass']) && isset($pma_pw) && isset($pma_pw2)) {
         if ($pma_pw != $pma_pw2) {
             $message = PMA_Message::error(__('The passwords aren\'t the same!'));
@@ -1036,23 +1041,28 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
             $message = PMA_Message::error(__('The password is empty!'));
         }
     }
-
+    
     // here $nopass could be == 1
     if (empty($message)) {
-
+        $common_functions = PMA_CommonFunctions::getInstance();
+        
         $hashing_function = (! empty($_REQUEST['pw_hash']) && $_REQUEST['pw_hash'] == 'old' ? 'OLD_' : '')
                       . 'PASSWORD';
 
         // in $sql_query which will be displayed, hide the password
-        $sql_query        = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) 
-            . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' 
+        $sql_query        = 'SET PASSWORD FOR \'' 
+            . $common_functions->sqlAddSlashes($username) 
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = ' 
             . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
-        $local_query      = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username)
-            . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = '
-            . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddSlashes($pma_pw) . '\')');
+        
+        $local_query      = 'SET PASSWORD FOR \'' 
+            . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = '
+            . (($pma_pw == '') ? '\'\'' : $hashing_function 
+            . '(\'' . $common_functions->sqlAddSlashes($pma_pw) . '\')');
         
         PMA_DBI_try_query($local_query)
-            or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
+            or $common_functions->mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
         $message = PMA_Message::success(__('The password for %s was changed successfully.'));
         $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
     }
@@ -1075,9 +1085,12 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
 
     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
-        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
+        . ' FROM \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
+        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . '\';';
+    
     $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
-        . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';';
+        . ' FROM \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
+        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . '\';';
 
     PMA_DBI_query($sql_query0);
     if (! PMA_DBI_try_query($sql_query1)) {

From 945d38c853f70d526b9da7a618e3188b0ae0a043 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 09:57:26 +0530
Subject: [PATCH 021/102] change a function signature

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 6860e49cd9..a8cc7d45e9 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -295,7 +295,7 @@ function PMA_getGrantsArray()
  *
  * @return $html_output             html snippet
  */
-function PMA_getHtmlToDisplayColumnPrivileges($columns, $row, $name_for_select,
+function PMA_getHtmlForDisplayColumnPrivileges($columns, $row, $name_for_select,
     $priv_for_header, $name, $name_for_dfn, $name_for_current
 ) {
     $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"

From 6eca5e45b8b38ea5cb26edb36bee4211638eeccb Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 10:07:30 +0530
Subject: [PATCH 022/102] remove long code line in
 PMA_getStructurePrivilegeTable() in sever_privileges-lib

---
 libraries/server_privileges.lib.php | 61 +++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index a8cc7d45e9..4198284e67 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -742,28 +742,67 @@ function PMA_getDataPrivilegeTable($db)
 function PMA_getStructurePrivilegeTable($table, $row)
 {
     $structure_privTable = array(
-        array('Create', 'CREATE', ($table == '*' ? __('Allows creating new databases and tables.') : __('Allows creating new tables.'))),
-        array('Alter', 'ALTER', __('Allows altering the structure of existing tables.')),
+        array('Create',
+            'CREATE',
+            ($table == '*'
+                ? __('Allows creating new databases and tables.')
+                : __('Allows creating new tables.')
+            )
+        ),
+        array('Alter',
+            'ALTER',
+            __('Allows altering the structure of existing tables.')
+        ),
         array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-        array('Drop', 'DROP', ($table == '*' ? __('Allows dropping databases and tables.') : __('Allows dropping tables.'))),
-        array('Create_tmp_table', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
-        array('Show_view', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
-        array('Create_routine', 'CREATE ROUTINE', __('Allows creating stored routines.')),
-        array('Alter_routine', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
+        array('Drop',
+            'DROP',
+            ($table == '*' 
+                ? __('Allows dropping databases and tables.')
+                : __('Allows dropping tables.')
+            )
+        ),
+        array('Create_tmp_table',
+            'CREATE TEMPORARY TABLES',
+            __('Allows creating temporary tables.')
+        ),
+        array('Show_view',
+            'SHOW VIEW',
+            __('Allows performing SHOW CREATE VIEW queries.')
+        ),
+        array('Create_routine',
+            'CREATE ROUTINE',
+            __('Allows creating stored routines.')
+        ),
+        array('Alter_routine',
+            'ALTER ROUTINE',
+            __('Allows altering and dropping stored routines.')
+        ),
         array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
     );
     // this one is for a db-specific priv: Create_view_priv
     if (isset($row['Create_view_priv'])) {
-        $structure_privTable[] = array('Create_view', 'CREATE VIEW', __('Allows creating new views.'));
+        $structure_privTable[] = array('Create_view',
+            'CREATE VIEW',
+            __('Allows creating new views.')
+        );
     }
     // this one is for a table-specific priv: Create View_priv
     if (isset($row['Create View_priv'])) {
-        $structure_privTable[] = array('Create View', 'CREATE VIEW', __('Allows creating new views.'));
+        $structure_privTable[] = array('Create View',
+            'CREATE VIEW',
+            __('Allows creating new views.')
+        );
     }
     if (isset($row['Event_priv'])) {
         // MySQL 5.1.6
-        $structure_privTable[] = array('Event', 'EVENT', __('Allows to set up events for the event scheduler'));
-        $structure_privTable[] = array('Trigger', 'TRIGGER', __('Allows creating and dropping triggers'));
+        $structure_privTable[] = array('Event',
+            'EVENT',
+            __('Allows to set up events for the event scheduler')
+        );
+        $structure_privTable[] = array('Trigger',
+            'TRIGGER',
+            __('Allows creating and dropping triggers')
+        );
     }
     return $structure_privTable;
 }

From c3d02bbc5105de54d8f3c6a8e64bb3d7ab2e0054 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 10:14:09 +0530
Subject: [PATCH 023/102] remove long code line in
 PMA_getAdministrationPrivilegeTable in sever_privileges-lib

---
 libraries/server_privileges.lib.php | 50 +++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 4198284e67..810c0fc237 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -820,18 +820,48 @@ function PMA_getAdministrationPrivilegeTable($db)
         array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
     );
     if ($db == '*') {
-        $administration_privTable[] = array('Super', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.'));
-        $administration_privTable[] = array('Process', 'PROCESS', __('Allows viewing processes of all users'));
-        $administration_privTable[] = array('Reload', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.'));
-        $administration_privTable[] = array('Shutdown', 'SHUTDOWN', __('Allows shutting down the server.'));
-        $administration_privTable[] = array('Show_db', 'SHOW DATABASES', __('Gives access to the complete list of databases.'));
+        $administration_privTable[] = array('Super',
+            'SUPER',
+            __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')
+        );
+        $administration_privTable[] = array('Process',
+            'PROCESS',
+            __('Allows viewing processes of all users')
+        );
+        $administration_privTable[] = array('Reload',
+            'RELOAD',
+            __('Allows reloading server settings and flushing the server\'s caches.')
+        );
+        $administration_privTable[] = array('Shutdown',
+            'SHUTDOWN',
+            __('Allows shutting down the server.')
+        );
+        $administration_privTable[] = array('Show_db',
+            'SHOW DATABASES',
+            __('Gives access to the complete list of databases.')
+        );
     }
-    $administration_privTable[] = array('Lock_tables', 'LOCK TABLES', __('Allows locking tables for the current thread.'));
-    $administration_privTable[] = array('References', 'REFERENCES', __('Has no effect in this MySQL version.'));
+    $administration_privTable[] = array('Lock_tables',
+        'LOCK TABLES',
+        __('Allows locking tables for the current thread.')
+    );
+    $administration_privTable[] = array('References',
+        'REFERENCES',
+        __('Has no effect in this MySQL version.')
+    );
     if ($db == '*') {
-        $administration_privTable[] = array('Repl_client', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.'));
-        $administration_privTable[] = array('Repl_slave', 'REPLICATION SLAVE', __('Needed for the replication slaves.'));
-        $administration_privTable[] = array('Create_user', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.'));
+        $administration_privTable[] = array('Repl_client',
+            'REPLICATION CLIENT',
+            __('Allows the user to ask where the slaves / masters are.')
+        );
+        $administration_privTable[] = array('Repl_slave',
+            'REPLICATION SLAVE',
+            __('Needed for the replication slaves.')
+        );
+        $administration_privTable[] = array('Create_user',
+            'CREATE USER',
+            __('Allows creating, dropping and renaming user accounts.')
+        );
     }
     return $administration_privTable;
 }

From 137582cf07edf92e18725bf87c38bdf0867baac9 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 12:22:26 +0530
Subject: [PATCH 024/102] implementation for PMA_getHtmlForAddUser()

---
 libraries/server_privileges.lib.php | 56 +++++++++++++++++++++++++++++
 server_privileges.php               | 36 ++-----------------
 2 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 810c0fc237..29076f257e 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1206,4 +1206,60 @@ function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($Grant_priv, $max_questio
     return $sql_query;
 }
 
+/**
+ * Get HTML for addUsersForm, This function call if isset($_REQUEST['adduser'])
+ * 
+ * @param int $random_n
+ * @param string $dbname
+ * 
+ * @return string HTML for addUserForm
+ */
+function PMA_getHtmlForAddUser($random_n, $dbname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    $GLOBALS['url_query'] .= '&amp;adduser=1';
+    
+    $html_output = '<h2>' . "\n"
+       . $common_functions->getIcon('b_usradd.png') . __('Add user') . "\n"
+       . '</h2>' . "\n"
+       . '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
+       . PMA_generate_common_hidden_inputs('', '')
+       . PMA_getHtmlForDisplayLoginInformationFields('new');
+    
+    $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n"
+        . '<legend>' . __('Database for user') . '</legend>' . "\n";
+
+    $html_output .= $common_functions->getCheckbox(
+        'createdb-1',
+        __('Create database with same name and grant all privileges'),
+        false, false
+    );
+    $html_output .= '<br />' . "\n";
+    $html_output .= $common_functions->getCheckbox(
+        'createdb-2',
+        __('Grant all privileges on wildcard name (username\\_%)'),
+        false, false
+    );
+    $html_output .= '<br />' . "\n";
+
+    if (! empty($dbname) ) {
+        $html_output .= $common_functions->getCheckbox(
+            'createdb-3',
+            sprintf(__('Grant all privileges on database &quot;%s&quot;'),
+            htmlspecialchars($dbname)), true, false
+        );
+        $html_output .= '<input type="hidden" name="dbname" value="'
+            . htmlspecialchars($dbname) . '" />' . "\n";
+        $html_output .= '<br />' . "\n";
+    }
+
+    $html_output .= '</fieldset>' . "\n";
+    $html_output .= PMA_getHtmlToDisplayPrivilegesTable($random_n, '*', '*', false);
+    $html_output .= '<fieldset id="fieldset_add_user_footer" class="tblFooters">' . "\n"
+       . '<input type="submit" name="adduser_submit" value="' . __('Go') . '" />' . "\n"
+       . '</fieldset>' . "\n"
+       . '</form>' . "\n";
+    
+    return $html_output;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index c8e5c8dede..6f5e3a048d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -461,7 +461,6 @@ if (isset($_REQUEST['change_copy'])) {
     }
 }
 
-
 /**
  * Updates privileges
  */
@@ -515,7 +514,6 @@ if (! empty($update_privs)) {
     $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
 }
 
-
 /**
  * Revokes Privileges
  */
@@ -538,7 +536,6 @@ if (isset($_REQUEST['change_pw'])) {
  * Deletes users
  *   (Changes / copies a user, part IV)
  */
-
 if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) {
     if (isset($_REQUEST['change_copy'])) {
         $selected_usr = array($old_username . '&amp;#27;' . $old_hostname);
@@ -610,7 +607,6 @@ if (isset($_REQUEST['change_copy'])) {
     $sql_query = join("\n", $queries);
 }
 
-
 /**
  * Reloads the privilege tables into memory
  */
@@ -749,7 +745,6 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
     }
 }
 
-
 /**
  * Displays the page
  */
@@ -1466,35 +1461,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         }
     }
 } elseif (isset($_REQUEST['adduser'])) {
-
     // Add user
-    $GLOBALS['url_query'] .= '&amp;adduser=1';
-    echo '<h2>' . "\n"
-       . $common_functions->getIcon('b_usradd.png') . __('Add user') . "\n"
-       . '</h2>' . "\n"
-       . '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
-       . PMA_generate_common_hidden_inputs('', '')
-       . PMA_getHtmlForDisplayLoginInformationFields('new');
-    echo '<fieldset id="fieldset_add_user_database">' . "\n"
-        . '<legend>' . __('Database for user') . '</legend>' . "\n";
-
-    echo $common_functions->getCheckbox('createdb-1', __('Create database with same name and grant all privileges'), false, false);
-    echo '<br />' . "\n";
-    echo $common_functions->getCheckbox('createdb-2', __('Grant all privileges on wildcard name (username\\_%)'), false, false);
-    echo '<br />' . "\n";
-
-    if (! empty($dbname) ) {
-        echo $common_functions->getCheckbox('createdb-3', sprintf(__('Grant all privileges on database &quot;%s&quot;'), htmlspecialchars($dbname)), true, false);
-        echo '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '" />' . "\n";
-        echo '<br />' . "\n";
-    }
-
-    echo '</fieldset>' . "\n";
-    echo PMA_getHtmlToDisplayPrivilegesTable($random_n, '*', '*', false);
-    echo '    <fieldset id="fieldset_add_user_footer" class="tblFooters">' . "\n"
-       . '        <input type="submit" name="adduser_submit" value="' . __('Go') . '" />' . "\n"
-       . '    </fieldset>' . "\n"
-       . '</form>' . "\n";
+    $response->addHTML(
+        PMA_getHtmlForAddUser($random_n, $dbname)
+    );
 } else {
     // check the privileges for a particular database.
     $user_form = '<form id="usersForm" action="server_privileges.php"><fieldset>' . "\n"

From e3941295bf7a5c0774a9fe935e0555db17d1f167 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 17:21:31 +0530
Subject: [PATCH 025/102] function implementations for user form for privilees

---
 libraries/server_privileges.lib.php | 240 ++++++++++++++++++++++++++++
 server_privileges.php               | 177 +-------------------
 2 files changed, 243 insertions(+), 174 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 29076f257e..7334b7f908 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1262,4 +1262,244 @@ function PMA_getHtmlForAddUser($random_n, $dbname)
     
     return $html_output;
 }
+
+/**
+ * Get the list of privileges and list of compared privileges as strings
+ * and return a array that contains both strings
+ * 
+ * @return array  $list_of_privileges, $list_of_compared_privileges
+ */
+function PMA_getListOfPrivilegesAndComparedPrivileges()
+{
+    $list_of_privileges
+        = '`User`, '
+        . '`Host`, '
+        . '`Select_priv`, '
+        . '`Insert_priv`, '
+        . '`Update_priv`, '
+        . '`Delete_priv`, '
+        . '`Create_priv`, '
+        . '`Drop_priv`, '
+        . '`Grant_priv`, '
+        . '`Index_priv`, '
+        . '`Alter_priv`, '
+        . '`References_priv`, '
+        . '`Create_tmp_table_priv`, '
+        . '`Lock_tables_priv`, '
+        . '`Create_view_priv`, '
+        . '`Show_view_priv`, '
+        . '`Create_routine_priv`, '
+        . '`Alter_routine_priv`, '
+        . '`Execute_priv`';
+
+    $list_of_compared_privileges
+        = '`Select_priv` = \'N\''
+        . ' AND `Insert_priv` = \'N\''
+        . ' AND `Update_priv` = \'N\''
+        . ' AND `Delete_priv` = \'N\''
+        . ' AND `Create_priv` = \'N\''
+        . ' AND `Drop_priv` = \'N\''
+        . ' AND `Grant_priv` = \'N\''
+        . ' AND `References_priv` = \'N\''
+        . ' AND `Create_tmp_table_priv` = \'N\''
+        . ' AND `Lock_tables_priv` = \'N\''
+        . ' AND `Create_view_priv` = \'N\''
+        . ' AND `Show_view_priv` = \'N\''
+        . ' AND `Create_routine_priv` = \'N\''
+        . ' AND `Alter_routine_priv` = \'N\''
+        . ' AND `Execute_priv` = \'N\'';
+
+    if (PMA_MYSQL_INT_VERSION >= 50106) {
+        $list_of_privileges .=
+            ', `Event_priv`, '
+            . '`Trigger_priv`';
+        $list_of_compared_privileges .=
+            ' AND `Event_priv` = \'N\''
+            . ' AND `Trigger_priv` = \'N\'';
+    }
+    return array($list_of_privileges, $list_of_compared_privileges);
+}
+
+/**
+ * Get the HTML for user form and check the privileges for a particular database.
+ * 
+ * @param string $checkprivs        check privileges
+ * @param string $link_edit         standard link for edit
+ * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
+ * 
+ * @return string $html_output
+ */
+function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    // check the privileges for a particular database.
+    $html_output = '<form id="usersForm" action="server_privileges.php"><fieldset>' . "\n";
+    $html_output .= '<legend>' . "\n"
+        . $common_functions->getIcon('b_usrcheck.png')
+        . '    '
+        . sprintf(
+           __('Users having access to &quot;%s&quot;'),
+           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' .  htmlspecialchars($checkprivs) . '</a>'
+        )
+        . "\n"
+        . '</legend>' . "\n";
+    
+    $html_output .= '<table id="dbspecificuserrights" class="data">' . "\n"
+        . '<thead>' . "\n"
+        . '<tr><th>' . __('User') . '</th>' . "\n"
+        . '<th>' . __('Host') . '</th>' . "\n"
+        . '<th>' . __('Type') . '</th>' . "\n"
+        . '<th>' . __('Privileges') . '</th>' . "\n"
+        . '<th>' . __('Grant') . '</th>' . "\n"
+        . '<th>' . __('Action') . '</th>' . "\n"
+        . '</tr>' . "\n"
+        . '</thead>' . "\n";
+    $odd_row = true;
+    // now, we build the table...
+    list($list_of_privileges, $list_of_compared_privileges)
+        = PMA_getListOfPrivilegesAndComparedPrivileges();
+
+    $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`'
+        .' FROM `mysql`.`db`'
+        .' WHERE \'' . $common_functions->sqlAddSlashes($checkprivs) . "'"
+        .' LIKE `Db`'
+        .' AND NOT (' . $list_of_compared_privileges. ')) '
+        .'UNION '
+        .'(SELECT ' . $list_of_privileges . ', \'*\' AS `Db`'
+        .' FROM `mysql`.`user` '
+        .' WHERE NOT (' . $list_of_compared_privileges . ')) '
+        .' ORDER BY `User` ASC,'
+        .'  `Host` ASC,'
+        .'  `Db` ASC;';
+    $res = PMA_DBI_query($sql_query);
+    $row = PMA_DBI_fetch_assoc($res);
+    if ($row) {
+        $found = true;
+    }
+    $html_output .= PMA_getUserFormTableBody(
+        $found, $row, $odd_row, $link_edit, $res
+    );
+    $html_output .= '</table>'
+        . '</fieldset>'
+        . '</form>' . "\n";
+
+    if ($GLOBALS['is_ajax_request'] == true) {
+        $message = PMA_Message::success(__('User has been added.'));
+        $response = PMA_Response::getInstance();
+        $response->addJSON('message', $message);
+        $response->addJSON('user_form', $html_output);
+        exit;
+    } else {
+        // Offer to create a new user for the current database
+        $html_output .= '<fieldset id="fieldset_add_user">' . "\n"
+           . '<legend>' . __('New') . '</legend>' . "\n";
+        
+        $html_output .= '<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs)
+            .'" rel="'.'checkprivs='.htmlspecialchars($checkprivs). '&amp;'.$GLOBALS['url_query']
+            . '" class="'.$conditional_class
+            .'" name="db_specific">' . "\n"
+            . $common_functions->getIcon('b_usradd.png')
+            . '        ' . __('Add user') . '</a>' . "\n";
+                
+        $html_output .= '</fieldset>' . "\n";
+    }
+    return $html_output;
+}
+
+/**
+ * Get HTML snippet for table body of user form
+ * 
+ * @param boolean $found        whether user found or not
+ * @param array $row            array of rows from mysql , db table with list of privileges  
+ * @param boolean $odd_row      whether odd or not
+ * @param string $link_edit     standard link for edit
+ * @param string $res           ran sql query
+ *            
+ * @return string $html_output
+ */
+function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res)
+{
+    $html_output = '<tbody>' . "\n";
+    if ($found) {
+        while (true) {
+            // prepare the current user
+            $current_privileges = array();
+            $current_user = $row['User'];
+            $current_host = $row['Host'];
+            while ($row && $current_user == $row['User'] && $current_host == $row['Host']) {
+                $current_privileges[] = $row;
+                $row = PMA_DBI_fetch_assoc($res);
+            }
+            $html_output .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
+                . '<td';
+            if (count($current_privileges) > 1) {
+                $html_output .= ' rowspan="' . count($current_privileges) . '"';
+            }
+            $html_output .= '>' 
+                . (empty($current_user)
+                    ? '<span style="color: #FF0000">' . __('Any') . '</span>'
+                    : htmlspecialchars($current_user)) . "\n"
+                . '</td>' . "\n";
+            
+            $html_output .= '<td';
+            if (count($current_privileges) > 1) {
+                $html_output .= ' rowspan="' . count($current_privileges) . '"';
+            }
+            $html_output .= '>'
+                . htmlspecialchars($current_host) . '</td>' . "\n";
+            for ($i = 0; $i < count($current_privileges); $i++) {
+                $current = $current_privileges[$i];
+                $html_output .= '<td>' . "\n"
+                   . '            ';
+                if (! isset($current['Db']) || $current['Db'] == '*') {
+                    $html_output .= __('global');
+                } elseif ($current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($checkprivs)) {
+                    $html_output .= __('database-specific');
+                } else {
+                    $html_output .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
+                }
+                $html_output .= "\n"
+                   . '</td>' . "\n";
+                
+                $html_output .='<td>' . "\n"
+                   . '<code>' . "\n"
+                   . '' . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
+                   . '</code>' . "\n"
+                   . '</td>' . "\n";
+                
+                $html_output .= '<td>' . "\n"
+                   . '' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n"
+                   . '</td>' . "\n"
+                   . '<td>' . "\n";
+                $html_output .= sprintf(
+                    $link_edit,
+                    urlencode($current_user),
+                    urlencode($current_host),
+                    urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']),
+                    ''
+                );
+                $html_output .= '</td>' . "\n"
+                   . '    </tr>' . "\n";
+                if (($i + 1) < count($current_privileges)) {
+                    $html_output .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
+                }
+            }
+            if (empty($row)) {
+                break;
+            }
+            $odd_row = ! $odd_row;
+        }
+    } else {
+        $html_output .= '<tr class="odd">' . "\n"
+           . '<td colspan="6">' . "\n"
+           . '            ' . __('No user found.') . "\n"
+           . '</td>' . "\n"
+           . '</tr>' . "\n";
+    }
+    $html_output .= '</tbody>' . "\n";
+    
+    return $html_output;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 6f5e3a048d..d4fd33df12 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1467,180 +1467,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     );
 } else {
     // check the privileges for a particular database.
-    $user_form = '<form id="usersForm" action="server_privileges.php"><fieldset>' . "\n"
-       . '<legend>' . "\n"
-       . $common_functions->getIcon('b_usrcheck.png')
-       . '    ' . sprintf(__('Users having access to &quot;%s&quot;'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' .  htmlspecialchars($checkprivs) . '</a>') . "\n"
-       . '</legend>' . "\n"
-       . '<table id="dbspecificuserrights" class="data">' . "\n"
-       . '<thead>' . "\n"
-       . '    <tr><th>' . __('User') . '</th>' . "\n"
-       . '        <th>' . __('Host') . '</th>' . "\n"
-       . '        <th>' . __('Type') . '</th>' . "\n"
-       . '        <th>' . __('Privileges') . '</th>' . "\n"
-       . '        <th>' . __('Grant') . '</th>' . "\n"
-       . '        <th>' . __('Action') . '</th>' . "\n"
-       . '    </tr>' . "\n"
-       . '</thead>' . "\n"
-       . '<tbody>' . "\n";
-    $odd_row = true;
-    unset($row, $row1, $row2);
-
-    // now, we build the table...
-    $list_of_privileges
-        = '`User`, '
-        . '`Host`, '
-        . '`Select_priv`, '
-        . '`Insert_priv`, '
-        . '`Update_priv`, '
-        . '`Delete_priv`, '
-        . '`Create_priv`, '
-        . '`Drop_priv`, '
-        . '`Grant_priv`, '
-        . '`Index_priv`, '
-        . '`Alter_priv`, '
-        . '`References_priv`, '
-        . '`Create_tmp_table_priv`, '
-        . '`Lock_tables_priv`, '
-        . '`Create_view_priv`, '
-        . '`Show_view_priv`, '
-        . '`Create_routine_priv`, '
-        . '`Alter_routine_priv`, '
-        . '`Execute_priv`';
-
-    $list_of_compared_privileges
-        = '`Select_priv` = \'N\''
-        . ' AND `Insert_priv` = \'N\''
-        . ' AND `Update_priv` = \'N\''
-        . ' AND `Delete_priv` = \'N\''
-        . ' AND `Create_priv` = \'N\''
-        . ' AND `Drop_priv` = \'N\''
-        . ' AND `Grant_priv` = \'N\''
-        . ' AND `References_priv` = \'N\''
-        . ' AND `Create_tmp_table_priv` = \'N\''
-        . ' AND `Lock_tables_priv` = \'N\''
-        . ' AND `Create_view_priv` = \'N\''
-        . ' AND `Show_view_priv` = \'N\''
-        . ' AND `Create_routine_priv` = \'N\''
-        . ' AND `Alter_routine_priv` = \'N\''
-        . ' AND `Execute_priv` = \'N\'';
-
-    if (PMA_MYSQL_INT_VERSION >= 50106) {
-        $list_of_privileges .=
-            ', `Event_priv`, '
-            . '`Trigger_priv`';
-        $list_of_compared_privileges .=
-            ' AND `Event_priv` = \'N\''
-            . ' AND `Trigger_priv` = \'N\'';
-    }
-
-    $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`'
-        .' FROM `mysql`.`db`'
-        .' WHERE \'' . $common_functions->sqlAddSlashes($checkprivs) . "'"
-        .' LIKE `Db`'
-        .' AND NOT (' . $list_of_compared_privileges. ')) '
-        .'UNION '
-        .'(SELECT ' . $list_of_privileges . ', \'*\' AS `Db`'
-        .' FROM `mysql`.`user` '
-        .' WHERE NOT (' . $list_of_compared_privileges . ')) '
-        .' ORDER BY `User` ASC,'
-        .'  `Host` ASC,'
-        .'  `Db` ASC;';
-    $res = PMA_DBI_query($sql_query);
-    $row = PMA_DBI_fetch_assoc($res);
-    if ($row) {
-        $found = true;
-    }
-
-    if ($found) {
-        while (true) {
-            // prepare the current user
-            $current_privileges = array();
-            $current_user = $row['User'];
-            $current_host = $row['Host'];
-            while ($row && $current_user == $row['User'] && $current_host == $row['Host']) {
-                $current_privileges[] = $row;
-                $row = PMA_DBI_fetch_assoc($res);
-            }
-            $user_form .= '    <tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
-               . '        <td';
-            if (count($current_privileges) > 1) {
-                $user_form .= ' rowspan="' . count($current_privileges) . '"';
-            }
-            $user_form .= '>' . (empty($current_user) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($current_user)) . "\n"
-               . '        </td>' . "\n"
-               . '        <td';
-            if (count($current_privileges) > 1) {
-                $user_form .= ' rowspan="' . count($current_privileges) . '"';
-            }
-            $user_form .= '>' . htmlspecialchars($current_host) . '</td>' . "\n";
-            for ($i = 0; $i < count($current_privileges); $i++) {
-                $current = $current_privileges[$i];
-                $user_form .= '        <td>' . "\n"
-                   . '            ';
-                if (! isset($current['Db']) || $current['Db'] == '*') {
-                    $user_form .= __('global');
-                } elseif ($current['Db'] == $common_functions->escapeMysqlWildcards($checkprivs)) {
-                    $user_form .= __('database-specific');
-                } else {
-                    $user_form .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
-                }
-                $user_form .= "\n"
-                   . '        </td>' . "\n"
-                   . '        <td>' . "\n"
-                   . '            <code>' . "\n"
-                   . '                ' . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
-                   . '            </code>' . "\n"
-                   . '        </td>' . "\n"
-                   . '        <td>' . "\n"
-                   . '            ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n"
-                   . '        </td>' . "\n"
-                   . '        <td>' . "\n";
-                $user_form .= sprintf(
-                    $link_edit,
-                    urlencode($current_user),
-                    urlencode($current_host),
-                    urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']),
-                    ''
-                );
-                $user_form .= '</td>' . "\n"
-                   . '    </tr>' . "\n";
-                if (($i + 1) < count($current_privileges)) {
-                    $user_form .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
-                }
-            }
-            if (empty($row) && empty($row1) && empty($row2)) {
-                break;
-            }
-            $odd_row = ! $odd_row;
-        }
-    } else {
-        $user_form .= '    <tr class="odd">' . "\n"
-           . '        <td colspan="6">' . "\n"
-           . '            ' . __('No user found.') . "\n"
-           . '        </td>' . "\n"
-           . '    </tr>' . "\n";
-    }
-    $user_form .= '</tbody>' . "\n"
-       . '</table></fieldset></form>' . "\n";
-
-    if ($GLOBALS['is_ajax_request'] == true) {
-        $message = PMA_Message::success(__('User has been added.'));
-        $response = PMA_Response::getInstance();
-        $response->addJSON('message', $message);
-        $response->addJSON('user_form', $user_form);
-        exit;
-    } else {
-        // Offer to create a new user for the current database
-        $user_form .= '<fieldset id="fieldset_add_user">' . "\n"
-           . '<legend>' . __('New') . '</legend>' . "\n"
-           . '    <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs) .'" rel="'.'checkprivs='.htmlspecialchars($checkprivs). '&amp;'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n"
-           . $common_functions->getIcon('b_usradd.png')
-           . '        ' . __('Add user') . '</a>' . "\n"
-           . '</fieldset>' . "\n";
-        echo $user_form ;
-    }
-
+    $response->addHTML(
+        PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
+    );    
 } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...
 
 ?>

From 7ab2f4762a49e697abed97c707d15ca86f51d040 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 21:18:02 +0530
Subject: [PATCH 026/102] remove php notice

---
 libraries/server_privileges.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7334b7f908..f1824236f9 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1377,7 +1377,7 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
         $found = true;
     }
     $html_output .= PMA_getUserFormTableBody(
-        $found, $row, $odd_row, $link_edit, $res
+        $found, $row, $odd_row, $link_edit, $res, $checkprivs
     );
     $html_output .= '</table>'
         . '</fieldset>'
@@ -1415,10 +1415,11 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
  * @param boolean $odd_row      whether odd or not
  * @param string $link_edit     standard link for edit
  * @param string $res           ran sql query
+ * @param string $checkprivs    check privileges
  *            
  * @return string $html_output
  */
-function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res)
+function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res, $checkprivs)
 {
     $html_output = '<tbody>' . "\n";
     if ($found) {

From ca60e07103dd37c1c3bf6dcd1752da1f4b031ca0 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 3 Jul 2012 23:44:46 +0530
Subject: [PATCH 027/102] function for get standard links

---
 libraries/server_privileges.lib.php | 51 +++++++++++++++++++++++++++++
 server_privileges.php               | 36 ++------------------
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f1824236f9..37a96cc7f0 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1503,4 +1503,55 @@ function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res, $che
     return $html_output;
 }
 
+/**
+ * Define some standard links
+ * $link_edit, $link_revoke, $link_export, $link_export_all
+ * 
+ * @param string $conditional_class     if ajaxable 'Ajax' otherwise ''
+ * 
+ * @return array with some standard links 
+ */
+function PMA_getStandardLinks($conditional_class)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $link_edit = '<a class="edit_user_anchor ' . $conditional_class . '"'
+        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . '&amp;username=%s'
+        . '&amp;hostname=%s'
+        . '&amp;dbname=%s'
+        . '&amp;tablename=%s">'
+        . $common_functions->getIcon('b_usredit.png', __('Edit Privileges'))
+        . '</a>';
+
+    $link_revoke = '<a href='
+        .'"server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . '&amp;username=%s'
+        . '&amp;hostname=%s'
+        . '&amp;dbname=%s'
+        . '&amp;tablename=%s'
+        . '&amp;revokeall=1">'
+        . $common_functions->getIcon('b_usrdrop.png', __('Revoke'))
+        . '</a>';
+
+    $link_export = '<a class="export_user_anchor ' . $conditional_class . '"'
+        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . '&amp;username=%s'
+        . '&amp;hostname=%s'
+        . '&amp;initial=%s'
+        . '&amp;export=1">'
+        . $common_functions->getIcon('b_tblexport.png', __('Export'))
+        . '</a>';
+
+    $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '"'
+        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . '&amp;username=%s'
+        . '&amp;hostname=%s'
+        . '&amp;initial=%s'
+        . '&amp;export=1">'
+        . $common_functions->getIcon('b_tblexport.png', __('Export all'))
+        . '</a>';
+    
+    return array($link_edit, $link_revoke, $link_export, $link_export_all);
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index d4fd33df12..c8fbd0f1e1 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -617,40 +617,10 @@ if (isset($_REQUEST['flush_privileges'])) {
 }
 
 /**
- * defines some standard links
+ * some standard links
  */
-$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
-    . '&amp;username=%s'
-    . '&amp;hostname=%s'
-    . '&amp;dbname=%s'
-    . '&amp;tablename=%s">'
-    . $common_functions->getIcon('b_usredit.png', __('Edit Privileges'))
-    . '</a>';
-
-$link_revoke = '<a href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
-    . '&amp;username=%s'
-    . '&amp;hostname=%s'
-    . '&amp;dbname=%s'
-    . '&amp;tablename=%s'
-    . '&amp;revokeall=1">'
-    . $common_functions->getIcon('b_usrdrop.png', __('Revoke'))
-    . '</a>';
-
-$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
-    . '&amp;username=%s'
-    . '&amp;hostname=%s'
-    . '&amp;initial=%s'
-    . '&amp;export=1">'
-    . $common_functions->getIcon('b_tblexport.png', __('Export'))
-    . '</a>';
-
-$link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
-    . '&amp;username=%s'
-    . '&amp;hostname=%s'
-    . '&amp;initial=%s'
-    . '&amp;export=1">'
-    . $common_functions->getIcon('b_tblexport.png', __('Export all'))
-    . '</a>';
+list($link_edit, $link_revoke, $link_export, $link_export_all)
+    = PMA_getStandardLinks($conditional_class);
 
 /**
  * If we are in an Ajax request for Create User/Edit User/Revoke User/

From 307884506cf5f2cfc56fa9f2f3edeeb2fd2c38f1 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Thu, 5 Jul 2012 22:13:44 +0530
Subject: [PATCH 028/102] function for ajax behavior in privileges

---
 libraries/server_privileges.lib.php | 92 +++++++++++++++++++++++++++++
 server_privileges.php               | 77 +++++-------------------
 2 files changed, 106 insertions(+), 63 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 37a96cc7f0..d1f73da625 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1554,4 +1554,96 @@ function PMA_getStandardLinks($conditional_class)
     
     return array($link_edit, $link_revoke, $link_export, $link_export_all);
 }
+
+/**
+ * If we are in an Ajax request for Create User/Edit User/Revoke User/
+ * Flush Privileges, show $message and exit. This function return the extra
+ * data array for the ajax behavior
+ * 
+ * @param string $sql_query           sql query
+ * @param string $username            username
+ * @param string $hostname            host name
+ * @param string $pma_pw              password that user entered for change, comming from request
+ * @param array $Grant_priv           grants privileges
+ * @param string $link_edit           standard link for edit
+ * @param boolean $update_privs       whehter update or not 
+ * @param boolean $dbname_is_wildcard whether database name is wildcard or not
+ * 
+ * @return array $extra_data
+ */
+function PMA_getExatraDataForAjaxBehavior($sql_query, $username, $hostname,
+    $pma_pw, $Grant_priv, $link_edit, $update_privs, $dbname_is_wildcard
+) {
+    if (isset($sql_query)) {
+        $extra_data['sql_query'] = PMA_CommonFunctions::getInstance()->getMessage(null, $sql_query);
+    }
+
+    if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
+        /**
+         * generate html on the fly for the new user that was just created.
+         */
+        $new_user_string = '<tr>'."\n"
+            . '<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_"'
+            . 'value="' . htmlspecialchars($username) . '&amp;#27;' . htmlspecialchars($hostname) . '" />'
+            . '</td>' . "\n"
+            . '<td><label for="checkbox_sel_users_">' 
+            . (empty($username) 
+                    ? '<span style="color: #FF0000">' . __('Any') . '</span>'
+                    : htmlspecialchars($username) ) . '</label></td>' . "\n"
+            . '<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
+        
+        $new_user_string .= '<td>';
+
+        if (! empty($password) || isset($pma_pw)) {
+            $new_user_string .= __('Yes');
+        } else {
+            $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
+        };
+
+        $new_user_string .= '</td>'."\n";
+        $new_user_string .= '<td><code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code></td>'; //Fill in privileges here
+        $new_user_string .= '<td>';
+
+        if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
+            $new_user_string .= __('Yes');
+        } else {
+            $new_user_string .= __('No');
+        }
+
+        $new_user_string .='</td>';
+
+        $new_user_string .= '<td>'
+            . sprintf($link_edit, urlencode($username), urlencode($hostname), '', '')
+            . '</td>' . "\n";
+        $new_user_string .= '<td>'
+            . sprintf($link_export, urlencode($username), urlencode($hostname), (isset($initial) ? $initial : ''))
+            . '</td>' . "\n";
+
+        $new_user_string .= '</tr>';
+
+        $extra_data['new_user_string'] = $new_user_string;
+
+        /**
+         * Generate the string for this alphabet's initial, to update the user
+         * pagination
+         */
+        $new_user_initial = strtoupper(substr($username, 0, 1));
+        $new_user_initial_string = '<a href="server_privileges.php?'
+            . $GLOBALS['url_query'] . '&initial=' . $new_user_initial .'">' . $new_user_initial . '</a>';
+        $extra_data['new_user_initial'] = $new_user_initial;
+        $extra_data['new_user_initial_string'] = $new_user_initial_string;
+    }
+
+    if (isset($update_privs)) {
+        $extra_data['db_specific_privs'] = false;
+        if (isset($dbname_is_wildcard)) {
+            $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
+        }
+        $new_privileges = join(', ', PMA_extractPrivInfo('', true));
+
+        $extra_data['new_privileges'] = $new_privileges;
+    }
+    return $extra_data;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index c8fbd0f1e1..351415c435 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -47,7 +47,6 @@ foreach ($get_params as $one_get_param) {
         $GLOBALS[$one_get_param] = $_REQUEST[$one_get_param];
     }
 }
-
 /**
  * Sets globals from $_POST
  */
@@ -536,7 +535,7 @@ if (isset($_REQUEST['change_pw'])) {
  * Deletes users
  *   (Changes / copies a user, part IV)
  */
-if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) {
+if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) { var_dump($GLOBALS);
     if (isset($_REQUEST['change_copy'])) {
         $selected_usr = array($old_username . '&amp;#27;' . $old_hostname);
     } else {
@@ -626,67 +625,19 @@ list($link_edit, $link_revoke, $link_export, $link_export_all)
  * If we are in an Ajax request for Create User/Edit User/Revoke User/
  * Flush Privileges, show $message and exit.
  */
-if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export') && (! isset($_REQUEST['adduser']) || $_add_user_error) && (! isset($_REQUEST['initial']) || empty($_REQUEST['initial'])) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
-
-    if (isset($sql_query)) {
-        $extra_data['sql_query'] = $common_functions->getMessage(null, $sql_query);
-    }
-
-    if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
-        /**
-         * generate html on the fly for the new user that was just created.
-         */
-        $new_user_string = '<tr>'."\n"
-                           .'<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_" value="' . htmlspecialchars($username) . '&amp;#27;' . htmlspecialchars($hostname) . '" /> </td>' . "\n"
-                           .'<td><label for="checkbox_sel_users_">' . (empty($username) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($username) ) . '</label></td>' . "\n"
-                           .'<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
-        $new_user_string .= '<td>';
-
-        if (! empty($password) || isset($pma_pw)) {
-            $new_user_string .= __('Yes');
-        } else {
-            $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
-        };
-
-        $new_user_string .= '</td>'."\n";
-        $new_user_string .= '<td><code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code></td>'; //Fill in privileges here
-        $new_user_string .= '<td>';
-
-        if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
-            $new_user_string .= __('Yes');
-        } else {
-            $new_user_string .= __('No');
-        }
-
-        $new_user_string .='</td>';
-
-        $new_user_string .= '<td>' . sprintf($link_edit, urlencode($username), urlencode($hostname), '', '') . '</td>' . "\n";
-        $new_user_string .= '<td>' . sprintf($link_export, urlencode($username), urlencode($hostname), (isset($initial) ? $initial : '')) . '</td>' . "\n";
-
-        $new_user_string .= '</tr>';
-
-        $extra_data['new_user_string'] = $new_user_string;
-
-        /**
-         * Generate the string for this alphabet's initial, to update the user
-         * pagination
-         */
-        $new_user_initial = strtoupper(substr($username, 0, 1));
-        $new_user_initial_string = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . $new_user_initial
-            .'">' . $new_user_initial . '</a>';
-        $extra_data['new_user_initial'] = $new_user_initial;
-        $extra_data['new_user_initial_string'] = $new_user_initial_string;
-    }
-
-    if (isset($update_privs)) {
-        $extra_data['db_specific_privs'] = false;
-        if (isset($dbname_is_wildcard)) {
-            $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
-        }
-        $new_privileges = join(', ', PMA_extractPrivInfo('', true));
-
-        $extra_data['new_privileges'] = $new_privileges;
-    }
+if ($GLOBALS['is_ajax_request']
+    && ! isset($_REQUEST['export'])
+    && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
+    && (! isset($_REQUEST['adduser']) || $_add_user_error)
+    && (! isset($_REQUEST['initial']) || empty($_REQUEST['initial']))
+    && ! isset($_REQUEST['showall'])
+    && ! isset($_REQUEST['edit_user_dialog'])
+    && ! isset($_REQUEST['db_specific']))
+{
+    $extra_data = PMA_getExatraDataForAjaxBehavior(
+        $sql_query, $username, $hostname, $pma_pw, $Grant_priv,
+         $link_edit, $update_privs, $dbname_is_wildcard
+    );
 
     if ($message instanceof PMA_Message) {
         $response = PMA_Response::getInstance();

From 980e0ecdada93edaaf142863fea04032c4f61e77 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 6 Jul 2012 00:48:15 +0530
Subject: [PATCH 029/102] some changes to PMA_getExtraDataForAjaxBehavior
 function

---
 libraries/server_privileges.lib.php | 51 ++++++++++++++++-------------
 server_privileges.php               | 12 ++++---
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d1f73da625..f8e809a1d6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1556,26 +1556,20 @@ function PMA_getStandardLinks($conditional_class)
 }
 
 /**
- * If we are in an Ajax request for Create User/Edit User/Revoke User/
- * Flush Privileges, show $message and exit. This function return the extra
- * data array for the ajax behavior
+ * This function return the extra data array for the ajax behavior
  * 
  * @param string $sql_query           sql query
- * @param string $username            username
- * @param string $hostname            host name
- * @param string $pma_pw              password that user entered for change, comming from request
- * @param array $Grant_priv           grants privileges
  * @param string $link_edit           standard link for edit
- * @param boolean $update_privs       whehter update or not 
  * @param boolean $dbname_is_wildcard whether database name is wildcard or not
  * 
  * @return array $extra_data
  */
-function PMA_getExatraDataForAjaxBehavior($sql_query, $username, $hostname,
-    $pma_pw, $Grant_priv, $link_edit, $update_privs, $dbname_is_wildcard
+function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
+    $dbname_is_wildcard, $link_export
 ) {
     if (isset($sql_query)) {
-        $extra_data['sql_query'] = PMA_CommonFunctions::getInstance()->getMessage(null, $sql_query);
+        $extra_data['sql_query'] 
+            = PMA_CommonFunctions::getInstance()->getMessage(null, $sql_query);
     }
 
     if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
@@ -1584,27 +1578,30 @@ function PMA_getExatraDataForAjaxBehavior($sql_query, $username, $hostname,
          */
         $new_user_string = '<tr>'."\n"
             . '<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_"'
-            . 'value="' . htmlspecialchars($username) . '&amp;#27;' . htmlspecialchars($hostname) . '" />'
+            . 'value="' 
+            . htmlspecialchars($GLOBALS['username']) . '&amp;#27;' . htmlspecialchars($GLOBALS['hostname']) . '" />'
             . '</td>' . "\n"
             . '<td><label for="checkbox_sel_users_">' 
-            . (empty($username) 
+            . (empty($GLOBALS['username']) 
                     ? '<span style="color: #FF0000">' . __('Any') . '</span>'
-                    : htmlspecialchars($username) ) . '</label></td>' . "\n"
-            . '<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
+                    : htmlspecialchars($GLOBALS['username']) ) . '</label></td>' . "\n"
+            . '<td>' . htmlspecialchars($GLOBALS['hostname']) . '</td>' . "\n";
         
         $new_user_string .= '<td>';
 
-        if (! empty($password) || isset($pma_pw)) {
+        if (! empty($password) || isset($GLOBALS['pma_pw'])) {
             $new_user_string .= __('Yes');
         } else {
             $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
         };
 
         $new_user_string .= '</td>'."\n";
-        $new_user_string .= '<td><code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code></td>'; //Fill in privileges here
+        $new_user_string .= '<td>'
+            . '<code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code>'
+            . '</td>'; //Fill in privileges here
         $new_user_string .= '<td>';
 
-        if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
+        if ((isset($GLOBALS['Grant_priv']) && $GLOBALS['Grant_priv'] == 'Y')) {
             $new_user_string .= __('Yes');
         } else {
             $new_user_string .= __('No');
@@ -1613,10 +1610,18 @@ function PMA_getExatraDataForAjaxBehavior($sql_query, $username, $hostname,
         $new_user_string .='</td>';
 
         $new_user_string .= '<td>'
-            . sprintf($link_edit, urlencode($username), urlencode($hostname), '', '')
+            . sprintf($link_edit,
+                urlencode($GLOBALS['username']),
+                urlencode($GLOBALS['hostname']),
+                '', ''
+            )
             . '</td>' . "\n";
         $new_user_string .= '<td>'
-            . sprintf($link_export, urlencode($username), urlencode($hostname), (isset($initial) ? $initial : ''))
+            . sprintf($link_export,
+                urlencode($GLOBALS['username']),
+                urlencode($GLOBALS['hostname']),
+                (isset($initial) ? $initial : '')
+            )
             . '</td>' . "\n";
 
         $new_user_string .= '</tr>';
@@ -1627,16 +1632,16 @@ function PMA_getExatraDataForAjaxBehavior($sql_query, $username, $hostname,
          * Generate the string for this alphabet's initial, to update the user
          * pagination
          */
-        $new_user_initial = strtoupper(substr($username, 0, 1));
+        $new_user_initial = strtoupper(substr($GLOBALS['username'], 0, 1));
         $new_user_initial_string = '<a href="server_privileges.php?'
             . $GLOBALS['url_query'] . '&initial=' . $new_user_initial .'">' . $new_user_initial . '</a>';
         $extra_data['new_user_initial'] = $new_user_initial;
         $extra_data['new_user_initial_string'] = $new_user_initial_string;
     }
 
-    if (isset($update_privs)) {
+    if (isset($GLOBALS['update_privs'])) {
         $extra_data['db_specific_privs'] = false;
-        if (isset($dbname_is_wildcard)) {
+        if (empty($dbname_is_wildcard)) {
             $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
         }
         $new_privileges = join(', ', PMA_extractPrivInfo('', true));
diff --git a/server_privileges.php b/server_privileges.php
index 351415c435..e30dfca30d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -167,13 +167,12 @@ if (isset($dbname)) {
     $db_and_table = '*.*';
 }
 
+$dbname_is_wildcard = false;
 // check if given $dbname is a wildcard or not
 if (isset($dbname)) {
     //if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
     if (preg_match('/(?<!\\\\)(?:_|%)/i', $dbname)) {
         $dbname_is_wildcard = true;
-    } else {
-        $dbname_is_wildcard = false;
     }
 }
 
@@ -634,9 +633,12 @@ if ($GLOBALS['is_ajax_request']
     && ! isset($_REQUEST['edit_user_dialog'])
     && ! isset($_REQUEST['db_specific']))
 {
-    $extra_data = PMA_getExatraDataForAjaxBehavior(
-        $sql_query, $username, $hostname, $pma_pw, $Grant_priv,
-         $link_edit, $update_privs, $dbname_is_wildcard
+    $isPass = false;
+    if(isset ($password)) {
+        $isPass = true;
+    }
+    $extra_data = PMA_getExtraDataForAjaxBehavior( $isPass,
+        $sql_query, $link_edit, $dbname_is_wildcard, $link_export
     );
 
     if ($message instanceof PMA_Message) {

From a529d729e09e69b9f276962139a93f41d0528b2d Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 6 Jul 2012 01:10:20 +0530
Subject: [PATCH 030/102] remove var_dump and a notice

---
 libraries/server_privileges.lib.php | 5 ++---
 server_privileges.php               | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f8e809a1d6..49e5eb5184 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1176,7 +1176,6 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
 /**
  * Get a common SQL query for 'update privileges' and 'add user'
  * 
- * @param type $Grant_priv              grant privileges
  * @param type $max_questions           maximum questions
  * @param type $max_connections         maximum connections
  * @param type $max_updates             maximum updates
@@ -1184,11 +1183,11 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  * 
  * @return string $sql_query
  */
-function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($Grant_priv, $max_questions,
+function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($max_questions,
     $max_connections, $max_updates, $max_user_connections
 ) {
     $sql_query = 'WITH';
-    if ($Grant_priv == 'Y') {
+    if (isset($GlOBALS['Grant_priv']) && $GlOBALS['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
     }
     $max_questions = max(0, (int)$max_questions);
diff --git a/server_privileges.php b/server_privileges.php
index e30dfca30d..485b5d27b9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -279,7 +279,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             || isset($max_updates) || isset($max_user_connections))
         ) {
             $real_sql_query .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs(
-                $Grant_priv, $max_questions, $max_connections,$max_updates, 
+                $max_questions, $max_connections,$max_updates, 
                 $max_user_connections
             );
             $sql_query .= $real_sql_query;
@@ -534,7 +534,7 @@ if (isset($_REQUEST['change_pw'])) {
  * Deletes users
  *   (Changes / copies a user, part IV)
  */
-if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) { var_dump($GLOBALS);
+if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) {
     if (isset($_REQUEST['change_copy'])) {
         $selected_usr = array($old_username . '&amp;#27;' . $old_hostname);
     } else {

From 5b8bfdca6878e0a0befd57f2e16dbca00a00cd7a Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 7 Jul 2012 03:11:20 +0530
Subject: [PATCH 031/102] remove GLOBALS

---
 libraries/server_privileges.lib.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 49e5eb5184..ca321b2157 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1578,17 +1578,17 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
         $new_user_string = '<tr>'."\n"
             . '<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_"'
             . 'value="' 
-            . htmlspecialchars($GLOBALS['username']) . '&amp;#27;' . htmlspecialchars($GLOBALS['hostname']) . '" />'
+            . htmlspecialchars($_REQUEST['username']) . '&amp;#27;' . htmlspecialchars($_REQUEST['hostname']) . '" />'
             . '</td>' . "\n"
             . '<td><label for="checkbox_sel_users_">' 
-            . (empty($GLOBALS['username']) 
+            . (empty($_REQUEST['username']) 
                     ? '<span style="color: #FF0000">' . __('Any') . '</span>'
-                    : htmlspecialchars($GLOBALS['username']) ) . '</label></td>' . "\n"
-            . '<td>' . htmlspecialchars($GLOBALS['hostname']) . '</td>' . "\n";
+                    : htmlspecialchars($_REQUEST['username']) ) . '</label></td>' . "\n"
+            . '<td>' . htmlspecialchars($_REQUEST['hostname']) . '</td>' . "\n";
         
         $new_user_string .= '<td>';
 
-        if (! empty($password) || isset($GLOBALS['pma_pw'])) {
+        if (! empty($password) || isset($_POST['pma_pw'])) {
             $new_user_string .= __('Yes');
         } else {
             $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
@@ -1600,7 +1600,7 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
             . '</td>'; //Fill in privileges here
         $new_user_string .= '<td>';
 
-        if ((isset($GLOBALS['Grant_priv']) && $GLOBALS['Grant_priv'] == 'Y')) {
+        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')) {
             $new_user_string .= __('Yes');
         } else {
             $new_user_string .= __('No');
@@ -1610,16 +1610,16 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
 
         $new_user_string .= '<td>'
             . sprintf($link_edit,
-                urlencode($GLOBALS['username']),
-                urlencode($GLOBALS['hostname']),
+                urlencode($_REQUEST['username']),
+                urlencode($_REQUEST['hostname']),
                 '', ''
             )
             . '</td>' . "\n";
         $new_user_string .= '<td>'
             . sprintf($link_export,
-                urlencode($GLOBALS['username']),
-                urlencode($GLOBALS['hostname']),
-                (isset($initial) ? $initial : '')
+                urlencode($_REQUEST['username']),
+                urlencode($_REQUEST['hostname']),
+                (isset($_GET['initial']) ? $_GET['initial'] : '')
             )
             . '</td>' . "\n";
 
@@ -1631,14 +1631,14 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
          * Generate the string for this alphabet's initial, to update the user
          * pagination
          */
-        $new_user_initial = strtoupper(substr($GLOBALS['username'], 0, 1));
+        $new_user_initial = strtoupper(substr($_REQUEST['username'], 0, 1));
         $new_user_initial_string = '<a href="server_privileges.php?'
             . $GLOBALS['url_query'] . '&initial=' . $new_user_initial .'">' . $new_user_initial . '</a>';
         $extra_data['new_user_initial'] = $new_user_initial;
         $extra_data['new_user_initial_string'] = $new_user_initial_string;
     }
 
-    if (isset($GLOBALS['update_privs'])) {
+    if (isset($_POST['update_privs'])) {
         $extra_data['db_specific_privs'] = false;
         if (empty($dbname_is_wildcard)) {
             $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;

From ef35f35cd011cea5a3d98ffd4abefb19a8452b40 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 7 Jul 2012 03:12:23 +0530
Subject: [PATCH 032/102] formating

---
 server_privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_privileges.php b/server_privileges.php
index 485b5d27b9..9c344c5a14 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -634,7 +634,7 @@ if ($GLOBALS['is_ajax_request']
     && ! isset($_REQUEST['db_specific']))
 {
     $isPass = false;
-    if(isset ($password)) {
+    if(isset($password)) {
         $isPass = true;
     }
     $extra_data = PMA_getExtraDataForAjaxBehavior( $isPass,

From 5ca4e74c6bf1e054994d3056ccec13adce2e318c Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 7 Jul 2012 18:10:44 +0530
Subject: [PATCH 033/102] function for change login information

---
 libraries/server_privileges.lib.php | 40 +++++++++++++++++++++++++++++
 server_privileges.php               | 28 +++-----------------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ca321b2157..48078da1a7 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1650,4 +1650,44 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
     return $extra_data;
 }
 
+/**
+ * Get the HTML snippet for chane user login information 
+ * 
+ * @param string $username  username
+ * @param string $hostname  host name
+ * 
+ * @return string HTML snippet
+ */
+function PMA_changeLoginInformation($username, $hostname)
+{
+    $choices = array(
+        '4' => __('... keep the old one.'),
+        '1' => __('... delete the old one from the user tables.'),
+        '2' => __('... revoke all active privileges from the old one and delete it afterwards.'),
+        '3' => __('... delete the old one from the user tables and reload the privileges afterwards.'));
+
+    $html_output = '<form action="server_privileges.php" method="post" class="copyUserForm">' . "\n"
+        . PMA_generate_common_hidden_inputs('', '')
+        . '<input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
+        . '<input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
+        . '<fieldset id="fieldset_change_copy_user">' . "\n"
+        . '<legend>' . __('Change Login Information / Copy User') . '</legend>' . "\n"
+        . PMA_getHtmlForDisplayLoginInformationFields('change');
+    
+    $html_output .= '<fieldset>' . "\n"
+        . ' <legend>' . __('Create a new user with the same privileges and ...') . '</legend>' . "\n";
+    $html_output .= PMA_CommonFunctions::getInstance()->getRadioFields(
+        'mode', $choices, '4', true
+    );
+    $html_output .= '</fieldset>' . "\n"
+       . '</fieldset>' . "\n";
+    
+    $html_output .= '<fieldset id="fieldset_change_copy_user_footer" class="tblFooters">' . "\n"
+       . '<input type="submit" name="change_copy" value="' . __('Go') . '" />' . "\n"
+       . '</fieldset>' . "\n"
+       . '</form>' . "\n";
+    
+    return $html_output;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 9c344c5a14..961601e76a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1354,33 +1354,11 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         }
 
         if (! isset($dbname) && ! $user_does_not_exists) {
+            //change login information
             include_once 'libraries/display_change_password.lib.php';
-
-            echo '<form action="server_privileges.php" method="post" class="copyUserForm">' . "\n"
-               . PMA_generate_common_hidden_inputs('', '')
-               . '<input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
-               . '<input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
-               . '<fieldset id="fieldset_change_copy_user">' . "\n"
-               . '    <legend>' . __('Change Login Information / Copy User') . '</legend>' . "\n"
-               . PMA_getHtmlForDisplayLoginInformationFields('change');
-            echo '    <fieldset>' . "\n"
-                . '        <legend>' . __('Create a new user with the same privileges and ...') . '</legend>' . "\n";
-            $choices = array(
-                '4' => __('... keep the old one.'),
-                '1' => __('... delete the old one from the user tables.'),
-                '2' => __('... revoke all active privileges from the old one and delete it afterwards.'),
-                '3' => __('... delete the old one from the user tables and reload the privileges afterwards.'));
-            echo $common_functions->getRadioFields(
-                'mode', $choices, '4', true
+            $response->addHTML(
+                PMA_changeLoginInformation($username, $hostname)
             );
-            unset($choices);
-
-            echo '    </fieldset>' . "\n"
-               . '</fieldset>' . "\n"
-               . '<fieldset id="fieldset_change_copy_user_footer" class="tblFooters">' . "\n"
-               . '    <input type="submit" name="change_copy" value="' . __('Go') . '" />' . "\n"
-               . '</fieldset>' . "\n"
-               . '</form>' . "\n";
         }
     }
 } elseif (isset($_REQUEST['adduser'])) {

From d244bffde2e57b90dcf58372f296945615dd273b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 7 Jul 2012 18:25:00 +0530
Subject: [PATCH 034/102] implemeetation of PMA_getLinkToDbAndTable

---
 libraries/server_privileges.lib.php | 30 +++++++++++++++++++++++++++++
 server_privileges.php               | 19 +++---------------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 48078da1a7..1a6d72bf04 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1690,4 +1690,34 @@ function PMA_changeLoginInformation($username, $hostname)
     return $html_output;
 }
 
+/**
+ * Provide a line with links to the relevant database and table
+ * 
+ * @param string $url_dbname    url database name that urlencode() string 
+ * @param string $dbname        database name
+ * @param string $tablename     table name
+ * 
+ * @return string HTML snippet
+ */
+function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
+{
+    $html_output = '[ ' . __('Database')
+        . ' <a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?'
+        . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;reload=1">'
+        . htmlspecialchars($dbname) . ': '
+        . PMA_CommonFunctions::getInstance()->getTitleForTarget($GLOBALS['cfg']['DefaultTabDatabase'])
+        . "</a> ]\n";
+
+    if (isset($tablename)) {
+        $html_output .= ' [ ' . __('Table') . ' <a href="'
+            . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query']
+            . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename))
+            . '&amp;reload=1">' . htmlspecialchars($tablename) . ': '
+            . PMA_CommonFunctions::getInstance()->getTitleForTarget(
+                $GLOBALS['cfg']['DefaultTabTable']
+            )
+            . "</a> ]\n";
+    }
+    return $html_output;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 961601e76a..89e6fcfb35 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1335,22 +1335,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
         // Provide a line with links to the relevant database and table
         if (isset($dbname) && empty($dbname_is_wildcard)) {
-            echo '[ ' . __('Database')
-                . ' <a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?'
-                . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;reload=1">'
-                . htmlspecialchars($dbname) . ': ' . $common_functions->getTitleForTarget($GLOBALS['cfg']['DefaultTabDatabase']) . "</a> ]\n";
-
-            if (isset($tablename)) {
-                echo ' [ ' . __('Table') . ' <a href="'
-                    . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query']
-                    . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename))
-                    . '&amp;reload=1">' . htmlspecialchars($tablename) . ': '
-                    . $common_functions->getTitleForTarget(
-                        $GLOBALS['cfg']['DefaultTabTable']
-                    )
-                    . "</a> ]\n";
-            }
-            unset($url_dbname);
+            $response->addHTML(
+                PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
+            );
         }
 
         if (! isset($dbname) && ! $user_does_not_exists) {

From ef0d745786acbdce440e3c636bc89e6e3feaefab Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 7 Jul 2012 19:20:46 +0530
Subject: [PATCH 035/102] implemeetation of
 PMA_getAllUserSpecificRightsForReleventDb()

---
 libraries/server_privileges.lib.php | 62 +++++++++++++++++++++++++++++
 server_privileges.php               | 62 +----------------------------
 2 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1a6d72bf04..f4cc05add6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1720,4 +1720,66 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
     }
     return $html_output;
 }
+
+function PMA_getAllUserSpecificRightsForReleventDb($dbname, $tables)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $user_host_condition .=
+        ' AND `Db`'
+        .' LIKE \'' . $common_functions->sqlAddSlashes($dbname, true) . "'";
+
+    $tables_to_search_for_users = array('columns_priv',);
+
+    $db_rights_sqls = array();
+    foreach ($tables_to_search_for_users as $table_search_in) {
+        if (in_array($table_search_in, $tables)) {
+            $db_rights_sqls[] = '
+                SELECT DISTINCT `Table_name`
+                FROM `mysql`.' . $common_functions->backquote($table_search_in)
+               . $user_host_condition;
+        }
+    }
+
+    $user_defaults = array(
+        'Table_name'  => '',
+        'Grant_priv'  => 'N',
+        'privs'       => array('USAGE'),
+        'Column_priv' => true,
+    );
+
+    // for the rights
+    $db_rights = array();
+
+    $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
+        .' ORDER BY `Table_name` ASC';
+
+    $db_rights_result = PMA_DBI_query($db_rights_sql);
+
+    while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
+        $db_rights_row = array_merge($user_defaults, $db_rights_row);
+        $db_rights[$db_rights_row['Table_name']] = $db_rights_row;
+    }
+    PMA_DBI_free_result($db_rights_result);
+
+    $sql_query = 'SELECT `Table_name`,'
+        .' `Table_priv`,'
+        .' IF(`Column_priv` = _latin1 \'\', 0, 1)'
+        .' AS \'Column_priv\''
+        .' FROM `mysql`.`tables_priv`'
+        . $user_host_condition
+        .' ORDER BY `Table_name` ASC;';
+    $result = PMA_DBI_query($sql_query);
+    $sql_query = '';
+
+    while ($row = PMA_DBI_fetch_assoc($result)) {
+        if (isset($db_rights[$row['Table_name']])) {
+            $db_rights[$row['Table_name']] = array_merge($db_rights[$row['Table_name']], $row);
+        } else {
+            $db_rights[$row['Table_name']] = $row;
+        }
+    }
+    PMA_DBI_free_result($res);
+    return $db_rights;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 89e6fcfb35..8f6c1b1c1a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1156,69 +1156,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 unset($row, $res);
 
             } else {
-
                 // db name was given,
                 // so we want all user specific rights for this db
-
-                $user_host_condition .=
-                    ' AND `Db`'
-                    .' LIKE \'' . $common_functions->sqlAddSlashes($dbname, true) . "'";
-
-                $tables_to_search_for_users = array(
-                    'columns_priv',
-                );
-
-                $db_rights_sqls = array();
-                foreach ($tables_to_search_for_users as $table_search_in) {
-                    if (in_array($table_search_in, $tables)) {
-                        $db_rights_sqls[] = '
-                            SELECT DISTINCT `Table_name`
-                                   FROM `mysql`.' . $common_functions->backquote($table_search_in)
-                                   . $user_host_condition;
-                    }
-                }
-
-                $user_defaults = array(
-                    'Table_name'  => '',
-                    'Grant_priv'  => 'N',
-                    'privs'       => array('USAGE'),
-                    'Column_priv' => true,
-                );
-
-                // for the rights
-                $db_rights = array();
-
-                $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-                    .' ORDER BY `Table_name` ASC';
-
-                $db_rights_result = PMA_DBI_query($db_rights_sql);
-
-                while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
-                    $db_rights_row = array_merge($user_defaults, $db_rights_row);
-                    $db_rights[$db_rights_row['Table_name']] = $db_rights_row;
-                }
-                PMA_DBI_free_result($db_rights_result);
-                unset($db_rights_sql, $db_rights_sqls, $db_rights_result, $db_rights_row);
-
-                $sql_query = 'SELECT `Table_name`,'
-                    .' `Table_priv`,'
-                    .' IF(`Column_priv` = _latin1 \'\', 0, 1)'
-                    .' AS \'Column_priv\''
-                    .' FROM `mysql`.`tables_priv`'
-                    . $user_host_condition
-                    .' ORDER BY `Table_name` ASC;';
-                $res = PMA_DBI_query($sql_query);
-                $sql_query = '';
-
-                while ($row = PMA_DBI_fetch_assoc($res)) {
-                    if (isset($db_rights[$row['Table_name']])) {
-                        $db_rights[$row['Table_name']] = array_merge($db_rights[$row['Table_name']], $row);
-                    } else {
-                        $db_rights[$row['Table_name']] = $row;
-                    }
-                }
-                PMA_DBI_free_result($res);
-                unset($row, $res);
+                $db_rights = PMA_getAllUserSpecificRightsForReleventDb($dbname, $tables);
             }
             ksort($db_rights);
 

From 1d166192321554bcfdb771b7dd3b48642ba04886 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 05:40:34 +0530
Subject: [PATCH 036/102] Edit privileges section impelementation and remove
 duplicate code

---
 libraries/server_privileges.lib.php | 87 ++++++++++++++++++++---------
 server_privileges.php               | 83 +++------------------------
 2 files changed, 71 insertions(+), 99 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f4cc05add6..b61eebdd38 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1721,65 +1721,102 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
     return $html_output;
 }
 
-function PMA_getAllUserSpecificRightsForReleventDb($dbname, $tables)
+/**
+ * no db name given, so we want all privs for the given user
+ * db name was given, so we want all user specific rights for this db
+ * So this function returns user rights as an array
+ * 
+ * @param string $dbname                database name
+ * @param array $tables                 tables
+ * @param string $user_host_condition   a where clause that containd user's host condition
+ * 
+ * @return array $db_rights             database rights
+ */
+function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
+
+    if (! isset($dbname)) {
+        $tables_to_search_for_users = array(
+            'tables_priv', 'columns_priv',
+        );
+        $dbOrTableName = 'Db';
+    } else {
+        $user_host_condition .=
+            ' AND `Db`'
+            .' LIKE \'' . $common_functions->sqlAddSlashes($dbname, true) . "'";
+        $tables_to_search_for_users = array('columns_priv',);
+        $dbOrTableName = 'Table_name';
+    }
     
-    $user_host_condition .=
-        ' AND `Db`'
-        .' LIKE \'' . $common_functions->sqlAddSlashes($dbname, true) . "'";
-
-    $tables_to_search_for_users = array('columns_priv',);
-
     $db_rights_sqls = array();
     foreach ($tables_to_search_for_users as $table_search_in) {
         if (in_array($table_search_in, $tables)) {
             $db_rights_sqls[] = '
-                SELECT DISTINCT `Table_name`
+                SELECT DISTINCT `' . $dbOrTableName .'`
                 FROM `mysql`.' . $common_functions->backquote($table_search_in)
                . $user_host_condition;
         }
     }
 
     $user_defaults = array(
-        'Table_name'  => '',
-        'Grant_priv'  => 'N',
-        'privs'       => array('USAGE'),
-        'Column_priv' => true,
+        $dbOrTableName  => '',
+        'Grant_priv'    => 'N',
+        'privs'         => array('USAGE'),
+        'Column_priv'   => true,
     );
 
     // for the rights
     $db_rights = array();
 
     $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-        .' ORDER BY `Table_name` ASC';
+        .' ORDER BY `' . $dbOrTableName .'` ASC';
 
     $db_rights_result = PMA_DBI_query($db_rights_sql);
 
     while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
         $db_rights_row = array_merge($user_defaults, $db_rights_row);
-        $db_rights[$db_rights_row['Table_name']] = $db_rights_row;
+         if (! isset($dbname)) {
+            // only Db names in the table `mysql`.`db` uses wildcards
+            // as we are in the db specific rights display we want
+            // all db names escaped, also from other sources
+            $db_rights_row['Db'] = $common_functions->escapeMysqlWildcards(
+                $db_rights_row['Db']
+            );
+         }
+        $db_rights[$db_rights_row[$dbOrTableName]] = $db_rights_row;
     }
+
     PMA_DBI_free_result($db_rights_result);
 
-    $sql_query = 'SELECT `Table_name`,'
-        .' `Table_priv`,'
-        .' IF(`Column_priv` = _latin1 \'\', 0, 1)'
-        .' AS \'Column_priv\''
-        .' FROM `mysql`.`tables_priv`'
-        . $user_host_condition
-        .' ORDER BY `Table_name` ASC;';
+    if (! isset($dbname)) {
+        $sql_query = 'SELECT * FROM `mysql`.`db`' . $user_host_condition . ' ORDER BY `Db` ASC';
+    } else {
+        $sql_query = 'SELECT `Table_name`,'
+            .' `Table_priv`,'
+            .' IF(`Column_priv` = _latin1 \'\', 0, 1)'
+            .' AS \'Column_priv\''
+            .' FROM `mysql`.`tables_priv`'
+            . $user_host_condition
+            .' ORDER BY `Table_name` ASC;';
+    }
+
     $result = PMA_DBI_query($sql_query);
     $sql_query = '';
 
     while ($row = PMA_DBI_fetch_assoc($result)) {
-        if (isset($db_rights[$row['Table_name']])) {
-            $db_rights[$row['Table_name']] = array_merge($db_rights[$row['Table_name']], $row);
+        if (isset($db_rights[$row[$dbOrTableName]])) {
+            $db_rights[$row[$dbOrTableName]] = array_merge($db_rights[$row[$dbOrTableName]], $row);
         } else {
-            $db_rights[$row['Table_name']] = $row;
+            $db_rights[$row[$dbOrTableName]] = $row;
+        }
+        if (! isset($dbname)) {
+            // there are db specific rights for this user
+            // so we can drop this db rights
+            $db_rights[$row['Db']]['can_delete'] = true;
         }
     }
-    PMA_DBI_free_result($res);
+    PMA_DBI_free_result($result);
     return $db_rights;
 }
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 8f6c1b1c1a..5b28c5b726 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1091,75 +1091,13 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
             // we also want privielgs for this user not in table `db` but in other table
             $tables = PMA_DBI_fetch_result('SHOW TABLES FROM `mysql`;');
-            if (! isset($dbname)) {
 
-                // no db name given, so we want all privs for the given user
-
-                $tables_to_search_for_users = array(
-                    'tables_priv', 'columns_priv',
-                );
-
-                $db_rights_sqls = array();
-                foreach ($tables_to_search_for_users as $table_search_in) {
-                    if (in_array($table_search_in, $tables)) {
-                        $db_rights_sqls[] = '
-                            SELECT DISTINCT `Db`
-                                   FROM `mysql`.' . $common_functions->backquote($table_search_in)
-                                   . $user_host_condition;
-                    }
-                }
-
-                $user_defaults = array(
-                    'Db'          => '',
-                    'Grant_priv'  => 'N',
-                    'privs'       => array('USAGE'),
-                    'Table_privs' => true,
-                );
-
-                // for the rights
-                $db_rights = array();
-
-                $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-                    .' ORDER BY `Db` ASC';
-
-                $db_rights_result = PMA_DBI_query($db_rights_sql);
-
-                while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
-                    $db_rights_row = array_merge($user_defaults, $db_rights_row);
-                    // only Db names in the table `mysql`.`db` uses wildcards
-                    // as we are in the db specific rights display we want
-                    // all db names escaped, also from other sources
-                    $db_rights_row['Db'] = $common_functions->escapeMysqlWildcards(
-                        $db_rights_row['Db']
-                    );
-                    $db_rights[$db_rights_row['Db']] = $db_rights_row;
-                }
-
-                PMA_DBI_free_result($db_rights_result);
-                unset($db_rights_sql, $db_rights_sqls, $db_rights_result, $db_rights_row);
-
-                $sql_query = 'SELECT * FROM `mysql`.`db`' . $user_host_condition . ' ORDER BY `Db` ASC';
-                $res = PMA_DBI_query($sql_query);
-                $sql_query = '';
-
-                while ($row = PMA_DBI_fetch_assoc($res)) {
-                    if (isset($db_rights[$row['Db']])) {
-                        $db_rights[$row['Db']] = array_merge($db_rights[$row['Db']], $row);
-                    } else {
-                        $db_rights[$row['Db']] = $row;
-                    }
-                    // there are db specific rights for this user
-                    // so we can drop this db rights
-                    $db_rights[$row['Db']]['can_delete'] = true;
-                }
-                PMA_DBI_free_result($res);
-                unset($row, $res);
-
-            } else {
-                // db name was given,
-                // so we want all user specific rights for this db
-                $db_rights = PMA_getAllUserSpecificRightsForReleventDb($dbname, $tables);
-            }
+            /**
+             * no db name given, so we want all privs for the given user
+             * db name was given, so we want all user specific rights for this db
+             */
+            $db_rights = PMA_getUserSpecificRights($dbname, $tables, $user_host_condition);
+            
             ksort($db_rights);
 
             // display rows
@@ -1275,17 +1213,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
         // Provide a line with links to the relevant database and table
         if (isset($dbname) && empty($dbname_is_wildcard)) {
-            $response->addHTML(
-                PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
-            );
+            echo PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
+
         }
 
         if (! isset($dbname) && ! $user_does_not_exists) {
             //change login information
             include_once 'libraries/display_change_password.lib.php';
-            $response->addHTML(
-                PMA_changeLoginInformation($username, $hostname)
-            );
+            echo PMA_changeLoginInformation($username, $hostname);
         }
     }
 } elseif (isset($_REQUEST['adduser'])) {

From d565fe45f1a2e72113a61ada4cf92949170013d2 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 05:45:45 +0530
Subject: [PATCH 037/102] correct spelling mistake and change a function name

---
 libraries/server_privileges.lib.php | 4 ++--
 server_privileges.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index b61eebdd38..c18a030b76 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1651,14 +1651,14 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
 }
 
 /**
- * Get the HTML snippet for chane user login information 
+ * Get the HTML snippet for change user login information 
  * 
  * @param string $username  username
  * @param string $hostname  host name
  * 
  * @return string HTML snippet
  */
-function PMA_changeLoginInformation($username, $hostname)
+function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
 {
     $choices = array(
         '4' => __('... keep the old one.'),
diff --git a/server_privileges.php b/server_privileges.php
index 5b28c5b726..db55d044a0 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1220,7 +1220,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         if (! isset($dbname) && ! $user_does_not_exists) {
             //change login information
             include_once 'libraries/display_change_password.lib.php';
-            echo PMA_changeLoginInformation($username, $hostname);
+            echo PMA_getChangeLoginInformationHtmlForm($username, $hostname);
         }
     }
 } elseif (isset($_REQUEST['adduser'])) {

From 5b7d51ce875bb67e688580aae570a6028fd8aa9a Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 09:34:19 +0530
Subject: [PATCH 038/102] implement PMA_displayUserRightsInRaws

---
 libraries/server_privileges.lib.php | 84 +++++++++++++++++++++++++++++
 server_privileges.php               | 53 ++----------------
 2 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c18a030b76..5aeb873354 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1819,4 +1819,88 @@ function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
     PMA_DBI_free_result($result);
     return $db_rights;
 }
+
+/**
+ * Display user rights in table rows(Table specific or database specific privs)
+ * 
+ * @param array $db_rights   user's database rights array
+ * @param string $link_edit   standard link to edit privileges
+ * @param string $link_revoke standard link to revoke
+ * @param string $hostname    host name
+ * @param string $username    username
+ * 
+ * @return array $found_rows, $html_output
+ */
+function PMA_displayUserRightsInRaws($db_rights, $link_edit,
+    $link_revoke, $hostname, $username
+) {
+    if (PMA_isValid($_REQUEST['pred_dbname'])) {
+        $dbname = $_REQUEST['pred_dbname'];
+    } elseif (PMA_isValid($_REQUEST['dbname'])) {
+        $dbname = $_REQUEST['dbname'];
+    }
+    
+    // display rows
+    if (count($db_rights) < 1) {
+        $html_output = '<tr class="odd">' . "\n"
+           . '<td colspan="6"><center><i>' . __('None') . '</i></center></td>' . "\n"
+           . '</tr>' . "\n";
+    } else {
+        $odd_row = true;
+        $found_rows = array();
+        //while ($row = PMA_DBI_fetch_assoc($res)) {
+        foreach ($db_rights as $row) {
+            $found_rows[] = (! isset($dbname)) ? $row['Db'] : $row['Table_name'];
+
+            $html_output = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
+                . '<td>'  
+                . htmlspecialchars((! isset($dbname))
+                    ? $row['Db']
+                    : $row['Table_name'])
+                . '</td>' . "\n"
+                . '<td><code>' . "\n"
+                . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
+                . '</code></td>' . "\n"
+                . '<td>' 
+                    . ((((! isset($dbname)) && $row['Grant_priv'] == 'Y')
+                        || (isset($dbname) && in_array('Grant', explode(',', $row['Table_priv']))))
+                    ? __('Yes')
+                    : __('No'))
+                . '</td>' . "\n"
+                . '<td>';
+            if (! empty($row['Table_privs']) || ! empty ($row['Column_priv'])) {
+                $html_output .= __('Yes');
+            } else {
+                $html_output .= __('No');
+            }
+            $html_output .= '</td>' . "\n"
+               . '<td>';
+            $html_output .= sprintf(
+                $link_edit,
+                htmlspecialchars(urlencode($username)),
+                urlencode(htmlspecialchars($hostname)),
+                urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                urlencode((! isset($dbname)) ? '' : $row['Table_name'])
+            );
+            $html_output .= '</td>' . "\n"
+               . '    <td>';
+            if (! empty($row['can_delete'])
+                || isset($row['Table_name'])
+                && strlen($row['Table_name'])
+            ) {
+                $html_output .= sprintf(
+                    $link_revoke,
+                    htmlspecialchars(urlencode($username)),
+                    urlencode(htmlspecialchars($hostname)),
+                    urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                    urlencode((! isset($dbname)) ? '' : $row['Table_name'])
+                );
+            }
+            $html_output .= '</td>' . "\n"
+               . '</tr>' . "\n";
+            $odd_row = ! $odd_row;
+        } // end while
+    } //end if
+    return array($found_rows, $html_output);
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index db55d044a0..65d7b729bd 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1101,54 +1101,11 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             ksort($db_rights);
 
             // display rows
-            if (count($db_rights) < 1) {
-                echo '<tr class="odd">' . "\n"
-                   . '    <td colspan="6"><center><i>' . __('None') . '</i></center></td>' . "\n"
-                   . '</tr>' . "\n";
-            } else {
-                $odd_row = true;
-                $found_rows = array();
-                //while ($row = PMA_DBI_fetch_assoc($res)) {
-                foreach ($db_rights as $row) {
-                    $found_rows[] = (! isset($dbname)) ? $row['Db'] : $row['Table_name'];
-
-                    echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
-                       . '    <td>' . htmlspecialchars((! isset($dbname)) ? $row['Db'] : $row['Table_name']) . '</td>' . "\n"
-                       . '    <td><code>' . "\n"
-                       . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
-                       . '        </code></td>' . "\n"
-                       . '    <td>' . ((((! isset($dbname)) && $row['Grant_priv'] == 'Y') || (isset($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? __('Yes') : __('No')) . '</td>' . "\n"
-                       . '    <td>';
-                    if (! empty($row['Table_privs']) || ! empty ($row['Column_priv'])) {
-                        echo __('Yes');
-                    } else {
-                        echo __('No');
-                    }
-                    echo '</td>' . "\n"
-                       . '    <td>';
-                    printf(
-                        $link_edit,
-                        htmlspecialchars(urlencode($username)),
-                        urlencode(htmlspecialchars($hostname)),
-                        urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
-                        urlencode((! isset($dbname)) ? '' : $row['Table_name'])
-                    );
-                    echo '</td>' . "\n"
-                       . '    <td>';
-                    if (! empty($row['can_delete']) || isset($row['Table_name']) && strlen($row['Table_name'])) {
-                        printf(
-                            $link_revoke,
-                            htmlspecialchars(urlencode($username)),
-                            urlencode(htmlspecialchars($hostname)),
-                            urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
-                            urlencode((! isset($dbname)) ? '' : $row['Table_name'])
-                        );
-                    }
-                    echo '</td>' . "\n"
-                       . '</tr>' . "\n";
-                    $odd_row = ! $odd_row;
-                } // end while
-            }
+            list ($found_rows, $html_output) =  PMA_displayUserRightsInRaws(
+                $db_rights, $link_edit, $link_revoke, $hostname, $username
+            );
+            
+            echo $html_output;
             unset($row);
             echo '</tbody>' . "\n"
                . '</table>' . "\n";

From 34b38354fb27ad4bf818d10ea7dd84cba223dda5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 10:26:22 +0530
Subject: [PATCH 039/102] implement function
 PMA_getTableForDisplayAllTableSpecificRights and formatting

---
 libraries/server_privileges.lib.php | 68 ++++++++++++++++++++++++++++-
 server_privileges.php               | 46 ++-----------------
 2 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 5aeb873354..6f519f23a8 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1823,7 +1823,7 @@ function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
 /**
  * Display user rights in table rows(Table specific or database specific privs)
  * 
- * @param array $db_rights   user's database rights array
+ * @param array $db_rights    user's database rights array
  * @param string $link_edit   standard link to edit privileges
  * @param string $link_revoke standard link to revoke
  * @param string $hostname    host name
@@ -1903,4 +1903,70 @@ function PMA_displayUserRightsInRaws($db_rights, $link_edit,
     } //end if
     return array($found_rows, $html_output);
 }
+
+/**
+ * Get a HTML table for display user's tabel specific or database specific rights
+ * 
+ * @param string $username      username
+ * @param string $hostname      host name
+ * @param string $dbname        database name
+ * @param string $link_edit     standard link to edit privileges
+ * @param string $link_revoke   standard link to revoke
+ * 
+ * @return array $html_output, $found_rows
+ */
+function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
+    $dbname, $link_edit, $link_revoke
+) {
+    // table header
+    $html_output = PMA_generate_common_hidden_inputs('', '')
+        . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
+        . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
+        . '<fieldset>' . "\n"
+        . '<legend>'
+        . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges'))
+        . '</legend>' . "\n"
+        . '<table class="data">' . "\n"
+        . '<thead>' . "\n"
+        . '<tr><th>' . (! isset($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"
+        . '<th>' . __('Privileges') . '</th>' . "\n"
+        . '<th>' . __('Grant') . '</th>' . "\n"
+        . '<th>' 
+        . (! isset($dbname) ? __('Table-specific privileges') : __('Column-specific privileges'))
+        . '</th>' . "\n"
+        . '<th colspan="2">' . __('Action') . '</th>' . "\n"
+        . '</tr>' . "\n"
+        . '</thead>' . "\n";
+
+    $user_host_condition = ' WHERE `User`'
+        . ' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
+        . ' AND `Host`'
+        . ' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "'";
+
+    // table body
+    // get data
+
+    // we also want privielgs for this user not in table `db` but in other table
+    $tables = PMA_DBI_fetch_result('SHOW TABLES FROM `mysql`;');
+
+    /**
+     * no db name given, so we want all privs for the given user
+     * db name was given, so we want all user specific rights for this db
+     */
+    $db_rights = PMA_getUserSpecificRights($dbname, $tables, $user_host_condition);
+
+    ksort($db_rights);
+    
+    $html_output .= '<tbody>' . "\n";
+    // display rows
+    list ($found_rows, $html_out) =  PMA_displayUserRightsInRaws(
+        $db_rights, $link_edit, $link_revoke, $hostname, $username
+    );
+
+    $html_output .= $html_out;
+    $html_output .= '</tbody>' . "\n";
+    $html_output .='</table>' . "\n";
+    
+    return array($html_output, $found_rows);
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 65d7b729bd..2548f51ac1 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1063,52 +1063,12 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             // no table name was given, display all table specific rights
             // but only if $dbname contains no wildcards
 
-            // table header
-            echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n"
-               . PMA_generate_common_hidden_inputs('', '')
-               . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
-               . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
-               . '<fieldset>' . "\n"
-               . '<legend>' . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges')) . '</legend>' . "\n"
-               . '<table class="data">' . "\n"
-               . '<thead>' . "\n"
-               . '<tr><th>' . (! isset($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"
-               . '    <th>' . __('Privileges') . '</th>' . "\n"
-               . '    <th>' . __('Grant') . '</th>' . "\n"
-               . '    <th>' . (! isset($dbname) ? __('Table-specific privileges') : __('Column-specific privileges')) . '</th>' . "\n"
-               . '    <th colspan="2">' . __('Action') . '</th>' . "\n"
-               . '</tr>' . "\n"
-               . '</thead>' . "\n"
-               . '<tbody>' . "\n";
-
-            $user_host_condition = ' WHERE `User`'
-                . ' = \'' . $common_functions->sqlAddSlashes($username) . "'"
-                . ' AND `Host`'
-                . ' = \'' . $common_functions->sqlAddSlashes($hostname) . "'";
-
-            // table body
-            // get data
-
-            // we also want privielgs for this user not in table `db` but in other table
-            $tables = PMA_DBI_fetch_result('SHOW TABLES FROM `mysql`;');
-
-            /**
-             * no db name given, so we want all privs for the given user
-             * db name was given, so we want all user specific rights for this db
-             */
-            $db_rights = PMA_getUserSpecificRights($dbname, $tables, $user_host_condition);
+            echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
             
-            ksort($db_rights);
-
-            // display rows
-            list ($found_rows, $html_output) =  PMA_displayUserRightsInRaws(
-                $db_rights, $link_edit, $link_revoke, $hostname, $username
+            list($html_output, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
+                $username, $hostname, $dbname, $link_edit, $link_revoke
             );
-            
             echo $html_output;
-            unset($row);
-            echo '</tbody>' . "\n"
-               . '</table>' . "\n";
 
             if (! isset($dbname)) {
 

From 1074f56e7b97d73bd731adceeda7b230dee012be Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 12:12:31 +0530
Subject: [PATCH 040/102] implement PMA_displaySelectDbInEditPrivs and solved
 fetal error in server_privileges-lib script

---
 libraries/server_privileges.lib.php | 91 +++++++++++++++++++++++++++--
 server_privileges.php               | 48 +--------------
 2 files changed, 89 insertions(+), 50 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 6f519f23a8..2848591264 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -434,8 +434,8 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
         // get collumns
         $res = PMA_DBI_try_query(
             'SHOW COLUMNS FROM '
-            . PMA_backquote(PMA_unescapeMysqlWildcards($db))
-            . '.' . PMA_backquote($table) . ';'
+            . PMA_CommonFunctions::getInstance()->PMA_backquote(PMA_unescapeMysqlWildcards($db))
+            . '.' . PMA_CommonFunctions::getInstance()->PMA_backquote($table) . ';'
         );
         $columns = array();
         if ($res) {
@@ -1839,7 +1839,7 @@ function PMA_displayUserRightsInRaws($db_rights, $link_edit,
     } elseif (PMA_isValid($_REQUEST['dbname'])) {
         $dbname = $_REQUEST['dbname'];
     }
-    
+    $found_rows = array();
     // display rows
     if (count($db_rights) < 1) {
         $html_output = '<tr class="odd">' . "\n"
@@ -1847,7 +1847,6 @@ function PMA_displayUserRightsInRaws($db_rights, $link_edit,
            . '</tr>' . "\n";
     } else {
         $odd_row = true;
-        $found_rows = array();
         //while ($row = PMA_DBI_fetch_assoc($res)) {
         foreach ($db_rights as $row) {
             $found_rows[] = (! isset($dbname)) ? $row['Db'] : $row['Table_name'];
@@ -1969,4 +1968,88 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
     
     return array($html_output, $found_rows);
 }
+
+/**
+ * Get HTML for display select db
+ * 
+ * @param array $found_rows     isset($dbname)) ? $row['Db'] : $row['Table_name']
+ * 
+ * @return string HTML snippet
+ */
+function PMA_displaySelectDbInEditPrivs($found_rows)
+{
+    $pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
+
+    $html_output = '<label for="text_dbname">'
+        . __('Add privileges on the following database') . ':</label>' . "\n";
+    if (! empty($pred_db_array)) {
+        $html_output .= '    <select name="pred_dbname" class="autosubmit">' . "\n"
+            . '<option value="" selected="selected">' . __('Use text field') . ':</option>' . "\n";
+        foreach ($pred_db_array as $current_db) {
+            $current_db = PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($current_db);
+            // cannot use array_diff() once, outside of the loop,
+            // because the list of databases has special characters
+            // already escaped in $found_rows,
+            // contrary to the output of SHOW DATABASES
+            if (empty($found_rows) || ! in_array($current_db, $found_rows)) {
+                $html_output .= '<option value="' . htmlspecialchars($current_db) . '">'
+                    . htmlspecialchars($current_db) . '</option>' . "\n";
+            }
+        }
+        $html_output .= '</select>' . "\n";
+    }
+    $html_output .= '<input type="text" id="text_dbname" name="dbname" />' . "\n"
+        . PMA_CommonFunctions::getInstance()->showHint(
+            __('Wildcards % and _ should be escaped with a \ to use them literally')
+        );
+    return $html_output;
+}
+
+/**
+ * Get HTML for display table in edit privilege
+ * 
+ * @param string $dbname    database naame
+ * @param array $found_rows isset($dbname)) ? $row['Db'] : $row['Table_name']
+ * 
+ * @return string HTML snippet
+ */
+function PMA_displayTablesInEditPrivs($dbname, $found_rows)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $html_output = '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n"
+        . '<label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n";
+    
+    $result = @PMA_DBI_try_query(
+        'SHOW TABLES FROM ' . $common_functions->backquote(
+            $common_functions->unescapeMysqlWildcards($dbname)
+            ) . ';',
+        null,
+        PMA_DBI_QUERY_STORE);
+    
+    if ($result) {
+        $pred_tbl_array = array();
+        while ($row = PMA_DBI_fetch_row($result)) {
+            if (! isset($found_rows) || ! in_array($row[0], $found_rows)) {
+                $pred_tbl_array[] = $row[0];
+            }
+        }
+        PMA_DBI_free_result($result);
+
+        if (! empty($pred_tbl_array)) {
+            $html_output .= '<select name="pred_tablename" class="autosubmit">' . "\n"
+                . '<option value="" selected="selected">' . __('Use text field')
+                . ':</option>' . "\n";
+            foreach ($pred_tbl_array as $current_table) {
+                $html_output .= '<option value="' . htmlspecialchars($current_table) . '">'
+                    . htmlspecialchars($current_table)
+                    . '</option>' . "\n";
+            }
+            $html_output .= '</select>' . "\n";
+        }
+    }
+    $html_output .= '<input type="text" id="text_tablename" name="tablename" />' . "\n";
+    
+    return $html_output;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 2548f51ac1..9c5713583b 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1071,61 +1071,17 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             echo $html_output;
 
             if (! isset($dbname)) {
-
                 // no database name was given, display select db
+                echo PMA_displaySelectDbInEditPrivs($found_rows);
 
-                $pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
-
-                echo '    <label for="text_dbname">' . __('Add privileges on the following database') . ':</label>' . "\n";
-                if (! empty($pred_db_array)) {
-                    echo '    <select name="pred_dbname" class="autosubmit">' . "\n"
-                       . '        <option value="" selected="selected">' . __('Use text field') . ':</option>' . "\n";
-                    foreach ($pred_db_array as $current_db) {
-                        $current_db = $common_functions->escapeMysqlWildcards($current_db);
-                        // cannot use array_diff() once, outside of the loop,
-                        // because the list of databases has special characters
-                        // already escaped in $found_rows,
-                        // contrary to the output of SHOW DATABASES
-                        if (empty($found_rows) || ! in_array($current_db, $found_rows)) {
-                            echo '        <option value="' . htmlspecialchars($current_db) . '">'
-                                . htmlspecialchars($current_db) . '</option>' . "\n";
-                        }
-                    }
-                    echo '    </select>' . "\n";
-                }
-                echo '    <input type="text" id="text_dbname" name="dbname" />' . "\n"
-                    . $common_functions->showHint(__('Wildcards % and _ should be escaped with a \ to use them literally'));
             } else {
-                echo '    <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n"
-                   . '    <label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n";
-                if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . $common_functions->backquote($common_functions->unescapeMysqlWildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) {
-                    $pred_tbl_array = array();
-                    while ($row = PMA_DBI_fetch_row($res)) {
-                        if (! isset($found_rows) || ! in_array($row[0], $found_rows)) {
-                            $pred_tbl_array[] = $row[0];
-                        }
-                    }
-                    PMA_DBI_free_result($res);
-                    unset($res, $row);
-                    if (! empty($pred_tbl_array)) {
-                        echo '    <select name="pred_tablename" class="autosubmit">' . "\n"
-                           . '        <option value="" selected="selected">' . __('Use text field') . ':</option>' . "\n";
-                        foreach ($pred_tbl_array as $current_table) {
-                            echo '        <option value="' . htmlspecialchars($current_table) . '">' . htmlspecialchars($current_table) . '</option>' . "\n";
-                        }
-                        echo '    </select>' . "\n";
-                    }
-                } else {
-                    unset($res);
-                }
-                echo '    <input type="text" id="text_tablename" name="tablename" />' . "\n";
+                echo PMA_displayTablesInEditPrivs($dbname, $found_rows);
             }
             echo '</fieldset>' . "\n";
             echo '<fieldset class="tblFooters">' . "\n"
                . '    <input type="submit" value="' . __('Go') . '" />'
                . '</fieldset>' . "\n"
                . '</form>' . "\n";
-
         }
 
         // Provide a line with links to the relevant database and table

From 5b0a2626983b867b75da1b28f2ff3b6cae8bfa06 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 14:55:05 +0530
Subject: [PATCH 041/102] functions for display user overview

---
 libraries/server_privileges.lib.php | 204 ++++++++++++++++++++++++++++
 server_privileges.php               | 123 +----------------
 2 files changed, 206 insertions(+), 121 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 2848591264..a25eeef126 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2052,4 +2052,208 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
     
     return $html_output;
 }
+
+/**
+ * Display the user overview
+ * (if less than 50 users, display them immediately)
+ * 
+ * @param array $result             ran sql query
+ * @param array $db_rights          user's database rights array
+ * @param string $link_edit         standard link to edit privileges
+ * @param string $pmaThemeImage     a image source link
+ * @param string $text_dir          text directory
+ * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
+ * @param string $link_export       standard link to export privileges
+ * @param string $link_export_all   standard link to export all privilegfes
+ * 
+ * @return string HTML snippet
+ */
+function PMA_displayUserOverview($result, $db_rights, $link_edit, $pmaThemeImage,
+    $text_dir, $conditional_class, $link_export, $link_export_all
+) {
+    $common_functions = PMA_CommonFunctions::getInstance();
+
+    while ($row = PMA_DBI_fetch_assoc($result)) {
+        $row['privs'] = PMA_extractPrivInfo($row, true);
+        $db_rights[$row['User']][$row['Host']] = $row;
+    }
+    @PMA_DBI_free_result($result);
+
+    $html_output = 
+        '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"
+        . PMA_generate_common_hidden_inputs('', '')
+        . '<table id="tableuserrights" class="data">' . "\n"
+        . '<thead>' . "\n"
+        . '<tr><th></th>' . "\n"
+        . '<th>' . __('User') . '</th>' . "\n"
+        . '<th>' . __('Host') . '</th>' . "\n"
+        . '<th>' . __('Password') . '</th>' . "\n"
+        . '<th>' . __('Global privileges') . ' '
+        . $common_functions->showHint(__('Note: MySQL privilege names are expressed in English'))
+        . '</th>' . "\n"
+        . '<th>' . __('Grant') . '</th>' . "\n"
+        . '<th colspan="2">' . __('Action') . '</th>' . "\n"
+        . '</tr>' . "\n"
+        . '</thead>' . "\n";
+    
+    $html_output .= '<tbody>' . "\n";
+    $html_output .= PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export);
+    $html_output .= '</tbody>'
+        . '</table>' . "\n";
+    
+    $html_output .='<div>'
+        .'<div style="float:left;">'
+        .'<img class="selectallarrow"'
+        .' src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png"'
+        .' width="38" height="22"'
+        .' alt="' . __('With selected:') . '" />' . "\n"
+        .'<input type="checkbox" id="checkall" title="' . __('Check All') . '" /> '
+        .'<label for="checkall">' . __('Check All') . '</label> '
+        .'<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
+
+    $html_output .= $common_functions->getButtonOrImage(
+        'submit_mult', 'mult_submit', 'submit_mult_export',
+        __('Export'), 'b_tblexport.png', 'export'
+    );
+    $html_output .= '<input type="hidden" name="initial" value="' . (isset($_GET['initial']) ? $_GET['initial'] : '') . '" />';
+    $html_output .= '</div>'
+        . '<div class="clear_both" style="clear:both"></div>'
+        . '<div style="float:left; padding-left:10px;">'
+        . sprintf($link_export_all, urlencode('%'), urlencode('%'), (isset($_GET['initial']) ? $_GET['initial'] : ''));
+    $html_output .= '</div>'
+        . '</div>'
+        . '<div class="clear_both" style="clear:both"></div>';
+
+    // add/delete user fieldset
+    $html_output .= PMA_getFieldsetForAddDeleteUser($conditional_class);
+    $html_output .= '</form>' . "\n";
+
+    return $html_output;
+}
+
+/**
+ * Get table body for 'tableuserrights' table in userform
+ * 
+ * @param array $db_rights      user's database rights array
+ * @param string $link_edit     standard link to edit privileges
+ * @param string $link_export   Link for export all users
+ * 
+ * @return string HTML snippet
+ */
+function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export)
+{
+    $_SESSION['user_host_pairs'] = array();
+    $pair_count = 0;
+    $odd_row = true;
+    $index_checkbox = -1;
+    $html_output = '';
+    foreach ($db_rights as $user) {
+        $index_checkbox++;
+        ksort($user);
+        foreach ($user as $host) {
+            $index_checkbox++;
+            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
+            $html_output .= '<td><input type="checkbox" class="checkall" name="selected_usr[]" id="checkbox_sel_users_'
+                . $index_checkbox . '" value="'
+                . htmlspecialchars($host['User'] . '&amp;#27;' . $host['Host'])
+                . '"'
+                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+                . ' /></td>' . "\n";
+            
+            $html_output .= '<td><label for="checkbox_sel_users_' . $index_checkbox . '">'
+                . (empty($host['User'])
+                    ? '<span style="color: #FF0000">' . __('Any') . '</span>'
+                    : htmlspecialchars($host['User'])) . '</label></td>' . "\n"
+                . '<td>' . htmlspecialchars($host['Host']) . '</td>' . "\n";
+            
+            $html_output .= '<td>';
+            switch ($host['Password']) {
+            case 'Y':
+                $html_output .= __('Yes');
+                break;
+            case 'N':
+                $html_output .= '<span style="color: #FF0000">' . __('No') . '</span>';
+                break;
+            // this happens if this is a definition not coming from mysql.user
+            default:
+                $html_output .= '--'; // in future version, replace by "not present"
+                break;
+            } // end switch
+            $html_output .= '</td>' . "\n";
+            
+            $html_output .= '<td><code>' . "\n"
+                . '' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
+                . '</code></td>' . "\n"
+                . '<td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
+                . '<td class="center">'
+                . sprintf($link_edit, urlencode($host['User']),
+                    urlencode($host['Host']), '', ''
+                );
+            $html_output .= '</td>';
+            
+            $html_output .= '<td class="center">';
+            $html_output .= sprintf($link_export, urlencode($host['User']),
+                urlencode($host['Host']),
+                (isset($_GET['initial']) ? $_GET['initial'] : '')
+            );
+            $html_output .= '</td>';
+            $html_output .= '</tr>';
+            $odd_row = ! $odd_row;
+
+            $_SESSION['user_host_pairs'][$pair_count]['user'] = $host['User'];
+            $_SESSION['user_host_pairs'][$pair_count]['host'] = $host['Host'];
+            $pair_count ++;
+        }
+    }
+    return $html_output;
+}
+
+/**
+ * Get HTML fieldset for Add/Delete user
+ * 
+ * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
+ * 
+ * @return string HTML snippet
+ */
+function PMA_getFieldsetForAddDeleteUser($conditional_class)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+
+    $html_output = '<fieldset id="fieldset_add_user">' . "\n";
+    $html_output .= '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1"'
+        . 'class="' . $conditional_class . '">' . "\n"
+        . $common_functions->getIcon('b_usradd.png')
+        . '            ' . __('Add user') . '</a>' . "\n";
+    $html_output .= '</fieldset>' . "\n";
+    
+    $html_output .= '<fieldset id="fieldset_delete_user">'
+        . '<legend>' . "\n"
+        . $common_functions->getIcon('b_usrdrop.png')
+        . '            ' . __('Remove selected users') . '' . "\n"
+        . '</legend>' . "\n";
+    
+    $html_output .= '<input type="hidden" name="mode" value="2" />' . "\n"
+        . '(' . __('Revoke all active privileges from the users and delete them afterwards.') . ')'
+        . '<br />' . "\n";
+    
+    $html_output .= '<input type="checkbox" '
+        . 'title="' . __('Drop the databases that have the same names as the users.') . '" '
+        . 'name="drop_users_db" id="checkbox_drop_users_db" />' . "\n";
+    
+    $html_output .= '<label for="checkbox_drop_users_db" '
+        . 'title="' . __('Drop the databases that have the same names as the users.') . '">' . "\n"
+        . '            ' . __('Drop the databases that have the same names as the users.') . "\n"
+        . '</label>' . "\n"
+        . '</fieldset>' . "\n";
+    
+    $html_output .= '<fieldset id="fieldset_delete_user_footer" class="tblFooters">' . "\n";
+    $html_output .= '<input type="submit" name="delete" '
+        . 'value="' . __('Go') . '" id="buttonGo" '
+        . 'class="' . $conditional_class . '"/>' . "\n";
+    
+    $html_output .= '</fieldset>' . "\n";
+    
+    return $html_output;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 9c5713583b..300e256092 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -844,127 +844,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
             if (isset($initial) || isset($showall) || PMA_DBI_num_rows($res) < 50) {
 
-                while ($row = PMA_DBI_fetch_assoc($res)) {
-                    $row['privs'] = PMA_extractPrivInfo($row, true);
-                    $db_rights[$row['User']][$row['Host']] = $row;
-                }
-                @PMA_DBI_free_result($res);
-                unset($res);
-
-                echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"
-                   . PMA_generate_common_hidden_inputs('', '')
-                   . '    <table id="tableuserrights" class="data">' . "\n"
-                   . '    <thead>' . "\n"
-                   . '        <tr><th></th>' . "\n"
-                   . '            <th>' . __('User') . '</th>' . "\n"
-                   . '            <th>' . __('Host') . '</th>' . "\n"
-                   . '            <th>' . __('Password') . '</th>' . "\n"
-                   . '            <th>' . __('Global privileges') . ' '
-                   . $common_functions->showHint(__('Note: MySQL privilege names are expressed in English')) . '</th>' . "\n"
-                   . '            <th>' . __('Grant') . '</th>' . "\n"
-                   . '            <th colspan="2">' . __('Action') . '</th>' . "\n";
-                echo '        </tr>' . "\n";
-                echo '    </thead>' . "\n";
-                echo '    <tbody>' . "\n";
-
-                $_SESSION['user_host_pairs'] = array();
-                $pair_count = 0;
-                $odd_row = true;
-                $index_checkbox = -1;
-                foreach ($db_rights as $user) {
-                    $index_checkbox++;
-                    ksort($user);
-                    foreach ($user as $host) {
-                        $index_checkbox++;
-                        echo '        <tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
-                           . '            <td><input type="checkbox" class="checkall" name="selected_usr[]" id="checkbox_sel_users_'
-                            . $index_checkbox . '" value="'
-                            . htmlspecialchars($host['User'] . '&amp;#27;' . $host['Host'])
-                            . '"'
-                            . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-                            . ' /></td>' . "\n"
-                           . '            <td><label for="checkbox_sel_users_' . $index_checkbox . '">' . (empty($host['User']) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($host['User'])) . '</label></td>' . "\n"
-                           . '            <td>' . htmlspecialchars($host['Host']) . '</td>' . "\n";
-                        echo '            <td>';
-                        switch ($host['Password']) {
-                        case 'Y':
-                            echo __('Yes');
-                            break;
-                        case 'N':
-                            echo '<span style="color: #FF0000">' . __('No') . '</span>';
-                            break;
-                        // this happens if this is a definition not coming from mysql.user
-                        default:
-                            echo '--'; // in future version, replace by "not present"
-                            break;
-                        } // end switch
-                        echo '</td>' . "\n"
-                           . '            <td><code>' . "\n"
-                           . '                ' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
-                           . '                </code></td>' . "\n"
-                           . '            <td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
-                           . '            <td class="center">';
-                        printf($link_edit, urlencode($host['User']), urlencode($host['Host']), '', '');
-                        echo '</td>';
-                        echo '<td class="center">';
-                        printf($link_export, urlencode($host['User']), urlencode($host['Host']), (isset($initial) ? $initial : ''));
-                        echo '</td>';
-                        echo '</tr>';
-                        $odd_row = ! $odd_row;
-
-                        $_SESSION['user_host_pairs'][$pair_count]['user'] = $host['User'];
-                        $_SESSION['user_host_pairs'][$pair_count]['host'] = $host['Host'];
-                        $pair_count ++;
-                    }
-                }
-
-                unset($user, $host, $odd_row);
-                echo '    </tbody></table>' . "\n"
-                   .'<div>'
-                   .'<div style="float:left;">'
-                   .'<img class="selectallarrow"'
-                   .' src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png"'
-                   .' width="38" height="22"'
-                   .' alt="' . __('With selected:') . '" />' . "\n"
-                   .'<input type="checkbox" id="checkall" title="' . __('Check All') . '" /> '
-                   .'<label for="checkall">' . __('Check All') . '</label> '
-                   .'<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
-
-                echo $common_functions->getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_export',
-                    __('Export'), 'b_tblexport.png', 'export'
+                echo PMA_displayUserOverview($res, $db_rights, $link_edit,
+                    $pmaThemeImage, $text_dir, $conditional_class, $link_export, $link_export_all
                 );
-                echo '<input type="hidden" name="initial" value="' . (isset($initial) ? $initial : '') . '" />';
-                echo '</div>'
-                   . '<div class="clear_both" style="clear:both"></div>'
-                   . '<div style="float:left; padding-left:10px;">';
-                printf($link_export_all, urlencode('%'), urlencode('%'), (isset($initial) ? $initial : ''));
-                echo '</div>'
-                   . '</div>'
-                   . '<div class="clear_both" style="clear:both"></div>';
-
-                // add/delete user fieldset
-                echo '    <fieldset id="fieldset_add_user">' . "\n"
-                   . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
-                   . $common_functions->getIcon('b_usradd.png')
-                   . '            ' . __('Add user') . '</a>' . "\n"
-                   . '    </fieldset>' . "\n"
-                   . '    <fieldset id="fieldset_delete_user">'
-                   . '        <legend>' . "\n"
-                   . $common_functions->getIcon('b_usrdrop.png')
-                   . '            ' . __('Remove selected users') . '' . "\n"
-                   . '        </legend>' . "\n"
-                   . '        <input type="hidden" name="mode" value="2" />' . "\n"
-                   . '(' . __('Revoke all active privileges from the users and delete them afterwards.') . ')<br />' . "\n"
-                   . '        <input type="checkbox" title="' . __('Drop the databases that have the same names as the users.') . '" name="drop_users_db" id="checkbox_drop_users_db" />' . "\n"
-                   . '        <label for="checkbox_drop_users_db" title="' . __('Drop the databases that have the same names as the users.') . '">' . "\n"
-                   . '            ' . __('Drop the databases that have the same names as the users.') . "\n"
-                   . '        </label>' . "\n"
-                   . '    </fieldset>' . "\n"
-                   . '    <fieldset id="fieldset_delete_user_footer" class="tblFooters">' . "\n"
-                   . '        <input type="submit" name="delete" value="' . __('Go') . '" id="buttonGo" class="' . $conditional_class . '"/>' . "\n"
-                   . '    </fieldset>' . "\n"
-                   . '</form>' . "\n";
             } else {
 
                 unset ($row);
@@ -1025,7 +907,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         }
         echo '</h2>' . "\n";
 
-
         $sql = "SELECT '1' FROM `mysql`.`user`"
             . " WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
             . " AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";

From 3f52b6e70c62346fcc9fd177ffdf40fbb1d67c08 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 18:20:14 +0530
Subject: [PATCH 042/102] correct spelling mistake and chane functions names

---
 libraries/server_privileges.lib.php | 8 ++++----
 server_privileges.php               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index a25eeef126..70986244c6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -431,7 +431,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
         }
         unset($row['Table_priv'], $current_grant, $av_grants, $users_grants);
 
-        // get collumns
+        // get columns
         $res = PMA_DBI_try_query(
             'SHOW COLUMNS FROM '
             . PMA_CommonFunctions::getInstance()->PMA_backquote(PMA_unescapeMysqlWildcards($db))
@@ -1831,7 +1831,7 @@ function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
  * 
  * @return array $found_rows, $html_output
  */
-function PMA_displayUserRightsInRaws($db_rights, $link_edit,
+function PMA_getHtmlForDisplayUserRightsInRaws($db_rights, $link_edit,
     $link_revoke, $hostname, $username
 ) {
     if (PMA_isValid($_REQUEST['pred_dbname'])) {
@@ -1958,7 +1958,7 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
     
     $html_output .= '<tbody>' . "\n";
     // display rows
-    list ($found_rows, $html_out) =  PMA_displayUserRightsInRaws(
+    list ($found_rows, $html_out) =  PMA_getHtmlForDisplayUserRightsInRows(
         $db_rights, $link_edit, $link_revoke, $hostname, $username
     );
 
@@ -1976,7 +1976,7 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
  * 
  * @return string HTML snippet
  */
-function PMA_displaySelectDbInEditPrivs($found_rows)
+function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows)
 {
     $pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
 
diff --git a/server_privileges.php b/server_privileges.php
index 300e256092..8d4edafcb2 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -953,7 +953,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
             if (! isset($dbname)) {
                 // no database name was given, display select db
-                echo PMA_displaySelectDbInEditPrivs($found_rows);
+                echo PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows);
 
             } else {
                 echo PMA_displayTablesInEditPrivs($dbname, $found_rows);

From efbba643500358ef6fed352b7180d6e5e3077225 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 8 Jul 2012 21:52:23 +0530
Subject: [PATCH 043/102] correct spelling mistake

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 70986244c6..5184af4484 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1831,7 +1831,7 @@ function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
  * 
  * @return array $found_rows, $html_output
  */
-function PMA_getHtmlForDisplayUserRightsInRaws($db_rights, $link_edit,
+function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
     $link_revoke, $hostname, $username
 ) {
     if (PMA_isValid($_REQUEST['pred_dbname'])) {

From e72e4ef7f46a1ca12dc74c4444bb97acb376bb26 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 9 Jul 2012 05:52:15 +0530
Subject: [PATCH 044/102] formating

---
 server_privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_privileges.php b/server_privileges.php
index 8d4edafcb2..247f3c9468 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -634,7 +634,7 @@ if ($GLOBALS['is_ajax_request']
     && ! isset($_REQUEST['db_specific']))
 {
     $isPass = false;
-    if(isset($password)) {
+    if (isset($password)) {
         $isPass = true;
     }
     $extra_data = PMA_getExtraDataForAjaxBehavior( $isPass,

From 4542651db19e32e3ebb7bc07899905fa3e857235 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 9 Jul 2012 06:37:02 +0530
Subject: [PATCH 045/102] implementation of PMA_getHtmlForDisplayTheInitials

---
 libraries/server_privileges.lib.php | 52 +++++++++++++++++++++++++++++
 server_privileges.php               | 30 +----------------
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 5184af4484..27d20c5c7b 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2256,4 +2256,56 @@ function PMA_getFieldsetForAddDeleteUser($conditional_class)
     return $html_output;
 }
 
+/**
+ * Get HTML for Displays the initials
+ * 
+ * @param array $array_initials     array for all initials, even non A-Z
+ * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
+ * 
+ * @return string HTML snippet
+ */
+function PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class)
+{
+    // initialize to false the letters A-Z
+    for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
+        if (! isset($array_initials[chr($letter_counter + 64)])) {
+            $array_initials[chr($letter_counter + 64)] = false;
+        }
+    }
+
+    $initials = PMA_DBI_try_query(
+        'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC',
+        null,
+        PMA_DBI_QUERY_STORE
+    );
+    while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) {
+        $array_initials[$tmp_initial] = true;
+    }
+
+    // Display the initials, which can be any characters, not
+    // just letters. For letters A-Z, we add the non-used letters
+    // as greyed out.
+
+    uksort($array_initials, "strnatcasecmp");
+
+    $html_output = '<table id="initials_table" class="' . $conditional_class . '" <cellspacing="5">'
+        . '<tr>';
+    foreach ($array_initials as $tmp_initial => $initial_was_found) {
+        if ($initial_was_found) {
+            $html_output .= '<td>'
+                . '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;'
+                . 'initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a>'
+                . '</td>' . "\n";
+        } else {
+            $html_output .= '<td>' . $tmp_initial . '</td>';
+        }
+    }
+    $html_output .= '<td>'
+        . '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;showall=1" '
+        . 'class="nowrap">[' . __('Show all') . ']</a></td>' . "\n";
+    $html_output .= '</tr></table>';
+    
+    return $html_output;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 247f3c9468..b5599bdd6a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -806,35 +806,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
              * Also not necassary if there is less than 20 privileges
              */
             if ($GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) {
-
-                // initialize to false the letters A-Z
-                for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
-                    if (! isset($array_initials[chr($letter_counter + 64)])) {
-                        $array_initials[chr($letter_counter + 64)] = false;
-                    }
-                }
-
-                $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE);
-                while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) {
-                    $array_initials[$tmp_initial] = true;
-                }
-
-                // Display the initials, which can be any characters, not
-                // just letters. For letters A-Z, we add the non-used letters
-                // as greyed out.
-
-                uksort($array_initials, "strnatcasecmp");
-
-                echo '<table id="initials_table" class="' . $conditional_class . '" <cellspacing="5"><tr>';
-                foreach ($array_initials as $tmp_initial => $initial_was_found) {
-                    if ($initial_was_found) {
-                        echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n";
-                    } else {
-                        echo '<td>' . $tmp_initial . '</td>';
-                    }
-                }
-                echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;showall=1" class="nowrap">[' . __('Show all') . ']</a></td>' . "\n";
-                echo '</tr></table>';
+                echo PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class);
             }
 
             /**

From e88b83c8198d29869e88f2ac01387a1bf14b2da8 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 9 Jul 2012 06:41:29 +0530
Subject: [PATCH 046/102] formatting

---
 server_privileges.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index b5599bdd6a..9142c88c90 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -833,8 +833,15 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 exit;
             }
 
-            $flushnote = new PMA_Message(__('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.'), PMA_Message::NOTICE);
-            $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;flush_privileges=1" id="reload_privileges_anchor" class="' . $conditional_class . '">', false);
+            $flushnote = new PMA_Message(
+                __('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.')
+                , PMA_Message::NOTICE
+            );
+            $flushnote->addParam(
+                '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;'
+                    . 'flush_privileges=1" id="reload_privileges_anchor" '
+                    . 'class="' . $conditional_class . '">',
+                false);
             $flushnote->addParam('</a>', false);
             $flushnote->display();
         }

From 146fdf49bbf76c458d44556e5ea8fe54d4a1145b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 9 Jul 2012 07:00:30 +0530
Subject: [PATCH 047/102] implement PMA_getDbRightsForUserOverview()

---
 libraries/server_privileges.lib.php | 49 +++++++++++++++++++++++++++++
 server_privileges.php               | 43 ++-----------------------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 27d20c5c7b..c2f0edd1d4 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2308,4 +2308,53 @@ function PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class)
     return $html_output;
 }
 
+/**
+ * Get the database rigths array for Display user overview
+ * 
+ * @return array  $db_rights    database rights array
+ */
+function PMA_getDbRightsForUserOverview()
+{
+    // we also want users not in table `user` but in other table
+    $tables = PMA_DBI_fetch_result('SHOW TABLES FROM `mysql`;');
+
+    $tables_to_search_for_users = array(
+        'user', 'db', 'tables_priv', 'columns_priv', 'procs_priv',
+    );
+
+    $db_rights_sqls = array();
+    foreach ($tables_to_search_for_users as $table_search_in) {
+        if (in_array($table_search_in, $tables)) {
+            $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`'
+                . $table_search_in . '` '
+                . (isset($_GET['initial']) ? PMA_rangeOfUsers($_GET['initial']) : '');
+        }
+    }
+    $user_defaults = array(
+        'User'       => '',
+        'Host'       => '%',
+        'Password'   => '?',
+        'Grant_priv' => 'N',
+        'privs'      => array('USAGE'),
+    );
+
+    // for the rights
+    $db_rights = array();
+
+    $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
+        .' ORDER BY `User` ASC, `Host` ASC';
+
+    $db_rights_result = PMA_DBI_query($db_rights_sql);
+
+    while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
+        $db_rights_row = array_merge($user_defaults, $db_rights_row);
+        $db_rights[$db_rights_row['User']][$db_rights_row['Host']]
+            = $db_rights_row;
+    }
+    PMA_DBI_free_result($db_rights_result);
+    ksort($db_rights);
+    
+    return $db_rights;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 9142c88c90..5defc77477 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -758,48 +758,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 PMA_Message::rawError($raw)->display();
             }
         } else {
-
-            // we also want users not in table `user` but in other table
-            $tables = PMA_DBI_fetch_result('SHOW TABLES FROM `mysql`;');
-
-            $tables_to_search_for_users = array(
-                'user', 'db', 'tables_priv', 'columns_priv', 'procs_priv',
-            );
-
-            $db_rights_sqls = array();
-            foreach ($tables_to_search_for_users as $table_search_in) {
-                if (in_array($table_search_in, $tables)) {
-                    $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`' . $table_search_in . '` ' . (isset($initial) ? PMA_rangeOfUsers($initial) : '');
-                }
-            }
-
-            $user_defaults = array(
-                'User'      => '',
-                'Host'      => '%',
-                'Password'  => '?',
-                'Grant_priv' => 'N',
-                'privs'     => array('USAGE'),
-            );
-
+            $db_rights = PMA_getDbRightsForUserOverview();
             // for all initials, even non A-Z
             $array_initials = array();
-            // for the rights
-            $db_rights = array();
-
-            $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-                .' ORDER BY `User` ASC, `Host` ASC';
-
-            $db_rights_result = PMA_DBI_query($db_rights_sql);
-
-            while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
-                $db_rights_row = array_merge($user_defaults, $db_rights_row);
-                $db_rights[$db_rights_row['User']][$db_rights_row['Host']]
-                    = $db_rights_row;
-            }
-            PMA_DBI_free_result($db_rights_result);
-            unset($db_rights_sql, $db_rights_sqls, $db_rights_result, $db_rights_row);
-            ksort($db_rights);
-
+            
             /**
              * Displays the initials
              * In an Ajax request, we don't need to show this.
@@ -813,7 +775,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             * Display the user overview
             * (if less than 50 users, display them immediately)
             */
-
             if (isset($initial) || isset($showall) || PMA_DBI_num_rows($res) < 50) {
 
                 echo PMA_displayUserOverview($res, $db_rights, $link_edit,

From 7ca5fe8e53eb3a304003403ea6f2c3536227938e Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 9 Jul 2012 23:58:53 +0530
Subject: [PATCH 048/102] function implementation PMA_deleteUser

---
 libraries/server_privileges.lib.php | 65 +++++++++++++++++++++++++++++
 server_privileges.php               | 55 +++---------------------
 2 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c2f0edd1d4..7533fe0391 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2357,4 +2357,69 @@ function PMA_getDbRightsForUserOverview()
     return $db_rights;
 }
 
+/**
+ * Delete user and get message for delete user in privileges
+ * 
+ * @param string $queries   queries
+ * 
+ * @return PMA_message 
+ */
+function PMA_deleteUser($queries)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    if (isset($_REQUEST['change_copy'])) {
+        $selected_usr = array($_GET['old_username'] . '&amp;#27;' . $_GET['old_hostname']);
+    } else {
+        $selected_usr = $_REQUEST['selected_usr'];
+        $queries = array();
+    }
+    foreach ($selected_usr as $each_user) {
+        list($this_user, $this_host) = explode('&amp;#27;', $each_user);
+        $queries[] = '# ' 
+            . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'')
+            . ' ...';
+        $queries[] = 'DROP USER \'' 
+            . $common_functions->sqlAddSlashes($this_user) . '\'@\'' 
+            . $common_functions->sqlAddSlashes($this_host) . '\';';
+
+        if (isset($_REQUEST['drop_users_db'])) {
+            $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';
+            $GLOBALS['reload'] = true;
+
+            if ($GLOBALS['is_ajax_request'] != true) {
+                echo $common_functions->getReloadNavigationScript();
+            }
+        }
+    }
+    if (empty($_REQUEST['change_copy'])) {        
+        if (empty($queries)) {
+            $message = PMA_Message::error(__('No users selected for deleting!'));
+        } else {
+            if ($_REQUEST['mode'] == 3) {
+                $queries[] = '# ' . __('Reloading the privileges') . ' ...';
+                $queries[] = 'FLUSH PRIVILEGES;';
+            }
+            $drop_user_error = '';
+            foreach ($queries as $sql_query) {
+                if ($sql_query{0} != '#') {
+                    if (! PMA_DBI_try_query($sql_query, $GLOBALS['userlink'])) {
+                        $drop_user_error .= PMA_DBI_getError() . "\n";
+                    }
+                }
+            }
+            // tracking sets this, causing the deleted db to be shown in navi
+            unset($GLOBALS['db']);
+
+            $sql_query = join("\n", $queries);
+            if (! empty($drop_user_error)) {
+                $message = PMA_Message::rawError($drop_user_error);
+            } else {
+                $message = PMA_Message::success(__('The selected users have been deleted successfully.')); 
+            }
+        }
+    }
+    return $message;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 5defc77477..791a72a1e7 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -534,56 +534,11 @@ if (isset($_REQUEST['change_pw'])) {
  * Deletes users
  *   (Changes / copies a user, part IV)
  */
-if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)) {
-    if (isset($_REQUEST['change_copy'])) {
-        $selected_usr = array($old_username . '&amp;#27;' . $old_hostname);
-    } else {
-        $selected_usr = $_REQUEST['selected_usr'];
-        $queries = array();
-    }
-    foreach ($selected_usr as $each_user) {
-        list($this_user, $this_host) = explode('&amp;#27;', $each_user);
-        $queries[] = '# ' . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...';
-        $queries[] = 'DROP USER \'' . $common_functions->sqlAddSlashes($this_user) . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
-
-        if (isset($_REQUEST['drop_users_db'])) {
-            $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';
-            $GLOBALS['reload'] = true;
-
-            if ($GLOBALS['is_ajax_request'] != true) {
-                echo $common_functions->getReloadNavigationScript();
-            }
-        }
-    }
-    if (empty($_REQUEST['change_copy'])) {
-        if (empty($queries)) {
-            $message = PMA_Message::error(__('No users selected for deleting!'));
-        } else {
-            if ($_REQUEST['mode'] == 3) {
-                $queries[] = '# ' . __('Reloading the privileges') . ' ...';
-                $queries[] = 'FLUSH PRIVILEGES;';
-            }
-            $drop_user_error = '';
-            foreach ($queries as $sql_query) {
-                if ($sql_query{0} != '#') {
-                    if (! PMA_DBI_try_query($sql_query, $GLOBALS['userlink'])) {
-                        $drop_user_error .= PMA_DBI_getError() . "\n";
-                    }
-                }
-            }
-            // tracking sets this, causing the deleted db to be shown in navi
-            unset($GLOBALS['db']);
-
-            $sql_query = join("\n", $queries);
-            if (! empty($drop_user_error)) {
-                $message = PMA_Message::rawError($drop_user_error);
-            } else {
-                $message = PMA_Message::success(__('The selected users have been deleted successfully.'));
-            }
-        }
-        unset($queries);
-    }
-}
+if (isset($_REQUEST['delete'])
+    || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)
+) {
+    $message = PMA_deleteUser($queries);
+}  
 
 /**
  * Changes / copies a user, part V

From 43ec1212f408e1090f1727781930d7645c116b76 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 00:56:20 +0530
Subject: [PATCH 049/102] implemet PMA_updatePrivileges() and change
 PMA_getCommonSQlQueryForAddUserAndUpdatePrivs() function

---
 libraries/server_privileges.lib.php | 112 ++++++++++++++++++++++------
 server_privileges.php               |  48 +-----------
 2 files changed, 91 insertions(+), 69 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7533fe0391..241b1958ee 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1175,33 +1175,31 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
 
 /**
  * Get a common SQL query for 'update privileges' and 'add user'
- * 
- * @param type $max_questions           maximum questions
- * @param type $max_connections         maximum connections
- * @param type $max_updates             maximum updates
- * @param type $max_user_connections    maximum userconnections
- * 
+ *
  * @return string $sql_query
  */
-function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs($max_questions,
-    $max_connections, $max_updates, $max_user_connections
-) {
+function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs()
+{
     $sql_query = 'WITH';
-    if (isset($GlOBALS['Grant_priv']) && $GlOBALS['Grant_priv'] == 'Y') {
+    if (isset($_POST['Grant_priv']) && $G_POST['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
     }
-    $max_questions = max(0, (int)$max_questions);
-    $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-
-    $max_connections = max(0, (int)$max_connections);
-    $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-
-    $max_updates = max(0, (int)$max_updates);
-    $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-
-    $max_user_connections = max(0, (int)$max_user_connections);
-    $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-
+    if (isset($_POST['max_questions'])) {
+        $max_questions = max(0, (int)$_POST['max_questions']);
+        $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
+    }
+    if (isset($_POST['max_connections'])) {
+        $max_connections = max(0, (int)$_POST['max_connections']);
+        $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
+    }
+    if (isset($_POST['max_updates'])) {
+        $max_updates = max(0, (int)$_POST['max_updates']);
+        $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
+    }
+    if (isset($_POST['max_user_connections'])) {
+        $max_user_connections = max(0, (int)$_POST['max_user_connections']);
+        $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
+    }
     return $sql_query;
 }
 
@@ -2422,4 +2420,74 @@ function PMA_deleteUser($queries)
     return $message;
 }
 
+/**
+ * Update the privileges and return the success or error message
+ * 
+ * @param string $dbname        database name
+ * @param string $tablename     table name
+ * @param string $username      username
+ * @param string $hostname      host name
+ * 
+ * @return PMA_message success message or error message for update
+ */
+function PMA_updatePrivileges($dbname, $tablename, $username, $hostname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $db_and_table = PMA_wildcardEscapeForGrant(
+        $dbname, (isset($tablename) ? $tablename : '')
+    );
+
+    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
+        . ' FROM \'' . $common_functions->sqlAddSlashes($username)
+        . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+    
+    if (! isset($_POST['Grant_priv']) || $_POST['Grant_priv'] != 'Y') {
+        $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
+            . ' FROM \'' . $common_functions->sqlAddSlashes($username) . '\'@\''
+            . $common_functions->sqlAddSlashes($hostname) . '\';';
+    } else {
+        $sql_query1 = '';
+    }
+
+    // Should not do a GRANT USAGE for a table-specific privilege, it
+    // causes problems later (cannot revoke it)
+    if (! (isset($tablename) && 'USAGE' == implode('', PMA_extractPrivInfo()))) {
+        $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo())
+            . ' ON ' . $db_and_table
+            . ' TO \'' . $common_functions->sqlAddSlashes($username) . '\'@\''
+            . $common_functions->sqlAddSlashes($hostname) . '\'';
+
+        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
+            || (! isset($dbname)
+            && (isset($_POST['max_questions']) || isset($_POST['max_connections'])
+            || isset($_POST['max_updates']) || isset($_POST['max_user_connections'])))
+        ) {
+            $sql_query2 .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs();
+        }
+        $sql_query2 .= ';';
+    }
+    if (! PMA_DBI_try_query($sql_query0)) {
+        // This might fail when the executing user does not have ALL PRIVILEGES himself.
+        // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=23067&atid=377408
+        $sql_query0 = '';
+    }
+    if (isset($sql_query1) && ! PMA_DBI_try_query($sql_query1)) {
+        // this one may fail, too...
+        $sql_query1 = '';
+    }
+    if (isset($sql_query2)) {
+        PMA_DBI_query($sql_query2);
+    } else {
+        $sql_query2 = '';
+    }
+    $sql_query = $sql_query0 . ' ' . $sql_query1 . ' ' . $sql_query2;
+    $message = PMA_Message::success(__('You have updated the privileges for %s.'));
+    $message->addParam(
+        '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''
+    );
+    
+    return $message;
+}
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 791a72a1e7..866aa6cbb0 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -463,53 +463,7 @@ if (isset($_REQUEST['change_copy'])) {
  * Updates privileges
  */
 if (! empty($update_privs)) {
-    $db_and_table = PMA_wildcardEscapeForGrant($dbname, (isset($tablename) ? $tablename : ''));
-
-    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
-        . ' FROM \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-    if (! isset($Grant_priv) || $Grant_priv != 'Y') {
-        $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
-            . ' FROM \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-    } else {
-        $sql_query1 = '';
-    }
-
-    // Should not do a GRANT USAGE for a table-specific privilege, it
-    // causes problems later (cannot revoke it)
-    if (! (isset($tablename) && 'USAGE' == implode('', PMA_extractPrivInfo()))) {
-        $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo())
-            . ' ON ' . $db_and_table
-            . ' TO \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
-
-        if ((isset($Grant_priv) && $Grant_priv == 'Y')
-            || (! isset($dbname)
-            && (isset($max_questions) || isset($max_connections)
-            || isset($max_updates) || isset($max_user_connections)))
-        ) {
-            $sql_query2 .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs(
-                $Grant_priv, $max_questions, $max_connections, $max_updates,
-                $max_user_connections
-            );
-        }
-        $sql_query2 .= ';';
-    }
-    if (! PMA_DBI_try_query($sql_query0)) {
-        // This might fail when the executing user does not have ALL PRIVILEGES himself.
-        // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=23067&atid=377408
-        $sql_query0 = '';
-    }
-    if (isset($sql_query1) && ! PMA_DBI_try_query($sql_query1)) {
-        // this one may fail, too...
-        $sql_query1 = '';
-    }
-    if (isset($sql_query2)) {
-        PMA_DBI_query($sql_query2);
-    } else {
-        $sql_query2 = '';
-    }
-    $sql_query = $sql_query0 . ' ' . $sql_query1 . ' ' . $sql_query2;
-    $message = PMA_Message::success(__('You have updated the privileges for %s.'));
-    $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
+    $message = PMA_updatePrivileges($dbname, $tablename, $username, $hostname);
 }
 
 /**

From 86353ab7d67949d820dd3f185596faad63fddc8e Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 07:39:45 +0530
Subject: [PATCH 050/102] implemet PMA_getHtmlForExportUserDefinition()

---
 libraries/server_privileges.lib.php | 48 +++++++++++++++++++++++++++++
 server_privileges.php               | 37 +++-------------------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 241b1958ee..a435dade0a 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2490,4 +2490,52 @@ function PMA_updatePrivileges($dbname, $tablename, $username, $hostname)
     return $message;
 }
 
+/**
+ * Get title and textarea for export user definition in Privileges
+ * 
+ * @param string $username  username
+ * @param string $hostname  host name
+ * 
+ * @return array ($title, $export) 
+ */
+function PMA_getHtmlForExportUserDefinition($username, $hostname)
+{
+    $export = '<textarea class="export" cols="' . $GLOBALS['cfg']['TextareaCols']
+        . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
+    
+    if ($username == '%') {
+        // export privileges for all users
+        $title = __('Privileges for all users');
+        foreach ($_SESSION['user_host_pairs'] as $pair) {
+            $export .= PMA_getGrants($pair['user'], $pair['host']);
+            $export .= "\n";
+        }
+    } elseif (isset($_REQUEST['selected_usr'])) {
+        // export privileges for selected users
+        $title = __('Privileges');
+        foreach ($_REQUEST['selected_usr'] as $export_user) {
+            $export_username = substr($export_user, 0, strpos($export_user, '&'));
+            $export_hostname = substr($export_user, strrpos($export_user, ';') + 1);
+            $export .= '# '
+                . sprintf(
+                    __('Privileges for %s'),
+                    '`' . htmlspecialchars($export_username) . '`@`' . htmlspecialchars($export_hostname) . '`'
+                )
+                . "\n\n";
+            $export .= PMA_getGrants($export_username, $export_hostname) . "\n";
+        }
+    } else {
+        // export privileges for a single user
+        $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
+        $export .= PMA_getGrants($username, $hostname);
+    }
+    // remove trailing whitespace
+    $export = trim($export);
+
+    $export .= '</textarea>';
+
+    return array($title, $export);
+}
+
+
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 866aa6cbb0..23f3bc2669 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -582,38 +582,11 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
  */
 
 // export user definition
-if (isset($_REQUEST['export']) || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')) {
-    $export = '<textarea class="export" cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
-    if ($username == '%') {
-        // export privileges for all users
-        $title = __('Privileges for all users');
-        foreach ($_SESSION['user_host_pairs'] as $pair) {
-            $export .= PMA_getGrants($pair['user'], $pair['host']);
-            $export .= "\n";
-        }
-    } elseif (isset($_REQUEST['selected_usr'])) {
-        // export privileges for selected users
-        $title = __('Privileges');
-        foreach ($_REQUEST['selected_usr'] as $export_user) {
-            $export_username = substr($export_user, 0, strpos($export_user, '&'));
-            $export_hostname = substr($export_user, strrpos($export_user, ';') + 1);
-            $export .= '# '
-                . sprintf(
-                    __('Privileges for %s'),
-                    '`' . htmlspecialchars($export_username) . '`@`' . htmlspecialchars($export_hostname) . '`'
-                )
-                . "\n\n";
-            $export .= PMA_getGrants($export_username, $export_hostname) . "\n";
-        }
-    } else {
-        // export privileges for a single user
-        $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
-        $export .= PMA_getGrants($username, $hostname);
-    }
-    // remove trailing whitespace
-    $export = trim($export);
-
-    $export .= '</textarea>';
+if (isset($_REQUEST['export'])
+    || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')
+) {
+    list($title, $export) = PMA_getHtmlForExportUserDefinition($username, $hostname);
+    
     unset($username, $hostname, $grants, $one_grant);
     if ($GLOBALS['is_ajax_request']) {
         $response = PMA_Response::getInstance();

From da5d307da33ea75d0f5398e447b5137aa1f8aa7d Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 07:56:08 +0530
Subject: [PATCH 051/102] remove echo

---
 server_privileges.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 23f3bc2669..c1433cee0e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -588,13 +588,14 @@ if (isset($_REQUEST['export'])
     list($title, $export) = PMA_getHtmlForExportUserDefinition($username, $hostname);
     
     unset($username, $hostname, $grants, $one_grant);
+    
+    $response = PMA_Response::getInstance();
     if ($GLOBALS['is_ajax_request']) {
-        $response = PMA_Response::getInstance();
         $response->addJSON('message', $export);
         $response->addJSON('title', $title);
         exit;
     } else {
-        echo "<h2>$title</h2>$export";
+        $response->addHTML("<h2>$title</h2>$export");
     }
 }
 

From b7074327b6f7fe15d7005fd8a9a88f447c389661 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 18:57:17 +0530
Subject: [PATCH 052/102] correct function signature

---
 libraries/server_privileges.lib.php | 4 ++--
 server_privileges.php               | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index a435dade0a..7981f1506b 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1178,7 +1178,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  *
  * @return string $sql_query
  */
-function PMA_getCommonSQlQueryForAddUserAndUpdatePrivs()
+function PMA_getCommonSqlQueryForAddUserAndUpdatePrivs()
 {
     $sql_query = 'WITH';
     if (isset($_POST['Grant_priv']) && $G_POST['Grant_priv'] == 'Y') {
@@ -2463,7 +2463,7 @@ function PMA_updatePrivileges($dbname, $tablename, $username, $hostname)
             && (isset($_POST['max_questions']) || isset($_POST['max_connections'])
             || isset($_POST['max_updates']) || isset($_POST['max_user_connections'])))
         ) {
-            $sql_query2 .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs();
+            $sql_query2 .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
         }
         $sql_query2 .= ';';
     }
diff --git a/server_privileges.php b/server_privileges.php
index c1433cee0e..1cfced6d3e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -278,10 +278,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             || (isset($max_questions) || isset($max_connections)
             || isset($max_updates) || isset($max_user_connections))
         ) {
-            $real_sql_query .= PMA_getCommonSQlQueryForAddUserAndUpdatePrivs(
-                $max_questions, $max_connections,$max_updates, 
-                $max_user_connections
-            );
+            $real_sql_query .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
             $sql_query .= $real_sql_query;
         }
         if (isset($create_user_real)) {

From ef4d31e581f5430dcd1d2cc5d9e0afdcabc6d1bc Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 18:58:22 +0530
Subject: [PATCH 053/102] correct spelling mistake

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7981f1506b..24d8025ac3 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1181,7 +1181,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
 function PMA_getCommonSqlQueryForAddUserAndUpdatePrivs()
 {
     $sql_query = 'WITH';
-    if (isset($_POST['Grant_priv']) && $G_POST['Grant_priv'] == 'Y') {
+    if (isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
     }
     if (isset($_POST['max_questions'])) {

From c1a8445bcf55e42ec4f685d8e417687beb6a540c Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 10 Jul 2012 23:40:11 +0530
Subject: [PATCH 054/102] some changes to PMA_deleteUser and
 PMA_updatePrivileges

---
 libraries/server_privileges.lib.php | 82 +++++++++++------------------
 server_privileges.php               | 28 ++++++++--
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 24d8025ac3..86d822bd39 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2356,7 +2356,7 @@ function PMA_getDbRightsForUserOverview()
 }
 
 /**
- * Delete user and get message for delete user in privileges
+ * Delete user and get message and sql query for delete user in privileges
  * 
  * @param string $queries   queries
  * 
@@ -2364,60 +2364,32 @@ function PMA_getDbRightsForUserOverview()
  */
 function PMA_deleteUser($queries)
 {
-    $common_functions = PMA_CommonFunctions::getInstance();
-    
-    if (isset($_REQUEST['change_copy'])) {
-        $selected_usr = array($_GET['old_username'] . '&amp;#27;' . $_GET['old_hostname']);
+    if (empty($queries)) {
+        $message = PMA_Message::error(__('No users selected for deleting!'));
     } else {
-        $selected_usr = $_REQUEST['selected_usr'];
-        $queries = array();
-    }
-    foreach ($selected_usr as $each_user) {
-        list($this_user, $this_host) = explode('&amp;#27;', $each_user);
-        $queries[] = '# ' 
-            . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'')
-            . ' ...';
-        $queries[] = 'DROP USER \'' 
-            . $common_functions->sqlAddSlashes($this_user) . '\'@\'' 
-            . $common_functions->sqlAddSlashes($this_host) . '\';';
-
-        if (isset($_REQUEST['drop_users_db'])) {
-            $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';
-            $GLOBALS['reload'] = true;
-
-            if ($GLOBALS['is_ajax_request'] != true) {
-                echo $common_functions->getReloadNavigationScript();
-            }
+        if ($_REQUEST['mode'] == 3) {
+            $queries[] = '# ' . __('Reloading the privileges') . ' ...';
+            $queries[] = 'FLUSH PRIVILEGES;';
         }
-    }
-    if (empty($_REQUEST['change_copy'])) {        
-        if (empty($queries)) {
-            $message = PMA_Message::error(__('No users selected for deleting!'));
-        } else {
-            if ($_REQUEST['mode'] == 3) {
-                $queries[] = '# ' . __('Reloading the privileges') . ' ...';
-                $queries[] = 'FLUSH PRIVILEGES;';
-            }
-            $drop_user_error = '';
-            foreach ($queries as $sql_query) {
-                if ($sql_query{0} != '#') {
-                    if (! PMA_DBI_try_query($sql_query, $GLOBALS['userlink'])) {
-                        $drop_user_error .= PMA_DBI_getError() . "\n";
-                    }
+        $drop_user_error = '';
+        foreach ($queries as $sql_query) {
+            if ($sql_query{0} != '#') {
+                if (! PMA_DBI_try_query($sql_query, $GLOBALS['userlink'])) {
+                    $drop_user_error .= PMA_DBI_getError() . "\n";
                 }
             }
-            // tracking sets this, causing the deleted db to be shown in navi
-            unset($GLOBALS['db']);
+        }
+        // tracking sets this, causing the deleted db to be shown in navi
+        unset($GLOBALS['db']);
 
-            $sql_query = join("\n", $queries);
-            if (! empty($drop_user_error)) {
-                $message = PMA_Message::rawError($drop_user_error);
-            } else {
-                $message = PMA_Message::success(__('The selected users have been deleted successfully.')); 
-            }
+        $sql_query = join("\n", $queries);
+        if (! empty($drop_user_error)) {
+            $message = PMA_Message::rawError($drop_user_error);
+        } else {
+            $message = PMA_Message::success(__('The selected users have been deleted successfully.')); 
         }
     }
-    return $message;
+    return array($sql_query, $message);
 }
 
 /**
@@ -2430,10 +2402,20 @@ function PMA_deleteUser($queries)
  * 
  * @return PMA_message success message or error message for update
  */
-function PMA_updatePrivileges($dbname, $tablename, $username, $hostname)
+function PMA_updatePrivileges($username, $hostname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     
+    if (PMA_isValid($_REQUEST['pred_tablename'])) {
+        $tablename = $_REQUEST['pred_tablename'];
+    } elseif (PMA_isValid($_REQUEST['tablename'])) {
+        $tablename = $_REQUEST['tablename'];
+    }
+    if (PMA_isValid($_REQUEST['pred_dbname'])) {
+        $dbname = $_REQUEST['pred_dbname'];
+    } elseif (PMA_isValid($_REQUEST['dbname'])) {
+        $dbname = $_REQUEST['dbname'];
+    }
     $db_and_table = PMA_wildcardEscapeForGrant(
         $dbname, (isset($tablename) ? $tablename : '')
     );
@@ -2487,7 +2469,7 @@ function PMA_updatePrivileges($dbname, $tablename, $username, $hostname)
         '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''
     );
     
-    return $message;
+    return array($sql_query, $message);
 }
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index 1cfced6d3e..845570db21 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -460,7 +460,7 @@ if (isset($_REQUEST['change_copy'])) {
  * Updates privileges
  */
 if (! empty($update_privs)) {
-    $message = PMA_updatePrivileges($dbname, $tablename, $username, $hostname);
+    list($sql_query, $message) = PMA_updatePrivileges($username, $hostname);
 }
 
 /**
@@ -488,8 +488,30 @@ if (isset($_REQUEST['change_pw'])) {
 if (isset($_REQUEST['delete'])
     || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)
 ) {
-    $message = PMA_deleteUser($queries);
-}  
+    if (isset($_REQUEST['change_copy'])) {
+        $selected_usr = array($_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']);
+    } else {
+        $selected_usr = $_REQUEST['selected_usr'];
+        $queries = array();
+    }
+    foreach ($selected_usr as $each_user) {
+        list($this_user, $this_host) = explode('&amp;#27;', $each_user);
+        $queries[] = '# ' . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...';
+        $queries[] = 'DROP USER \'' . $common_functions->sqlAddSlashes($this_user) . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
+
+        if (isset($_REQUEST['drop_users_db'])) {
+            $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';
+            $GLOBALS['reload'] = true;
+
+            if ($GLOBALS['is_ajax_request'] != true) {
+                echo $common_functions->getReloadNavigationScript();
+            }
+        }
+    }
+    if (empty($_REQUEST['change_copy'])) {
+        list($sql_query, $message) = PMA_deleteUser($queries);
+    }
+}
 
 /**
  * Changes / copies a user, part V

From 290eee2bcc8c1573875e72d8c1bb264133133891 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 06:01:25 +0530
Subject: [PATCH 055/102] resolve fetal error

---
 libraries/server_privileges.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 86d822bd39..0ab9bed05e 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -434,8 +434,8 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
         // get columns
         $res = PMA_DBI_try_query(
             'SHOW COLUMNS FROM '
-            . PMA_CommonFunctions::getInstance()->PMA_backquote(PMA_unescapeMysqlWildcards($db))
-            . '.' . PMA_CommonFunctions::getInstance()->PMA_backquote($table) . ';'
+            . PMA_CommonFunctions::getInstance()->backquote(PMA_unescapeMysqlWildcards($db))
+            . '.' . PMA_CommonFunctions::getInstance()->backquote($table) . ';'
         );
         $columns = array();
         if ($res) {

From 042eda33b61c20d5c50905ced48a2a3d998f79b0 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 06:13:19 +0530
Subject: [PATCH 056/102] resolve fetal error

---
 libraries/server_privileges.lib.php | 196 +++++++++++++++++++++++++++-
 1 file changed, 189 insertions(+), 7 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0ab9bed05e..d1ba6cfe37 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -31,7 +31,9 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename)
     } else {
         if (strlen($tablename)) {
             $db_and_table
-                = PMA_CommonFunctions::getInstance()->backquote(PMA_unescapeMysqlWildcards($dbname)) . '.'
+                = PMA_CommonFunctions::getInstance()->backquote(
+                    PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($dbname)
+                ) . '.'
                 . PMA_CommonFunctions::getInstance()->backquote($tablename);
         } else {
             $db_and_table = PMA_CommonFunctions::getInstance()->backquote($dbname) . '.*';
@@ -434,7 +436,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
         // get columns
         $res = PMA_DBI_try_query(
             'SHOW COLUMNS FROM '
-            . PMA_CommonFunctions::getInstance()->backquote(PMA_unescapeMysqlWildcards($db))
+            . PMA_CommonFunctions::getInstance()->backquote(PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($db))
             . '.' . PMA_CommonFunctions::getInstance()->backquote($table) . ';'
         );
         $columns = array();
@@ -519,17 +521,18 @@ function PMA_getHtmlForDisplayResourceLimits($row)
  */
 function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns)
 {
+    $common_functions = PMA_CommonFunctions::getInstance();
     $res = PMA_DBI_query(
         'SELECT `Column_name`, `Column_priv`'
         .' FROM `mysql`.`columns_priv`'
         .' WHERE `User`'
-        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
+        .' = \'' . $common_functions->sqlAddSlashes($username) . "'"
         .' AND `Host`'
-        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "'"
+        .' = \'' . $common_functions->sqlAddSlashes($hostname) . "'"
         .' AND `Db`'
-        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes(PMA_unescapeMysqlWildcards($db)) . "'"
+        .' = \'' . $common_functions->sqlAddSlashes($common_functions->unescapeMysqlWildcards($db)) . "'"
         .' AND `Table_name`'
-        .' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($table) . '\';'
+        .' = \'' . $common_functions->sqlAddSlashes($table) . '\';'
     );
 
     while ($row1 = PMA_DBI_fetch_row($res)) {
@@ -545,7 +548,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
        . '<input type="hidden" name="column_count" value="' . count($columns) . '" />' . "\n"
        . '<fieldset id="fieldset_user_priv">' . "\n"
        . '    <legend>' . __('Table-specific privileges')
-       . PMA_CommonFunctions::getInstance()->showHint(
+       . $common_functions->showHint(
                __('Note: MySQL privilege names are expressed in English')
            )
        . '</legend>' . "\n";
@@ -2520,4 +2523,183 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
 }
 
 
+function PMA_getUsernameAndHostname() {
+    if ($_POST['pred_hostname'] == 'any') {
+        $username = '';
+    } else {
+        $username = $_POST['username'];
+    }
+    
+    switch ($_POST['pred_hostname']) {
+    case 'any':
+        $hostname = '%';
+        break;
+    case 'localhost':
+        $hostname = 'localhost';
+        break;
+    case 'hosttable':
+        $hostname = '';
+        break;
+    case 'thishost':
+        $_user_name = PMA_DBI_fetch_value('SELECT USER()');
+        $hostname = substr($_user_name, (strrpos($_user_name, '@') + 1));
+        break;
+    }
+    
+    if (!isset($_POST['pred_hostname'])) {
+        $hostname = $_POST['hostname'];
+    }
+    
+    return array($username, $hostname);
+}
+
+function PMA_addOrChangeOrCopyUser($password) {
+    $common_functions = PMA_CommonFunctions::getInstance();
+    $sql_query = '';
+    
+    list($username, $hostname) = PMA_getUsernameAndHostname();
+
+    $sql = "SELECT '1' FROM `mysql`.`user`"
+        . " WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
+        . " AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";
+    if (PMA_DBI_fetch_value($sql) == 1) {
+        $message = PMA_Message::error(__('The user %s already exists!'));
+        $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
+        $_REQUEST['adduser'] = true;
+        $_add_user_error = true;
+    } else {
+        $create_user_real = 'CREATE USER \'' . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+
+        $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
+            . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+        
+        if ($_POST['pred_hostname'] != 'none' && $_POST['pred_hostname'] != 'keep') {
+            $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
+            $real_sql_query .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
+            
+            if (isset($create_user_real)) {
+                $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
+                $create_user_real .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
+            }
+        } else {
+            if ($_POST['pred_password'] == 'keep' && ! empty($password)) {
+                $real_sql_query .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
+                if (isset($create_user_real)) {
+                    $create_user_real .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
+                }
+            }
+            $sql_query = $real_sql_query;
+            if (isset($create_user_real)) {
+                $create_user_show = $create_user_real;
+            }
+        }
+
+        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
+            || (isset($_POST['max_questions']) || isset($_POST['max_connections'])
+            || isset($_POST['max_updates']) || isset($_POST['max_user_connections']))
+        ) {
+            $real_sql_query .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
+            $sql_query .= $real_sql_query;
+        }
+        if (isset($create_user_real)) {
+            $create_user_real .= ';';
+            $create_user_show .= ';';
+        }
+        $real_sql_query .= ';';
+        $sql_query .= ';';
+        if (empty($_REQUEST['change_copy'])) {
+            $_error = false;
+            if (isset($create_user_real)) {
+                if (! PMA_DBI_try_query($create_user_real)) {
+                    $_error = true;
+                }
+                $sql_query = $create_user_show . $sql_query;
+            }
+            list ($sql_query, $message) = PMA_addUser(
+                $sql_query, $_error, $real_sql_query, $username, $hostname
+            );
+            
+        } else {
+            if (isset($create_user_real)) {
+                $queries[]             = $create_user_real;
+            }
+            $queries[]             = $real_sql_query;
+            // we put the query containing the hidden password in
+            // $queries_for_display, at the same position occupied
+            // by the real query in $queries
+            $tmp_count = count($queries);
+            if (isset($create_user_real)) {
+                $queries_for_display[$tmp_count - 2] = $create_user_show;
+            }
+            $queries_for_display[$tmp_count - 1] = $sql_query;
+        }
+
+    }
+    return array($sql_query, $message);
+}
+
+function PMA_addUser($sql_query, $_error, $real_sql_query, $username, $hostname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
+        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
+        $message = PMA_Message::rawError(PMA_DBI_getError());
+    } else {
+        $message = PMA_Message::success(__('You have added a new user.'));
+    }
+
+    if (isset($_REQUEST['createdb-1'])) {
+        // Create database with same name and grant all privileges
+        $q = 'CREATE DATABASE IF NOT EXISTS '
+            . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+        /**
+         * If we are not in an Ajax request, we can't reload navigation now
+         */
+        if ($GLOBALS['is_ajax_request'] != true) {
+            // this is needed in case tracking is on:
+            $GLOBALS['db'] = $username;
+            $GLOBALS['reload'] = true;
+            echo $common_functions->getReloadNavigationScript();
+        }
+
+        $q = 'GRANT ALL PRIVILEGES ON '
+            . $common_functions->backquote($common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))) . '.* TO \''
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+
+    if (isset($_REQUEST['createdb-2'])) {
+        // Grant all privileges on wildcard name (username\_%)
+        $q = 'GRANT ALL PRIVILEGES ON '
+            . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+
+    if (isset($_REQUEST['createdb-3'])) {
+        // Grant all privileges on the specified database to the new user
+        $q = 'GRANT ALL PRIVILEGES ON '
+        . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
+        . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+    
+    return array($sql_query, $message);
+}
 ?>

From 6e74d23e18fa5e2dff89bfbf69e7ba6d7970708b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 06:27:58 +0530
Subject: [PATCH 057/102] remove php notice

---
 libraries/server_privileges.lib.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d1ba6cfe37..17ce2f6252 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -455,7 +455,9 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
     }
     // t a b l e - s p e c i f i c    p r i v i l e g e s
     if (! empty($columns)) {
-        $html_output .= PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns);
+        $html_output .= PMA_getHtmlForTableSpecificPrivileges(
+            $username, $hostname, $db, $table, $columns,$row
+        );
     } else {
         // g l o b a l    o r    d b - s p e c i f i c
         $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n);
@@ -519,7 +521,7 @@ function PMA_getHtmlForDisplayResourceLimits($row)
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns)
+function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns,$row)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     $res = PMA_DBI_query(

From c83857c9782af59178892a3ca491798530bd4b71 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 06:31:51 +0530
Subject: [PATCH 058/102] remove php notice

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 17ce2f6252..5f71c80e48 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -106,7 +106,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false)
                 || (empty($row)
                 && ($GLOBALS[$current_grant[0]] == 'Y'
                 || (is_array($GLOBALS[$current_grant[0]])
-                && count($GLOBALS[$current_grant[0]]) == $GLOBALS['column_count']
+                && count($GLOBALS[$current_grant[0]]) == $_REQUEST['column_count']
                 && empty($GLOBALS[$current_grant[0] . '_none']))))
             ) {
                 if ($enableHTML) {

From d1f808b51244dc750f277e166291f4869afc1832 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 06:42:15 +0530
Subject: [PATCH 059/102] remove mistakenly commited functions

---
 libraries/server_privileges.lib.php | 180 ----------------------------
 1 file changed, 180 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 5f71c80e48..3ef12987bb 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2524,184 +2524,4 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
     return array($title, $export);
 }
 
-
-function PMA_getUsernameAndHostname() {
-    if ($_POST['pred_hostname'] == 'any') {
-        $username = '';
-    } else {
-        $username = $_POST['username'];
-    }
-    
-    switch ($_POST['pred_hostname']) {
-    case 'any':
-        $hostname = '%';
-        break;
-    case 'localhost':
-        $hostname = 'localhost';
-        break;
-    case 'hosttable':
-        $hostname = '';
-        break;
-    case 'thishost':
-        $_user_name = PMA_DBI_fetch_value('SELECT USER()');
-        $hostname = substr($_user_name, (strrpos($_user_name, '@') + 1));
-        break;
-    }
-    
-    if (!isset($_POST['pred_hostname'])) {
-        $hostname = $_POST['hostname'];
-    }
-    
-    return array($username, $hostname);
-}
-
-function PMA_addOrChangeOrCopyUser($password) {
-    $common_functions = PMA_CommonFunctions::getInstance();
-    $sql_query = '';
-    
-    list($username, $hostname) = PMA_getUsernameAndHostname();
-
-    $sql = "SELECT '1' FROM `mysql`.`user`"
-        . " WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
-        . " AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";
-    if (PMA_DBI_fetch_value($sql) == 1) {
-        $message = PMA_Message::error(__('The user %s already exists!'));
-        $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
-        $_REQUEST['adduser'] = true;
-        $_add_user_error = true;
-    } else {
-        $create_user_real = 'CREATE USER \'' . $common_functions->sqlAddSlashes($username)
-            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
-
-        $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
-            . $common_functions->sqlAddSlashes($username)
-            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
-        
-        if ($_POST['pred_hostname'] != 'none' && $_POST['pred_hostname'] != 'keep') {
-            $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
-            $real_sql_query .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
-            
-            if (isset($create_user_real)) {
-                $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
-                $create_user_real .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
-            }
-        } else {
-            if ($_POST['pred_password'] == 'keep' && ! empty($password)) {
-                $real_sql_query .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
-                if (isset($create_user_real)) {
-                    $create_user_real .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
-                }
-            }
-            $sql_query = $real_sql_query;
-            if (isset($create_user_real)) {
-                $create_user_show = $create_user_real;
-            }
-        }
-
-        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
-            || (isset($_POST['max_questions']) || isset($_POST['max_connections'])
-            || isset($_POST['max_updates']) || isset($_POST['max_user_connections']))
-        ) {
-            $real_sql_query .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
-            $sql_query .= $real_sql_query;
-        }
-        if (isset($create_user_real)) {
-            $create_user_real .= ';';
-            $create_user_show .= ';';
-        }
-        $real_sql_query .= ';';
-        $sql_query .= ';';
-        if (empty($_REQUEST['change_copy'])) {
-            $_error = false;
-            if (isset($create_user_real)) {
-                if (! PMA_DBI_try_query($create_user_real)) {
-                    $_error = true;
-                }
-                $sql_query = $create_user_show . $sql_query;
-            }
-            list ($sql_query, $message) = PMA_addUser(
-                $sql_query, $_error, $real_sql_query, $username, $hostname
-            );
-            
-        } else {
-            if (isset($create_user_real)) {
-                $queries[]             = $create_user_real;
-            }
-            $queries[]             = $real_sql_query;
-            // we put the query containing the hidden password in
-            // $queries_for_display, at the same position occupied
-            // by the real query in $queries
-            $tmp_count = count($queries);
-            if (isset($create_user_real)) {
-                $queries_for_display[$tmp_count - 2] = $create_user_show;
-            }
-            $queries_for_display[$tmp_count - 1] = $sql_query;
-        }
-
-    }
-    return array($sql_query, $message);
-}
-
-function PMA_addUser($sql_query, $_error, $real_sql_query, $username, $hostname)
-{
-    $common_functions = PMA_CommonFunctions::getInstance();
-    
-    if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
-        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
-        $message = PMA_Message::rawError(PMA_DBI_getError());
-    } else {
-        $message = PMA_Message::success(__('You have added a new user.'));
-    }
-
-    if (isset($_REQUEST['createdb-1'])) {
-        // Create database with same name and grant all privileges
-        $q = 'CREATE DATABASE IF NOT EXISTS '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
-        $sql_query .= $q;
-        if (! PMA_DBI_try_query($q)) {
-            $message = PMA_Message::rawError(PMA_DBI_getError());
-        }
-        /**
-         * If we are not in an Ajax request, we can't reload navigation now
-         */
-        if ($GLOBALS['is_ajax_request'] != true) {
-            // this is needed in case tracking is on:
-            $GLOBALS['db'] = $username;
-            $GLOBALS['reload'] = true;
-            echo $common_functions->getReloadNavigationScript();
-        }
-
-        $q = 'GRANT ALL PRIVILEGES ON '
-            . $common_functions->backquote($common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))) . '.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-        $sql_query .= $q;
-        if (! PMA_DBI_try_query($q)) {
-            $message = PMA_Message::rawError(PMA_DBI_getError());
-        }
-    }
-
-    if (isset($_REQUEST['createdb-2'])) {
-        // Grant all privileges on wildcard name (username\_%)
-        $q = 'GRANT ALL PRIVILEGES ON '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-        $sql_query .= $q;
-        if (! PMA_DBI_try_query($q)) {
-            $message = PMA_Message::rawError(PMA_DBI_getError());
-        }
-    }
-
-    if (isset($_REQUEST['createdb-3'])) {
-        // Grant all privileges on the specified database to the new user
-        $q = 'GRANT ALL PRIVILEGES ON '
-        . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
-        . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-        $sql_query .= $q;
-        if (! PMA_DBI_try_query($q)) {
-            $message = PMA_Message::rawError(PMA_DBI_getError());
-        }
-    }
-    
-    return array($sql_query, $message);
-}
 ?>

From 8d4ebcc6c2879ba3bdcf96515c61a44249f4ac1f Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 09:42:30 +0530
Subject: [PATCH 060/102] function implemetations and midifications to siplay
 user page

---
 libraries/server_privileges.lib.php | 258 +++++++++++++++++++++++++++-
 server_privileges.php               | 198 +--------------------
 2 files changed, 263 insertions(+), 193 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 3ef12987bb..52a60bb5e7 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1735,10 +1735,16 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
  * 
  * @return array $db_rights             database rights
  */
-function PMA_getUserSpecificRights($dbname, $tables, $user_host_condition)
+function PMA_getUserSpecificRights($tables, $user_host_condition)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
 
+    if (PMA_isValid($_REQUEST['pred_dbname'])) {
+        $dbname = $_REQUEST['pred_dbname'];
+        unset($pred_dbname);
+    } elseif (PMA_isValid($_REQUEST['dbname'])) {
+        $dbname = $_REQUEST['dbname'];
+    }
     if (! isset($dbname)) {
         $tables_to_search_for_users = array(
             'tables_priv', 'columns_priv',
@@ -1917,9 +1923,14 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
  * 
  * @return array $html_output, $found_rows
  */
-function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
-    $dbname, $link_edit, $link_revoke
+function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
+    , $link_edit, $link_revoke
 ) {
+    if (PMA_isValid($_REQUEST['pred_dbname'])) {
+        $dbname = $_REQUEST['pred_dbname'];
+    } elseif (PMA_isValid($_REQUEST['dbname'])) {
+        $dbname = $_REQUEST['dbname'];
+    }
     // table header
     $html_output = PMA_generate_common_hidden_inputs('', '')
         . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
@@ -1955,7 +1966,7 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname,
      * no db name given, so we want all privs for the given user
      * db name was given, so we want all user specific rights for this db
      */
-    $db_rights = PMA_getUserSpecificRights($dbname, $tables, $user_host_condition);
+    $db_rights = PMA_getUserSpecificRights($tables, $user_host_condition);
 
     ksort($db_rights);
     
@@ -2524,4 +2535,243 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
     return array($title, $export);
 }
 
+function PMA_getAddUserHtmlFieldset($conditional_class)
+{
+    return '<fieldset id="fieldset_add_user">' . "\n"
+        . '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" '
+        . 'class="' . $conditional_class . '">' . "\n"
+        . PMA_CommonFunctions::getInstance()->getIcon('b_usradd.png')
+        . '            ' . __('Add user') . '</a>' . "\n"
+        . '</fieldset>' . "\n";
+}
+
+function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard)
+{
+    $html_output = '<h2>' . "\n"
+       . PMA_CommonFunctions::getInstance()->getIcon('b_usredit.png')
+       . __('Edit Privileges') . ': '
+       . __('User');
+
+    if (isset($_REQUEST['dbname'])) {
+        $html_output .= ' <i><a href="server_privileges.php?'
+            . $GLOBALS['url_query'] 
+            . '&amp;username=' . htmlspecialchars(urlencode($_REQUEST['username']))
+            . '&amp;hostname=' . htmlspecialchars(urlencode($_REQUEST['hostname']))
+            . '&amp;dbname=&amp;tablename=">\'' . htmlspecialchars($_REQUEST['username'])
+            . '\'@\'' . htmlspecialchars($_REQUEST['hostname'])
+            . '\'</a></i>' . "\n";
+        
+        $url_dbname = urlencode(
+            str_replace(
+                array('\_', '\%'),
+                array('_', '%'), $_REQUEST['dbname']
+            )
+        );
+
+        $html_output .= ' - ' . ($dbname_is_wildcard ? __('Databases') : __('Database') );
+        if (isset($_REQUEST['tablename'])) {
+            $html_output .= ' <i><a href="server_privileges.php?' . $GLOBALS['url_query']
+                . '&amp;username=' . htmlspecialchars(urlencode($_REQUEST['username']))
+                . '&amp;hostname=' . htmlspecialchars(urlencode($_REQUEST['hostname']))
+                . '&amp;dbname=' . htmlspecialchars($url_dbname)
+                . '&amp;tablename=">' . htmlspecialchars($_REQUEST['dbname'])
+                . '</a></i>';
+            
+            $html_output .= ' - ' . __('Table')
+                . ' <i>' . htmlspecialchars($_REQUEST['tablename']) . '</i>';
+        } else {
+            $html_output .= ' <i>' . htmlspecialchars($_REQUEST['dbname']) . '</i>';
+        }
+
+    } else {
+        $html_output .= ' <i>\'' . htmlspecialchars($_REQUEST['username']) 
+            . '\'@\'' . htmlspecialchars($_REQUEST['hostname'])
+            . '\'</i>' . "\n";
+
+    }
+    $html_output .= '</h2>' . "\n";
+    
+    return $html_output;
+}
+
+function PMA_getHtmlForDiplayUserOverviewPage($link_edit, $pmaThemeImage,
+    $text_dir, $conditional_class, $link_export, $link_export_all
+) {
+    $html_output = '<h2>' . "\n"
+       . PMA_CommonFunctions::getInstance()->getIcon('b_usrlist.png')
+       . __('Users overview') . "\n"
+       . '</h2>' . "\n";
+
+    $sql_query = 'SELECT *,' .
+        "       IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" .
+        '  FROM `mysql`.`user`';
+
+    $sql_query .= (isset($_REQUEST['initial']) ? PMA_rangeOfUsers($_REQUEST['initial']) : '');
+
+    $sql_query .= ' ORDER BY `User` ASC, `Host` ASC;';
+    $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE);
+
+    if (! $res) {
+        // the query failed! This may have two reasons:
+        // - the user does not have enough privileges
+        // - the privilege tables use a structure of an earlier version.
+        // so let's try a more simple query
+
+        $sql_query = 'SELECT * FROM `mysql`.`user`';
+        $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE);
+
+        if (! $res) {
+            $html_output .= PMA_Message::error(__('No Privileges'))->getDisplay();
+            PMA_DBI_free_result($res);
+            unset($res);
+        } else {
+            // This message is hardcoded because I will replace it by
+            // a automatic repair feature soon.
+            $raw = 'Your privilege table structure seems to be older than'
+                . ' this MySQL version!<br />'
+                . 'Please run the <code>mysql_upgrade</code> command'
+                . '(<code>mysql_fix_privilege_tables</code> on older systems)'
+                . ' that should be included in your MySQL server distribution'
+                . ' to solve this problem!';
+            $html_output .= PMA_Message::rawError($raw)->getDisplay();
+        }
+    } else {
+        $db_rights = PMA_getDbRightsForUserOverview();
+        // for all initials, even non A-Z
+        $array_initials = array();
+
+        /**
+         * Displays the initials
+         * In an Ajax request, we don't need to show this.
+         * Also not necassary if there is less than 20 privileges
+         */
+        if ($GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) {
+            $html_output .= PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class);
+        }
+
+        /**
+        * Display the user overview
+        * (if less than 50 users, display them immediately)
+        */
+        if (isset($_REQUEST['initial']) || isset($_REQUEST['showall']) || PMA_DBI_num_rows($res) < 50) {
+            $html_output .= PMA_displayUserOverview($res, $db_rights, $link_edit,$pmaThemeImage,
+                    $text_dir, $conditional_class, $link_export, $link_export_all
+                );
+        } else {
+            $html_output .= PMA_getAddUserHtmlFieldset($conditional_class);
+        } // end if (display overview)
+
+        if ($GLOBALS['is_ajax_request']) {
+            exit;
+        }
+
+        $flushnote = new PMA_Message(
+            __('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.')
+            , PMA_Message::NOTICE
+        );
+        $flushnote->addParam(
+            '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;'
+                . 'flush_privileges=1" id="reload_privileges_anchor" '
+                . 'class="' . $conditional_class . '">',
+            false);
+        $flushnote->addParam('</a>', false);
+        $html_output .= $flushnote->getDisplay();
+
+        return $html_output;
+    }   
+}
+
+function PMA_getHtmlForDisplayUserPropeties($dbname_is_wildcard,$url_dbname,
+    $random_n, $username, $hostname, $link_edit, $link_revoke
+) {
+    if (PMA_isValid($_REQUEST['pred_dbname'])) {
+        $dbname = $_REQUEST['pred_dbname'];
+    } elseif (PMA_isValid($_REQUEST['dbname'])) {
+        $dbname = $_REQUEST['dbname'];
+    }
+    if (PMA_isValid($_REQUEST['pred_tablename'])) {
+        $tablename = $_REQUEST['pred_tablename'];
+    } elseif (PMA_isValid($_REQUEST['tablename'])) {
+        $tablename = $_REQUEST['tablename'];
+    }
+    $html_output = PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard);
+
+    $sql = "SELECT '1' FROM `mysql`.`user`"
+        . " WHERE `User` = '" . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
+        . " AND `Host` = '" . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "';";
+    
+    $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql);
+
+    if ($user_does_not_exists) {
+        $html_output .= PMA_Message::error(
+            __('The selected user was not found in the privilege table.')
+        )->getDisplay();
+        $html_output .= PMA_getHtmlForDisplayLoginInformationFields();
+        //exit;
+    }
+
+    $html_output .= '<form name="usersForm" id="addUsersForm_' . $random_n . '"'
+        . ' action="server_privileges.php" method="post">' . "\n";
+
+    $_params = array(
+        'username' => $username,
+        'hostname' => $hostname,
+    );
+    if (isset($dbname)) {
+        $_params['dbname'] = $dbname;
+        if (isset($tablename)) {
+            $_params['tablename'] = $tablename;
+        }
+    }
+    $html_output .= PMA_generate_common_hidden_inputs($_params);
+
+    $html_output .= PMA_getHtmlToDisplayPrivilegesTable(
+        $random_n,
+        PMA_ifSetOr($dbname, '*', 'length'),
+        PMA_ifSetOr($tablename, '*', 'length')
+    );
+
+    $html_output .= '</form>' . "\n";
+
+    if (! isset($tablename) && empty($dbname_is_wildcard)) {
+
+        // no table name was given, display all table specific rights
+        // but only if $dbname contains no wildcards
+
+        $html_output .= '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
+
+        list($html_rightsTable, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
+            $username, $hostname, $dbname, $link_edit, $link_revoke
+        );
+        $html_output .= $html_rightsTable;
+
+        if (! isset($dbname)) {
+            // no database name was given, display select db
+            $html_output .= PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows);
+
+        } else {
+            $html_output .= PMA_displayTablesInEditPrivs($dbname, $found_rows);
+        }
+        $html_output .= '</fieldset>' . "\n";
+
+        $html_output .= '<fieldset class="tblFooters">' . "\n"
+           . '    <input type="submit" value="' . __('Go') . '" />'
+           . '</fieldset>' . "\n"
+           . '</form>' . "\n";
+    }
+
+    // Provide a line with links to the relevant database and table
+    if (isset($dbname) && empty($dbname_is_wildcard)) {
+        $html_output .= PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
+
+    }
+
+    if (! isset($dbname) && ! $user_does_not_exists) {
+        //change login information
+        include_once 'libraries/display_change_password.lib.php';
+        $html_output .= PMA_getChangeLoginInformationHtmlForm($username, $hostname);
+    }
+    
+    return $html_output;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 845570db21..3c2e765df0 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -621,203 +621,23 @@ if (isset($_REQUEST['export'])
 if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs))) {
     if (! isset($username)) {
         // No username is given --> display the overview
-        echo '<h2>' . "\n"
-           . $common_functions->getIcon('b_usrlist.png')
-           . __('Users overview') . "\n"
-           . '</h2>' . "\n";
-
-        $sql_query = 'SELECT *,' .
-            "       IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" .
-            '  FROM `mysql`.`user`';
-
-        $sql_query .= (isset($initial) ? PMA_rangeOfUsers($initial) : '');
-
-        $sql_query .= ' ORDER BY `User` ASC, `Host` ASC;';
-        $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE);
-
-        if (! $res) {
-            // the query failed! This may have two reasons:
-            // - the user does not have enough privileges
-            // - the privilege tables use a structure of an earlier version.
-            // so let's try a more simple query
-
-            $sql_query = 'SELECT * FROM `mysql`.`user`';
-            $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE);
-
-            if (! $res) {
-                PMA_Message::error(__('No Privileges'))->display();
-                PMA_DBI_free_result($res);
-                unset($res);
-            } else {
-                // This message is hardcoded because I will replace it by
-                // a automatic repair feature soon.
-                $raw = 'Your privilege table structure seems to be older than'
-                    . ' this MySQL version!<br />'
-                    . 'Please run the <code>mysql_upgrade</code> command'
-                    . '(<code>mysql_fix_privilege_tables</code> on older systems)'
-                    . ' that should be included in your MySQL server distribution'
-                    . ' to solve this problem!';
-                PMA_Message::rawError($raw)->display();
-            }
-        } else {
-            $db_rights = PMA_getDbRightsForUserOverview();
-            // for all initials, even non A-Z
-            $array_initials = array();
-            
-            /**
-             * Displays the initials
-             * In an Ajax request, we don't need to show this.
-             * Also not necassary if there is less than 20 privileges
-             */
-            if ($GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) {
-                echo PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class);
-            }
-
-            /**
-            * Display the user overview
-            * (if less than 50 users, display them immediately)
-            */
-            if (isset($initial) || isset($showall) || PMA_DBI_num_rows($res) < 50) {
-
-                echo PMA_displayUserOverview($res, $db_rights, $link_edit,
-                    $pmaThemeImage, $text_dir, $conditional_class, $link_export, $link_export_all
-                );
-            } else {
-
-                unset ($row);
-                echo '    <fieldset id="fieldset_add_user">' . "\n"
-                   . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
-                   . $common_functions->getIcon('b_usradd.png')
-                   . '            ' . __('Add user') . '</a>' . "\n"
-                   . '    </fieldset>' . "\n";
-            } // end if (display overview)
-
-            if ($GLOBALS['is_ajax_request']) {
-                exit;
-            }
-
-            $flushnote = new PMA_Message(
-                __('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.')
-                , PMA_Message::NOTICE
-            );
-            $flushnote->addParam(
-                '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;'
-                    . 'flush_privileges=1" id="reload_privileges_anchor" '
-                    . 'class="' . $conditional_class . '">',
-                false);
-            $flushnote->addParam('</a>', false);
-            $flushnote->display();
-        }
-
-
+        $response->addHTML(
+            PMA_getHtmlForDiplayUserOverviewPage($link_edit, $pmaThemeImage,
+                $text_dir, $conditional_class, $link_export, $link_export_all
+            )
+        );
     } else {
-
         // A user was selected -> display the user's properties
 
         // In an Ajax request, prevent cached values from showing
         if ($GLOBALS['is_ajax_request'] == true) {
             header('Cache-Control: no-cache');
         }
-
-        echo '<h2>' . "\n"
-           . $common_functions->getIcon('b_usredit.png')
-           . __('Edit Privileges') . ': '
-           . __('User');
-
-        if (isset($dbname)) {
-            echo ' <i><a href="server_privileges.php?'
-                . $GLOBALS['url_query'] . '&amp;username=' . htmlspecialchars(urlencode($username))
-                . '&amp;hostname=' . htmlspecialchars(urlencode($hostname)) . '&amp;dbname=&amp;tablename=">\''
-                . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname)
-                . '\'</a></i>' . "\n";
-            $url_dbname = urlencode(str_replace(array('\_', '\%'), array('_', '%'), $dbname));
-
-            echo ' - ' . ($dbname_is_wildcard ? __('Databases') : __('Database') );
-            if (isset($tablename)) {
-                echo ' <i><a href="server_privileges.php?' . $GLOBALS['url_query']
-                    . '&amp;username=' . htmlspecialchars(urlencode($username)) . '&amp;hostname=' . htmlspecialchars(urlencode($hostname))
-                    . '&amp;dbname=' . htmlspecialchars($url_dbname) . '&amp;tablename=">' . htmlspecialchars($dbname) . '</a></i>';
-                echo ' - ' . __('Table') . ' <i>' . htmlspecialchars($tablename) . '</i>';
-            } else {
-                echo ' <i>' . htmlspecialchars($dbname) . '</i>';
-            }
-
-        } else {
-            echo ' <i>\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname)
-                . '\'</i>' . "\n";
-
-        }
-        echo '</h2>' . "\n";
-
-        $sql = "SELECT '1' FROM `mysql`.`user`"
-            . " WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
-            . " AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";
-        $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql);
-        unset($sql);
-        if ($user_does_not_exists) {
-            PMA_Message::error(__('The selected user was not found in the privilege table.'))->display();
-            echo PMA_getHtmlForDisplayLoginInformationFields();
-            //exit;
-        }
-
-        echo '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n";
-        $_params = array(
-            'username' => $username,
-            'hostname' => $hostname,
+        $response->addHTML(
+            PMA_getHtmlForDisplayUserPropeties($dbname_is_wildcard,$url_dbname,
+                $random_n, $username, $hostname, $link_edit, $link_revoke
+            )
         );
-        if (isset($dbname)) {
-            $_params['dbname'] = $dbname;
-            if (isset($tablename)) {
-                $_params['tablename'] = $tablename;
-            }
-        }
-        echo PMA_generate_common_hidden_inputs($_params);
-
-        echo PMA_getHtmlToDisplayPrivilegesTable(
-            $random_n,
-            PMA_ifSetOr($dbname, '*', 'length'),
-            PMA_ifSetOr($tablename, '*', 'length')
-        );
-
-        echo '</form>' . "\n";
-
-        if (! isset($tablename) && empty($dbname_is_wildcard)) {
-
-            // no table name was given, display all table specific rights
-            // but only if $dbname contains no wildcards
-
-            echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
-            
-            list($html_output, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
-                $username, $hostname, $dbname, $link_edit, $link_revoke
-            );
-            echo $html_output;
-
-            if (! isset($dbname)) {
-                // no database name was given, display select db
-                echo PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows);
-
-            } else {
-                echo PMA_displayTablesInEditPrivs($dbname, $found_rows);
-            }
-            echo '</fieldset>' . "\n";
-            echo '<fieldset class="tblFooters">' . "\n"
-               . '    <input type="submit" value="' . __('Go') . '" />'
-               . '</fieldset>' . "\n"
-               . '</form>' . "\n";
-        }
-
-        // Provide a line with links to the relevant database and table
-        if (isset($dbname) && empty($dbname_is_wildcard)) {
-            echo PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
-
-        }
-
-        if (! isset($dbname) && ! $user_does_not_exists) {
-            //change login information
-            include_once 'libraries/display_change_password.lib.php';
-            echo PMA_getChangeLoginInformationHtmlForm($username, $hostname);
-        }
     }
 } elseif (isset($_REQUEST['adduser'])) {
     // Add user

From 07139d60b83fe290eb64b352b06415fb7af65a56 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 19:09:53 +0530
Subject: [PATCH 061/102] add doc blocks and correct spelling mistake

---
 libraries/server_privileges.lib.php | 44 +++++++++++++++++++++++++++--
 server_privileges.php               |  2 +-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 52a60bb5e7..cd20d27e95 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2535,6 +2535,13 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
     return array($title, $export);
 }
 
+/**
+ * Get HTML for display Add userfieldset
+ * 
+ * @param string $conditional_class   if ajaxable 'Ajax' otherwise ''
+ * 
+ * @return string html output
+ */
 function PMA_getAddUserHtmlFieldset($conditional_class)
 {
     return '<fieldset id="fieldset_add_user">' . "\n"
@@ -2545,6 +2552,13 @@ function PMA_getAddUserHtmlFieldset($conditional_class)
         . '</fieldset>' . "\n";
 }
 
+/**
+ * Get HTML header for display User's properties
+ * 
+ * @param boolean $dbname_is_wildcard   whether database name is wildcard or not
+ * 
+ * @return string $html_output
+ */
 function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard)
 {
     $html_output = '<h2>' . "\n"
@@ -2594,7 +2608,19 @@ function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard)
     return $html_output;
 }
 
-function PMA_getHtmlForDiplayUserOverviewPage($link_edit, $pmaThemeImage,
+/**
+ * Get HTML snippet for display user overview page
+ * 
+ * @param string $link_edit         standard link to edit privileges
+ * @param string $pmaThemeImage     a image source link
+ * @param string $text_dir          text directory
+ * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
+ * @param string $link_export       standard link to export privileges
+ * @param string $link_export_all   standard link to export all privilegfes
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
     $text_dir, $conditional_class, $link_export, $link_export_all
 ) {
     $html_output = '<h2>' . "\n"
@@ -2681,7 +2707,21 @@ function PMA_getHtmlForDiplayUserOverviewPage($link_edit, $pmaThemeImage,
     }   
 }
 
-function PMA_getHtmlForDisplayUserPropeties($dbname_is_wildcard,$url_dbname,
+/**
+ * Get HTML snippet for display user properties
+ * 
+ * @param boolean $dbname_is_wildcard   whether database name is wildcard or not
+ * @param type $url_dbname              url database name that urlencode() string
+ * @param integer $random_n             a random number that will be appended
+ *                                      to the id of the user forms
+ * @param string $username              username
+ * @param string $hostname              host name
+ * @param string $link_edit             standard link to edit privileges
+ * @param string $link_revoke           standard link to revoke
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
     $random_n, $username, $hostname, $link_edit, $link_revoke
 ) {
     if (PMA_isValid($_REQUEST['pred_dbname'])) {
diff --git a/server_privileges.php b/server_privileges.php
index 3c2e765df0..d76567ceed 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -622,7 +622,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     if (! isset($username)) {
         // No username is given --> display the overview
         $response->addHTML(
-            PMA_getHtmlForDiplayUserOverviewPage($link_edit, $pmaThemeImage,
+            PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
                 $text_dir, $conditional_class, $link_export, $link_export_all
             )
         );

From df6ea4f4998f4cfd6209c8ecd505cce42ab119a5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 19:11:30 +0530
Subject: [PATCH 062/102] remove unwanted unset()

---
 libraries/server_privileges.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index cd20d27e95..624e4870d0 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1741,7 +1741,6 @@ function PMA_getUserSpecificRights($tables, $user_host_condition)
 
     if (PMA_isValid($_REQUEST['pred_dbname'])) {
         $dbname = $_REQUEST['pred_dbname'];
-        unset($pred_dbname);
     } elseif (PMA_isValid($_REQUEST['dbname'])) {
         $dbname = $_REQUEST['dbname'];
     }

From b9ad5351f195628f5624bcaafd126809f74f94eb Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 19:19:40 +0530
Subject: [PATCH 063/102] change function name

---
 libraries/server_privileges.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 624e4870d0..bb22e31dd6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2067,7 +2067,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
 }
 
 /**
- * Display the user overview
+ * Get HTML for display the user overview
  * (if less than 50 users, display them immediately)
  * 
  * @param array $result             ran sql query
@@ -2081,7 +2081,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
  * 
  * @return string HTML snippet
  */
-function PMA_displayUserOverview($result, $db_rights, $link_edit, $pmaThemeImage,
+function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
     $text_dir, $conditional_class, $link_export, $link_export_all
 ) {
     $common_functions = PMA_CommonFunctions::getInstance();
@@ -2679,7 +2679,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
         * (if less than 50 users, display them immediately)
         */
         if (isset($_REQUEST['initial']) || isset($_REQUEST['showall']) || PMA_DBI_num_rows($res) < 50) {
-            $html_output .= PMA_displayUserOverview($res, $db_rights, $link_edit,$pmaThemeImage,
+            $html_output .= PMA_getUsersOverview($res, $db_rights, $link_edit,$pmaThemeImage,
                     $text_dir, $conditional_class, $link_export, $link_export_all
                 );
         } else {

From 10da9e98194c7904a969a93192f9377c2c78adad Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 19:58:35 +0530
Subject: [PATCH 064/102] spelling mistake

---
 server_privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_privileges.php b/server_privileges.php
index d76567ceed..eda7866f30 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -634,7 +634,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             header('Cache-Control: no-cache');
         }
         $response->addHTML(
-            PMA_getHtmlForDisplayUserPropeties($dbname_is_wildcard,$url_dbname,
+            PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
                 $random_n, $username, $hostname, $link_edit, $link_revoke
             )
         );

From d2e720af289b02ed6018f471f57165d727f19561 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 20:01:12 +0530
Subject: [PATCH 065/102] improve doc

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index bb22e31dd6..dd90c7bf0b 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2067,7 +2067,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
 }
 
 /**
- * Get HTML for display the user overview
+ * Get HTML for display the users overview
  * (if less than 50 users, display them immediately)
  * 
  * @param array $result             ran sql query

From 83368f096f0c14279fafa8a2f96afbd20e823d0d Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 20:04:51 +0530
Subject: [PATCH 066/102] improve a function name

---
 libraries/server_privileges.lib.php | 4 ++--
 server_privileges.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index dd90c7bf0b..7c834241a8 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1183,7 +1183,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  *
  * @return string $sql_query
  */
-function PMA_getCommonSqlQueryForAddUserAndUpdatePrivs()
+function PMA_getWithClauseForAddUserAndUpdatePrivs()
 {
     $sql_query = 'WITH';
     if (isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y') {
@@ -2460,7 +2460,7 @@ function PMA_updatePrivileges($username, $hostname)
             && (isset($_POST['max_questions']) || isset($_POST['max_connections'])
             || isset($_POST['max_updates']) || isset($_POST['max_user_connections'])))
         ) {
-            $sql_query2 .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
+            $sql_query2 .= PMA_getWithClauseForAddUserAndUpdatePrivs();
         }
         $sql_query2 .= ';';
     }
diff --git a/server_privileges.php b/server_privileges.php
index eda7866f30..6707cb82b4 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -278,7 +278,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             || (isset($max_questions) || isset($max_connections)
             || isset($max_updates) || isset($max_user_connections))
         ) {
-            $real_sql_query .= PMA_getCommonSqlQueryForAddUserAndUpdatePrivs();
+            $real_sql_query .= PMA_getWithClauseForAddUserAndUpdatePrivs();
             $sql_query .= $real_sql_query;
         }
         if (isset($create_user_real)) {

From d3092e95492c61461f12a1beffa32a587badc61b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 20:20:14 +0530
Subject: [PATCH 067/102] improve function names and variable names

---
 libraries/server_privileges.lib.php | 24 ++++++++++++------------
 server_privileges.php               |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7c834241a8..8c3b903870 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1325,13 +1325,13 @@ function PMA_getListOfPrivilegesAndComparedPrivileges()
 /**
  * Get the HTML for user form and check the privileges for a particular database.
  * 
- * @param string $checkprivs        check privileges
+ * @param string $dbToCheck         check privileges
  * @param string $link_edit         standard link for edit
  * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
  * 
  * @return string $html_output
  */
-function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
+function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional_class)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     // check the privileges for a particular database.
@@ -1341,7 +1341,7 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
         . '    '
         . sprintf(
            __('Users having access to &quot;%s&quot;'),
-           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' .  htmlspecialchars($checkprivs) . '</a>'
+           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">' .  htmlspecialchars($checkprivs) . '</a>'
         )
         . "\n"
         . '</legend>' . "\n";
@@ -1363,7 +1363,7 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
 
     $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`'
         .' FROM `mysql`.`db`'
-        .' WHERE \'' . $common_functions->sqlAddSlashes($checkprivs) . "'"
+        .' WHERE \'' . $common_functions->sqlAddSlashes($dbToCheck) . "'"
         .' LIKE `Db`'
         .' AND NOT (' . $list_of_compared_privileges. ')) '
         .'UNION '
@@ -1378,8 +1378,8 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
     if ($row) {
         $found = true;
     }
-    $html_output .= PMA_getUserFormTableBody(
-        $found, $row, $odd_row, $link_edit, $res, $checkprivs
+    $html_output .= PMA_getHtmlTableBodyForSpecificDbPrivs(
+        $found, $row, $odd_row, $link_edit, $res, $dbToCheck
     );
     $html_output .= '</table>'
         . '</fieldset>'
@@ -1397,8 +1397,8 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
            . '<legend>' . __('New') . '</legend>' . "\n";
         
         $html_output .= '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs)
-            .'" rel="'.'checkprivs='.htmlspecialchars($checkprivs). '&amp;'.$GLOBALS['url_query']
+            . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($dbToCheck)
+            .'" rel="'.'checkprivs='.htmlspecialchars($dbToCheck). '&amp;'.$GLOBALS['url_query']
             . '" class="'.$conditional_class
             .'" name="db_specific">' . "\n"
             . $common_functions->getIcon('b_usradd.png')
@@ -1410,18 +1410,18 @@ function PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
 }
 
 /**
- * Get HTML snippet for table body of user form
+ * Get HTML snippet for table body of specific database privileges
  * 
  * @param boolean $found        whether user found or not
  * @param array $row            array of rows from mysql , db table with list of privileges  
  * @param boolean $odd_row      whether odd or not
  * @param string $link_edit     standard link for edit
  * @param string $res           ran sql query
- * @param string $checkprivs    check privileges
+ * @param string $dbToCheck    check privileges
  *            
  * @return string $html_output
  */
-function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res, $checkprivs)
+function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, $link_edit, $res, $dbToCheck)
 {
     $html_output = '<tbody>' . "\n";
     if ($found) {
@@ -1457,7 +1457,7 @@ function PMA_getUserFormTableBody($found, $row, $odd_row, $link_edit, $res, $che
                    . '            ';
                 if (! isset($current['Db']) || $current['Db'] == '*') {
                     $html_output .= __('global');
-                } elseif ($current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($checkprivs)) {
+                } elseif ($current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($dbToCheck)) {
                     $html_output .= __('database-specific');
                 } else {
                     $html_output .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
diff --git a/server_privileges.php b/server_privileges.php
index 6707cb82b4..5ffa7ed4b2 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -647,7 +647,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 } else {
     // check the privileges for a particular database.
     $response->addHTML(
-        PMA_getUserForm($checkprivs, $link_edit, $conditional_class)
+        PMA_getHtmlForSpecificDbPrivileges($checkprivs, $link_edit, $conditional_class)
     );    
 } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...
 

From 4efa2156887185a3d54152b6caaa07d014b6bca1 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 20:23:13 +0530
Subject: [PATCH 068/102] improve doc comment

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 8c3b903870..7840396a76 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1179,7 +1179,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
 }
 
 /**
- * Get a common SQL query for 'update privileges' and 'add user'
+ * Get a WITH clause for 'update privileges' and 'add user'
  *
  * @return string $sql_query
  */

From 6f67701831497c2fa362a261a5a06115d6f1ee75 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 11 Jul 2012 22:51:19 +0530
Subject: [PATCH 069/102] improve doc comment

---
 libraries/server_privileges.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 7840396a76..0e9e3c0f48 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1325,7 +1325,7 @@ function PMA_getListOfPrivilegesAndComparedPrivileges()
 /**
  * Get the HTML for user form and check the privileges for a particular database.
  * 
- * @param string $dbToCheck         check privileges
+ * @param string $dbToCheck         database to check for privileges
  * @param string $link_edit         standard link for edit
  * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
  * 
@@ -1417,7 +1417,7 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
  * @param boolean $odd_row      whether odd or not
  * @param string $link_edit     standard link for edit
  * @param string $res           ran sql query
- * @param string $dbToCheck    check privileges
+ * @param string $dbToCheck     database to check for privileges
  *            
  * @return string $html_output
  */

From 519ff99ff6ab3cf42b4e3d179560c6efa7f6d7fe Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Thu, 12 Jul 2012 23:46:53 +0530
Subject: [PATCH 070/102] functions implement for get queries for Db speicific
 privs

---
 libraries/server_privileges.lib.php | 119 ++++++++++++++++++++++++++++
 server_privileges.php               |  79 +-----------------
 2 files changed, 121 insertions(+), 77 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0e9e3c0f48..67b2e53ecf 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2813,4 +2813,123 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
     
     return $html_output;
 }
+
+/**
+ * Get queries for Table privileges to change or copy user
+ * 
+ * @param string $user_host_condition   user host condition to select relevent table privileges
+ * @param string $queries               queries array
+ * @param string $username              username
+ * @param string $hostname              host name
+ * 
+ * @return array  $queries
+ */
+function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
+     $queries, $username, $hostname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    $res = PMA_DBI_query(
+        'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition,
+        $GLOBALS['userlink'],
+        PMA_DBI_QUERY_STORE
+    );
+    while ($row = PMA_DBI_fetch_assoc($res)) {
+
+        $res2 = PMA_DBI_QUERY(
+            'SELECT `Column_name`, `Column_priv`'
+            .' FROM `mysql`.`columns_priv`'
+            .' WHERE `User`'
+            .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . "'"
+            .' AND `Host`'
+            .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . '\''
+            .' AND `Db`'
+            .' = \'' . $common_functions->sqlAddSlashes($row['Db']) . "'"
+            .' AND `Table_name`'
+            .' = \'' . $common_functions->sqlAddSlashes($row['Table_name']) . "'"
+            .';',
+            null,
+            PMA_DBI_QUERY_STORE
+        );
+
+        $tmp_privs1 = PMA_extractPrivInfo($row);
+        $tmp_privs2 = array(
+            'Select' => array(),
+            'Insert' => array(),
+            'Update' => array(),
+            'References' => array()
+        );
+
+        while ($row2 = PMA_DBI_fetch_assoc($res2)) {
+            $tmp_array = explode(',', $row2['Column_priv']);
+            if (in_array('Select', $tmp_array)) {
+                $tmp_privs2['Select'][] = $row2['Column_name'];
+            }
+            if (in_array('Insert', $tmp_array)) {
+                $tmp_privs2['Insert'][] = $row2['Column_name'];
+            }
+            if (in_array('Update', $tmp_array)) {
+                $tmp_privs2['Update'][] = $row2['Column_name'];
+            }
+            if (in_array('References', $tmp_array)) {
+                $tmp_privs2['References'][] = $row2['Column_name'];
+            }
+        }
+        if (count($tmp_privs2['Select']) > 0 && ! in_array('SELECT', $tmp_privs1)) {
+            $tmp_privs1[] = 'SELECT (`' . join('`, `', $tmp_privs2['Select']) . '`)';
+        }
+        if (count($tmp_privs2['Insert']) > 0 && ! in_array('INSERT', $tmp_privs1)) {
+            $tmp_privs1[] = 'INSERT (`' . join('`, `', $tmp_privs2['Insert']) . '`)';
+        }
+        if (count($tmp_privs2['Update']) > 0 && ! in_array('UPDATE', $tmp_privs1)) {
+            $tmp_privs1[] = 'UPDATE (`' . join('`, `', $tmp_privs2['Update']) . '`)';
+        }
+        if (count($tmp_privs2['References']) > 0 && ! in_array('REFERENCES', $tmp_privs1)) {
+            $tmp_privs1[] = 'REFERENCES (`' . join('`, `', $tmp_privs2['References']) . '`)';
+        }
+        
+        $queries[] = 'GRANT ' . join(', ', $tmp_privs1)
+            . ' ON ' . $common_functions->backquote($row['Db']) . '.'
+            . $common_functions->backquote($row['Table_name'])
+            . ' TO \'' . $common_functions->sqlAddSlashes($username) 
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\''
+            . (in_array('Grant', explode(',', $row['Table_priv'])) ? ' WITH GRANT OPTION;' : ';');
+    }
+    return $queries;
+}
+
+/**
+ * Get queries for database speicific privileges foe change or copy user
+ * 
+ * @param array $queries        queries array with string
+ * @param string $username      username
+ * @param string $hostname      host name
+ * 
+ * @return array $queries       
+ */
+function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $hostname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $user_host_condition = ' WHERE `User`'
+        .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . "'"
+        .' AND `Host`'
+        .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . '\';';
+    
+    $res = PMA_DBI_query('SELECT * FROM `mysql`.`db`' . $user_host_condition);
+    
+    while ($row = PMA_DBI_fetch_assoc($res)) {
+        $queries[] = 'GRANT ' . join(', ', PMA_extractPrivInfo($row))
+            .' ON ' . $common_functions->backquote($row['Db']) . '.*'
+            .' TO \'' . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\''
+            . ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';');
+    }
+    PMA_DBI_free_result($res);
+    
+    $queries = PMA_getTablePrivsQueriesForChangeOrCopyUser(
+        $user_host_condition, $queries, $username, $hostname
+    );
+    
+    return $queries;
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 5ffa7ed4b2..71455f282d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -372,88 +372,13 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
     }
 }
 
-
 /**
  * Changes / copies a user, part III
  */
 if (isset($_REQUEST['change_copy'])) {
-    $user_host_condition = ' WHERE `User`'
-        .' = \'' . $common_functions->sqlAddSlashes($old_username) . "'"
-        .' AND `Host`'
-        .' = \'' . $common_functions->sqlAddSlashes($old_hostname) . '\';';
-    $res = PMA_DBI_query('SELECT * FROM `mysql`.`db`' . $user_host_condition);
-    while ($row = PMA_DBI_fetch_assoc($res)) {
-        $queries[] = 'GRANT ' . join(', ', PMA_extractPrivInfo($row))
-            .' ON ' . $common_functions->backquote($row['Db']) . '.*'
-            .' TO \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\''
-            . ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';');
-    }
-    PMA_DBI_free_result($res);
-    $res = PMA_DBI_query(
-        'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition,
-        $GLOBALS['userlink'],
-        PMA_DBI_QUERY_STORE
+    $queries = PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
+        $queries, $username, $hostname
     );
-    while ($row = PMA_DBI_fetch_assoc($res)) {
-
-        $res2 = PMA_DBI_QUERY(
-            'SELECT `Column_name`, `Column_priv`'
-            .' FROM `mysql`.`columns_priv`'
-            .' WHERE `User`'
-            .' = \'' . $common_functions->sqlAddSlashes($old_username) . "'"
-            .' AND `Host`'
-            .' = \'' . $common_functions->sqlAddSlashes($old_hostname) . '\''
-            .' AND `Db`'
-            .' = \'' . $common_functions->sqlAddSlashes($row['Db']) . "'"
-            .' AND `Table_name`'
-            .' = \'' . $common_functions->sqlAddSlashes($row['Table_name']) . "'"
-            .';',
-            null,
-            PMA_DBI_QUERY_STORE
-        );
-
-        $tmp_privs1 = PMA_extractPrivInfo($row);
-        $tmp_privs2 = array(
-            'Select' => array(),
-            'Insert' => array(),
-            'Update' => array(),
-            'References' => array()
-        );
-
-        while ($row2 = PMA_DBI_fetch_assoc($res2)) {
-            $tmp_array = explode(',', $row2['Column_priv']);
-            if (in_array('Select', $tmp_array)) {
-                $tmp_privs2['Select'][] = $row2['Column_name'];
-            }
-            if (in_array('Insert', $tmp_array)) {
-                $tmp_privs2['Insert'][] = $row2['Column_name'];
-            }
-            if (in_array('Update', $tmp_array)) {
-                $tmp_privs2['Update'][] = $row2['Column_name'];
-            }
-            if (in_array('References', $tmp_array)) {
-                $tmp_privs2['References'][] = $row2['Column_name'];
-            }
-            unset($tmp_array);
-        }
-        if (count($tmp_privs2['Select']) > 0 && ! in_array('SELECT', $tmp_privs1)) {
-            $tmp_privs1[] = 'SELECT (`' . join('`, `', $tmp_privs2['Select']) . '`)';
-        }
-        if (count($tmp_privs2['Insert']) > 0 && ! in_array('INSERT', $tmp_privs1)) {
-            $tmp_privs1[] = 'INSERT (`' . join('`, `', $tmp_privs2['Insert']) . '`)';
-        }
-        if (count($tmp_privs2['Update']) > 0 && ! in_array('UPDATE', $tmp_privs1)) {
-            $tmp_privs1[] = 'UPDATE (`' . join('`, `', $tmp_privs2['Update']) . '`)';
-        }
-        if (count($tmp_privs2['References']) > 0 && ! in_array('REFERENCES', $tmp_privs1)) {
-            $tmp_privs1[] = 'REFERENCES (`' . join('`, `', $tmp_privs2['References']) . '`)';
-        }
-        unset($tmp_privs2);
-        $queries[] = 'GRANT ' . join(', ', $tmp_privs1)
-            . ' ON ' . $common_functions->backquote($row['Db']) . '.' . $common_functions->backquote($row['Table_name'])
-            . ' TO \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\''
-            . (in_array('Grant', explode(',', $row['Table_priv'])) ? ' WITH GRANT OPTION;' : ';');
-    }
 }
 
 /**

From 2bb169e1d63082f5a1883d3b635afaffc937fac1 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 01:02:10 +0530
Subject: [PATCH 071/102] PMA_addUser() function implementation

---
 libraries/server_privileges.lib.php | 68 ++++++++++++++++++++++++++++-
 server_privileges.php               | 64 +++------------------------
 2 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 67b2e53ecf..34ef4cb1c8 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2898,7 +2898,7 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
 }
 
 /**
- * Get queries for database speicific privileges foe change or copy user
+ * Get queries for database specific privileges for change or copy user
  * 
  * @param array $queries        queries array with string
  * @param string $username      username
@@ -2932,4 +2932,70 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
     
     return $queries;
 }
+
+function PMA_addUser($_error, $real_sql_query, $sql_query, $username, $hostname)
+{
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
+        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
+        $message = PMA_Message::rawError(PMA_DBI_getError());
+    } else {
+        $message = PMA_Message::success(__('You have added a new user.'));
+    }
+
+    if (isset($_REQUEST['createdb-1'])) {
+        // Create database with same name and grant all privileges
+        $q = 'CREATE DATABASE IF NOT EXISTS '
+            . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+
+        /**
+         * If we are not in an Ajax request, we can't reload navigation now
+         */
+        if ($GLOBALS['is_ajax_request'] != true) {
+            // this is needed in case tracking is on:
+            $GLOBALS['db'] = $username;
+            $GLOBALS['reload'] = true;
+            echo $common_functions->getReloadNavigationScript();
+        }
+
+        $q = 'GRANT ALL PRIVILEGES ON '
+            . $common_functions->backquote(
+                $common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))
+            ) . '.* TO \''
+            . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+
+    if (isset($_REQUEST['createdb-2'])) {
+        // Grant all privileges on wildcard name (username\_%)
+        $q = 'GRANT ALL PRIVILEGES ON '
+            . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+
+    if (isset($_REQUEST['createdb-3'])) {
+        // Grant all privileges on the specified database to the new user
+        $q = 'GRANT ALL PRIVILEGES ON '
+        . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
+        . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        $sql_query .= $q;
+        if (! PMA_DBI_try_query($q)) {
+            $message = PMA_Message::rawError(PMA_DBI_getError());
+        }
+    }
+    return array($sql_query, $message);
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 71455f282d..8ba598e071 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -296,69 +296,15 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 }
                 $sql_query = $create_user_show . $sql_query;
             }
+            list($sql_query, $message) = PMA_addUser($_error, $real_sql_query,
+                $sql_query, $username, $hostname
+            );
 
-            if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
-                $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
-                $message = PMA_Message::rawError(PMA_DBI_getError());
-            } else {
-                $message = PMA_Message::success(__('You have added a new user.'));
-            }
-
-            if (isset($_REQUEST['createdb-1'])) {
-                // Create database with same name and grant all privileges
-                $q = 'CREATE DATABASE IF NOT EXISTS '
-                    . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
-                $sql_query .= $q;
-                if (! PMA_DBI_try_query($q)) {
-                    $message = PMA_Message::rawError(PMA_DBI_getError());
-                }
-
-
-                /**
-                 * If we are not in an Ajax request, we can't reload navigation now
-                 */
-                if ($GLOBALS['is_ajax_request'] != true) {
-                    // this is needed in case tracking is on:
-                    $GLOBALS['db'] = $username;
-                    $GLOBALS['reload'] = true;
-                    echo $common_functions->getReloadNavigationScript();
-                }
-
-                $q = 'GRANT ALL PRIVILEGES ON '
-                    . $common_functions->backquote($common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))) . '.* TO \''
-                    . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-                $sql_query .= $q;
-                if (! PMA_DBI_try_query($q)) {
-                    $message = PMA_Message::rawError(PMA_DBI_getError());
-                }
-            }
-
-            if (isset($_REQUEST['createdb-2'])) {
-                // Grant all privileges on wildcard name (username\_%)
-                $q = 'GRANT ALL PRIVILEGES ON '
-                    . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
-                    . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-                $sql_query .= $q;
-                if (! PMA_DBI_try_query($q)) {
-                    $message = PMA_Message::rawError(PMA_DBI_getError());
-                }
-            }
-
-            if (isset($_REQUEST['createdb-3'])) {
-                // Grant all privileges on the specified database to the new user
-                $q = 'GRANT ALL PRIVILEGES ON '
-                . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
-                . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
-                $sql_query .= $q;
-                if (! PMA_DBI_try_query($q)) {
-                    $message = PMA_Message::rawError(PMA_DBI_getError());
-                }
-            }
         } else {
             if (isset($create_user_real)) {
-                $queries[]             = $create_user_real;
+                $queries[] = $create_user_real;
             }
-            $queries[]             = $real_sql_query;
+            $queries[] = $real_sql_query;
             // we put the query containing the hidden password in
             // $queries_for_display, at the same position occupied
             // by the real query in $queries

From bb84591a1de1abefa3c2f1ecb6456fa31d31b5c1 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 01:40:22 +0530
Subject: [PATCH 072/102] add doc comment and change function name

---
 libraries/server_privileges.lib.php | 13 ++++++++++++-
 server_privileges.php               |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 34ef4cb1c8..4289316657 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2933,7 +2933,18 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
     return $queries;
 }
 
-function PMA_addUser($_error, $real_sql_query, $sql_query, $username, $hostname)
+/**
+ * Prepares queries for adding users and also create database and return query and message
+ * 
+ * @param boolean $_error           whether use create or not         
+ * @param string $real_sql_query    real sql query
+ * @param string $sql_query         sql query
+ * @param string $username          username
+ * @param string $hostname          host name
+ * 
+ * @return array  $sql_query, $message
+ */
+function PMA_getQueryAndMessageForAddUser($_error, $real_sql_query, $sql_query, $username, $hostname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     
diff --git a/server_privileges.php b/server_privileges.php
index 8ba598e071..62f9eae851 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -296,8 +296,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 }
                 $sql_query = $create_user_show . $sql_query;
             }
-            list($sql_query, $message) = PMA_addUser($_error, $real_sql_query,
-                $sql_query, $username, $hostname
+            list($sql_query, $message) = PMA_getQueryAndMessageForAddUser(
+                $_error, $real_sql_query, $sql_query, $username, $hostname
             );
 
         } else {

From 30cf9d5e3f63e6ad2e68e50bf1de56d7e196b94d Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 02:01:43 +0530
Subject: [PATCH 073/102] remove invalid SQL query

---
 libraries/server_privileges.lib.php | 2 +-
 server_privileges.php               | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 4289316657..d382d1d09e 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1185,7 +1185,7 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  */
 function PMA_getWithClauseForAddUserAndUpdatePrivs()
 {
-    $sql_query = 'WITH';
+    $sql_query = '';
     if (isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
     }
diff --git a/server_privileges.php b/server_privileges.php
index 62f9eae851..cdab88f04b 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -278,8 +278,11 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             || (isset($max_questions) || isset($max_connections)
             || isset($max_updates) || isset($max_user_connections))
         ) {
-            $real_sql_query .= PMA_getWithClauseForAddUserAndUpdatePrivs();
-            $sql_query .= $real_sql_query;
+            $with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
+        }
+        if (!empty ($with_clause)) {
+            $real_sql_query .= 'WITH' . $with_clause;
+            $sql_query .= 'WITH' . $with_clause;
         }
         if (isset($create_user_real)) {
             $create_user_real .= ';';

From f0dbcd47334276a3c839045f18f53015d9f76058 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 20:43:07 +0530
Subject: [PATCH 074/102] function name improvement and correct spelling
 mistake

---
 libraries/server_privileges.lib.php | 4 ++--
 server_privileges.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index d382d1d09e..e26ec18085 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2936,7 +2936,7 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
 /**
  * Prepares queries for adding users and also create database and return query and message
  * 
- * @param boolean $_error           whether use create or not         
+ * @param boolean $_error           whether user create or not         
  * @param string $real_sql_query    real sql query
  * @param string $sql_query         sql query
  * @param string $username          username
@@ -2944,7 +2944,7 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
  * 
  * @return array  $sql_query, $message
  */
-function PMA_getQueryAndMessageForAddUser($_error, $real_sql_query, $sql_query, $username, $hostname)
+function PMA_addUserAndCreateDatabas($_error, $real_sql_query, $sql_query, $username, $hostname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     
diff --git a/server_privileges.php b/server_privileges.php
index cdab88f04b..a64eaa96cf 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -299,7 +299,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 }
                 $sql_query = $create_user_show . $sql_query;
             }
-            list($sql_query, $message) = PMA_getQueryAndMessageForAddUser(
+            list($sql_query, $message) = PMA_addUserAndCreateDatabas(
                 $_error, $real_sql_query, $sql_query, $username, $hostname
             );
 

From 800308a5f117381dee30ab7ca35557fb41937133 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 21:10:09 +0530
Subject: [PATCH 075/102] improve PMA_getWithClauseForAddUserAndUpdatePrivs()
 function

---
 libraries/server_privileges.lib.php | 8 +++++++-
 server_privileges.php               | 7 +++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index e26ec18085..c3afa08b50 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1185,27 +1185,33 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  */
 function PMA_getWithClauseForAddUserAndUpdatePrivs()
 {
+    $isWith = false;
     $sql_query = '';
     if (isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
+        $isWith = true;
     }
     if (isset($_POST['max_questions'])) {
         $max_questions = max(0, (int)$_POST['max_questions']);
         $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
+        $isWith = true;
     }
     if (isset($_POST['max_connections'])) {
         $max_connections = max(0, (int)$_POST['max_connections']);
         $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
+        $isWith = true;
     }
     if (isset($_POST['max_updates'])) {
         $max_updates = max(0, (int)$_POST['max_updates']);
         $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
+        $isWith = true;
     }
     if (isset($_POST['max_user_connections'])) {
         $max_user_connections = max(0, (int)$_POST['max_user_connections']);
         $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
+        $isWith = true;
     }
-    return $sql_query;
+    return ($isWith ? 'WITH' . $sql_query : $sql_query);
 }
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index a64eaa96cf..51c375f5a1 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -279,11 +279,10 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             || isset($max_updates) || isset($max_user_connections))
         ) {
             $with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
+            $real_sql_query .= $with_clause;
+            $sql_query .= $with_clause;
         }
-        if (!empty ($with_clause)) {
-            $real_sql_query .= 'WITH' . $with_clause;
-            $sql_query .= 'WITH' . $with_clause;
-        }
+
         if (isset($create_user_real)) {
             $create_user_real .= ';';
             $create_user_show .= ';';

From 630b50074a40a6919c9a4d0281bf3212c0b153da Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 21:24:46 +0530
Subject: [PATCH 076/102] improve doc comment

---
 libraries/server_privileges.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c3afa08b50..25877b0675 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2943,8 +2943,8 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
  * Prepares queries for adding users and also create database and return query and message
  * 
  * @param boolean $_error           whether user create or not         
- * @param string $real_sql_query    real sql query
- * @param string $sql_query         sql query
+ * @param string $real_sql_query    SQL query for add a user
+ * @param string $sql_query         SQL query for display
  * @param string $username          username
  * @param string $hostname          host name
  * 

From c28619d85fe8cdfac8ec4699e3d34d0949a9df3d Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 21:44:07 +0530
Subject: [PATCH 077/102] remove PHP notice

---
 libraries/server_privileges.lib.php | 12 +++---------
 server_privileges.php               |  6 ++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 25877b0675..f5f4f4679a 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2561,10 +2561,11 @@ function PMA_getAddUserHtmlFieldset($conditional_class)
  * Get HTML header for display User's properties
  * 
  * @param boolean $dbname_is_wildcard   whether database name is wildcard or not
+ * @param type $url_dbname              url database name that urlencode() string
  * 
  * @return string $html_output
  */
-function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard)
+function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard, $url_dbname)
 {
     $html_output = '<h2>' . "\n"
        . PMA_CommonFunctions::getInstance()->getIcon('b_usredit.png')
@@ -2579,13 +2580,6 @@ function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard)
             . '&amp;dbname=&amp;tablename=">\'' . htmlspecialchars($_REQUEST['username'])
             . '\'@\'' . htmlspecialchars($_REQUEST['hostname'])
             . '\'</a></i>' . "\n";
-        
-        $url_dbname = urlencode(
-            str_replace(
-                array('\_', '\%'),
-                array('_', '%'), $_REQUEST['dbname']
-            )
-        );
 
         $html_output .= ' - ' . ($dbname_is_wildcard ? __('Databases') : __('Database') );
         if (isset($_REQUEST['tablename'])) {
@@ -2739,7 +2733,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
     } elseif (PMA_isValid($_REQUEST['tablename'])) {
         $tablename = $_REQUEST['tablename'];
     }
-    $html_output = PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard);
+    $html_output = PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard, $url_dbname);
 
     $sql = "SELECT '1' FROM `mysql`.`user`"
         . " WHERE `User` = '" . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
diff --git a/server_privileges.php b/server_privileges.php
index 51c375f5a1..2581d9aa4d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -506,6 +506,12 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         if ($GLOBALS['is_ajax_request'] == true) {
             header('Cache-Control: no-cache');
         }
+        $url_dbname = urlencode(
+            str_replace(
+                array('\_', '\%'),
+                array('_', '%'), $_REQUEST['dbname']
+            )
+        );
         $response->addHTML(
             PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
                 $random_n, $username, $hostname, $link_edit, $link_revoke

From e00cf973c001854002e0a40b125ef83a850fe6a6 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 22:02:38 +0530
Subject: [PATCH 078/102] remove unwanted parameter from
 PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn()

---
 libraries/server_privileges.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f5f4f4679a..6b6c981930 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -560,7 +560,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
     
     // privs that are not attached to a specific column   
     $html_output .= '<div class="item">' . "\n"
-        . PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_type)
+        . PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
         . '</div>' . "\n";
     
     // for Safari 2.0.2
@@ -605,11 +605,10 @@ function PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row)
  * Get HTML for privileges that are not attached to a specific column
  * 
  * @param array $row         first row from result or boolean false
- * @param array $grant_type  privilrge type
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row, $grant_type)
+function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
 {
     $html_output = '';
     foreach ($row as $current_grant => $current_grant_value) {

From 57cc90e00e1c4606fb2f1567f253a548d896aebe Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Fri, 13 Jul 2012 23:04:39 +0530
Subject: [PATCH 079/102] correct wrong variable declaration

---
 libraries/server_privileges.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 6b6c981930..f7b2e65eeb 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1852,10 +1852,11 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
     } elseif (PMA_isValid($_REQUEST['dbname'])) {
         $dbname = $_REQUEST['dbname'];
     }
+    $html_output = '';
     $found_rows = array();
     // display rows
     if (count($db_rights) < 1) {
-        $html_output = '<tr class="odd">' . "\n"
+        $html_output .= '<tr class="odd">' . "\n"
            . '<td colspan="6"><center><i>' . __('None') . '</i></center></td>' . "\n"
            . '</tr>' . "\n";
     } else {
@@ -1864,7 +1865,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
         foreach ($db_rights as $row) {
             $found_rows[] = (! isset($dbname)) ? $row['Db'] : $row['Table_name'];
 
-            $html_output = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
+            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
                 . '<td>'  
                 . htmlspecialchars((! isset($dbname))
                     ? $row['Db']

From 8ee8a5ffbce0da41007f9042111d15d34c83d359 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 14 Jul 2012 17:18:28 +0530
Subject: [PATCH 080/102] spelling mistakes

---
 libraries/server_privileges.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f7b2e65eeb..06dd2ae593 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2938,13 +2938,13 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
  * 
  * @param boolean $_error           whether user create or not         
  * @param string $real_sql_query    SQL query for add a user
- * @param string $sql_query         SQL query for display
+ * @param string $sql_query         SQL query to be displayed
  * @param string $username          username
  * @param string $hostname          host name
  * 
  * @return array  $sql_query, $message
  */
-function PMA_addUserAndCreateDatabas($_error, $real_sql_query, $sql_query, $username, $hostname)
+function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $username, $hostname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     

From 9aa636b766fc0fca0f56f4c08f4c90f848a4f32b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 14 Jul 2012 17:23:14 +0530
Subject: [PATCH 081/102] improve PMA_getWithClauseForAddUserAndUpdatePrivs()

---
 libraries/server_privileges.lib.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 06dd2ae593..0b75df714d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1184,33 +1184,27 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
  */
 function PMA_getWithClauseForAddUserAndUpdatePrivs()
 {
-    $isWith = false;
     $sql_query = '';
     if (isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y') {
         $sql_query .= ' GRANT OPTION';
-        $isWith = true;
     }
     if (isset($_POST['max_questions'])) {
         $max_questions = max(0, (int)$_POST['max_questions']);
         $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-        $isWith = true;
     }
     if (isset($_POST['max_connections'])) {
         $max_connections = max(0, (int)$_POST['max_connections']);
         $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-        $isWith = true;
     }
     if (isset($_POST['max_updates'])) {
         $max_updates = max(0, (int)$_POST['max_updates']);
         $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-        $isWith = true;
     }
     if (isset($_POST['max_user_connections'])) {
         $max_user_connections = max(0, (int)$_POST['max_user_connections']);
         $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-        $isWith = true;
     }
-    return ($isWith ? 'WITH' . $sql_query : $sql_query);
+    return ((!empty($sql_query)) ? 'WITH' . $sql_query : $sql_query);
 }
 
 /**

From a4e4544f3397301007f5fef89410490f64018ff9 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 15 Jul 2012 21:38:14 +0530
Subject: [PATCH 082/102] remove unwanted function parameter

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0b75df714d..8bde755829 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2774,7 +2774,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
         $html_output .= '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
 
         list($html_rightsTable, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
-            $username, $hostname, $dbname, $link_edit, $link_revoke
+            $username, $hostname, $link_edit, $link_revoke
         );
         $html_output .= $html_rightsTable;
 

From 89c68ed98a34e8b147f3dc7e25f92abd185d85b9 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sun, 15 Jul 2012 21:40:42 +0530
Subject: [PATCH 083/102] improve PMA_getWithClauseForAddUserAndUpdatePrivs()

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 8bde755829..38d7b749e2 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1204,7 +1204,7 @@ function PMA_getWithClauseForAddUserAndUpdatePrivs()
         $max_user_connections = max(0, (int)$_POST['max_user_connections']);
         $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
     }
-    return ((!empty($sql_query)) ? 'WITH' . $sql_query : $sql_query);
+    return ((!empty($sql_query)) ? 'WITH' . $sql_query : '');
 }
 
 /**

From 42860cf4f0b1c4c0b8bf7a67b4e3a00b11daff11 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 16 Jul 2012 02:21:09 +0530
Subject: [PATCH 084/102] change some functions signatures

---
 libraries/server_privileges.lib.php | 107 +++++++++-------------------
 server_privileges.php               |  16 ++++-
 2 files changed, 48 insertions(+), 75 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 38d7b749e2..215dab14e2 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1155,7 +1155,7 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
 function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     $tablename, $username, $hostname
 ) {
-    $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
+    $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
 
     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
         . ' FROM \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
@@ -1710,7 +1710,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
         . PMA_CommonFunctions::getInstance()->getTitleForTarget($GLOBALS['cfg']['DefaultTabDatabase'])
         . "</a> ]\n";
 
-    if (isset($tablename)) {
+    if (strlen($tablename)) {
         $html_output .= ' [ ' . __('Table') . ' <a href="'
             . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query']
             . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename))
@@ -1734,16 +1734,11 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
  * 
  * @return array $db_rights             database rights
  */
-function PMA_getUserSpecificRights($tables, $user_host_condition)
+function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
 
-    if (PMA_isValid($_REQUEST['pred_dbname'])) {
-        $dbname = $_REQUEST['pred_dbname'];
-    } elseif (PMA_isValid($_REQUEST['dbname'])) {
-        $dbname = $_REQUEST['dbname'];
-    }
-    if (! isset($dbname)) {
+    if (! strlen($dbname)) {
         $tables_to_search_for_users = array(
             'tables_priv', 'columns_priv',
         );
@@ -1783,7 +1778,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition)
 
     while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) {
         $db_rights_row = array_merge($user_defaults, $db_rights_row);
-         if (! isset($dbname)) {
+         if (! strlen($dbname)) {
             // only Db names in the table `mysql`.`db` uses wildcards
             // as we are in the db specific rights display we want
             // all db names escaped, also from other sources
@@ -1796,7 +1791,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition)
 
     PMA_DBI_free_result($db_rights_result);
 
-    if (! isset($dbname)) {
+    if (! strlen($dbname)) {
         $sql_query = 'SELECT * FROM `mysql`.`db`' . $user_host_condition . ' ORDER BY `Db` ASC';
     } else {
         $sql_query = 'SELECT `Table_name`,'
@@ -1817,7 +1812,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition)
         } else {
             $db_rights[$row[$dbOrTableName]] = $row;
         }
-        if (! isset($dbname)) {
+        if (! strlen($dbname)) {
             // there are db specific rights for this user
             // so we can drop this db rights
             $db_rights[$row['Db']]['can_delete'] = true;
@@ -1838,14 +1833,9 @@ function PMA_getUserSpecificRights($tables, $user_host_condition)
  * 
  * @return array $found_rows, $html_output
  */
-function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
+function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
     $link_revoke, $hostname, $username
 ) {
-    if (PMA_isValid($_REQUEST['pred_dbname'])) {
-        $dbname = $_REQUEST['pred_dbname'];
-    } elseif (PMA_isValid($_REQUEST['dbname'])) {
-        $dbname = $_REQUEST['dbname'];
-    }
     $html_output = '';
     $found_rows = array();
     // display rows
@@ -1857,11 +1847,11 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
         $odd_row = true;
         //while ($row = PMA_DBI_fetch_assoc($res)) {
         foreach ($db_rights as $row) {
-            $found_rows[] = (! isset($dbname)) ? $row['Db'] : $row['Table_name'];
+            $found_rows[] = (! strlen($dbname)) ? $row['Db'] : $row['Table_name'];
 
             $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
                 . '<td>'  
-                . htmlspecialchars((! isset($dbname))
+                . htmlspecialchars((! strlen($dbname))
                     ? $row['Db']
                     : $row['Table_name'])
                 . '</td>' . "\n"
@@ -1869,8 +1859,8 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
                 . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
                 . '</code></td>' . "\n"
                 . '<td>' 
-                    . ((((! isset($dbname)) && $row['Grant_priv'] == 'Y')
-                        || (isset($dbname) && in_array('Grant', explode(',', $row['Table_priv']))))
+                    . ((((! strlen($dbname)) && $row['Grant_priv'] == 'Y')
+                        || (strlen($dbname) && in_array('Grant', explode(',', $row['Table_priv']))))
                     ? __('Yes')
                     : __('No'))
                 . '</td>' . "\n"
@@ -1886,8 +1876,8 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
                 $link_edit,
                 htmlspecialchars(urlencode($username)),
                 urlencode(htmlspecialchars($hostname)),
-                urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
-                urlencode((! isset($dbname)) ? '' : $row['Table_name'])
+                urlencode((! strlen($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                urlencode((! strlen($dbname)) ? '' : $row['Table_name'])
             );
             $html_output .= '</td>' . "\n"
                . '    <td>';
@@ -1899,8 +1889,8 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
                     $link_revoke,
                     htmlspecialchars(urlencode($username)),
                     urlencode(htmlspecialchars($hostname)),
-                    urlencode((! isset($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
-                    urlencode((! isset($dbname)) ? '' : $row['Table_name'])
+                    urlencode((! strlen($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                    urlencode((! strlen($dbname)) ? '' : $row['Table_name'])
                 );
             }
             $html_output .= '</td>' . "\n"
@@ -1923,28 +1913,23 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit,
  * @return array $html_output, $found_rows
  */
 function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
-    , $link_edit, $link_revoke
+    , $link_edit, $link_revoke, $dbname
 ) {
-    if (PMA_isValid($_REQUEST['pred_dbname'])) {
-        $dbname = $_REQUEST['pred_dbname'];
-    } elseif (PMA_isValid($_REQUEST['dbname'])) {
-        $dbname = $_REQUEST['dbname'];
-    }
     // table header
     $html_output = PMA_generate_common_hidden_inputs('', '')
         . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
         . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
         . '<fieldset>' . "\n"
         . '<legend>'
-        . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges'))
+        . (! strlen($dbname) ? __('Database-specific privileges') : __('Table-specific privileges'))
         . '</legend>' . "\n"
         . '<table class="data">' . "\n"
         . '<thead>' . "\n"
-        . '<tr><th>' . (! isset($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"
+        . '<tr><th>' . (! strlen($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"
         . '<th>' . __('Privileges') . '</th>' . "\n"
         . '<th>' . __('Grant') . '</th>' . "\n"
         . '<th>' 
-        . (! isset($dbname) ? __('Table-specific privileges') : __('Column-specific privileges'))
+        . (! strlen($dbname) ? __('Table-specific privileges') : __('Column-specific privileges'))
         . '</th>' . "\n"
         . '<th colspan="2">' . __('Action') . '</th>' . "\n"
         . '</tr>' . "\n"
@@ -1965,14 +1950,14 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
      * no db name given, so we want all privs for the given user
      * db name was given, so we want all user specific rights for this db
      */
-    $db_rights = PMA_getUserSpecificRights($tables, $user_host_condition);
+    $db_rights = PMA_getUserSpecificRights($tables, $user_host_condition, $dbname);
 
     ksort($db_rights);
     
     $html_output .= '<tbody>' . "\n";
     // display rows
     list ($found_rows, $html_out) =  PMA_getHtmlForDisplayUserRightsInRows(
-        $db_rights, $link_edit, $link_revoke, $hostname, $username
+        $db_rights, $link_edit, $dbname, $link_revoke, $hostname, $username
     );
 
     $html_output .= $html_out;
@@ -2417,23 +2402,11 @@ function PMA_deleteUser($queries)
  * 
  * @return PMA_message success message or error message for update
  */
-function PMA_updatePrivileges($username, $hostname)
+function PMA_updatePrivileges($username, $hostname, $tablename, $dbname)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
-    
-    if (PMA_isValid($_REQUEST['pred_tablename'])) {
-        $tablename = $_REQUEST['pred_tablename'];
-    } elseif (PMA_isValid($_REQUEST['tablename'])) {
-        $tablename = $_REQUEST['tablename'];
-    }
-    if (PMA_isValid($_REQUEST['pred_dbname'])) {
-        $dbname = $_REQUEST['pred_dbname'];
-    } elseif (PMA_isValid($_REQUEST['dbname'])) {
-        $dbname = $_REQUEST['dbname'];
-    }
-    $db_and_table = PMA_wildcardEscapeForGrant(
-        $dbname, (isset($tablename) ? $tablename : '')
-    );
+
+    $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
 
     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
         . ' FROM \'' . $common_functions->sqlAddSlashes($username)
@@ -2449,14 +2422,14 @@ function PMA_updatePrivileges($username, $hostname)
 
     // Should not do a GRANT USAGE for a table-specific privilege, it
     // causes problems later (cannot revoke it)
-    if (! (isset($tablename) && 'USAGE' == implode('', PMA_extractPrivInfo()))) {
+    if (! (strlen($tablename) && 'USAGE' == implode('', PMA_extractPrivInfo()))) {
         $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo())
             . ' ON ' . $db_and_table
             . ' TO \'' . $common_functions->sqlAddSlashes($username) . '\'@\''
             . $common_functions->sqlAddSlashes($hostname) . '\'';
 
         if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
-            || (! isset($dbname)
+            || (! strlen($dbname)
             && (isset($_POST['max_questions']) || isset($_POST['max_connections'])
             || isset($_POST['max_updates']) || isset($_POST['max_user_connections'])))
         ) {
@@ -2715,18 +2688,8 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
  * @return string $html_output
  */
 function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
-    $random_n, $username, $hostname, $link_edit, $link_revoke
+    $random_n, $username, $hostname, $link_edit, $link_revoke, $dbname, $tablename
 ) {
-    if (PMA_isValid($_REQUEST['pred_dbname'])) {
-        $dbname = $_REQUEST['pred_dbname'];
-    } elseif (PMA_isValid($_REQUEST['dbname'])) {
-        $dbname = $_REQUEST['dbname'];
-    }
-    if (PMA_isValid($_REQUEST['pred_tablename'])) {
-        $tablename = $_REQUEST['pred_tablename'];
-    } elseif (PMA_isValid($_REQUEST['tablename'])) {
-        $tablename = $_REQUEST['tablename'];
-    }
     $html_output = PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard, $url_dbname);
 
     $sql = "SELECT '1' FROM `mysql`.`user`"
@@ -2750,9 +2713,9 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
         'username' => $username,
         'hostname' => $hostname,
     );
-    if (isset($dbname)) {
+    if (strlen($dbname)) {
         $_params['dbname'] = $dbname;
-        if (isset($tablename)) {
+        if (strlen($tablename)) {
             $_params['tablename'] = $tablename;
         }
     }
@@ -2766,7 +2729,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
 
     $html_output .= '</form>' . "\n";
 
-    if (! isset($tablename) && empty($dbname_is_wildcard)) {
+    if (! strlen($tablename) && empty($dbname_is_wildcard)) {
 
         // no table name was given, display all table specific rights
         // but only if $dbname contains no wildcards
@@ -2774,11 +2737,11 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
         $html_output .= '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
 
         list($html_rightsTable, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
-            $username, $hostname, $link_edit, $link_revoke
+            $username, $hostname, $link_edit, $link_revoke, $dbname
         );
         $html_output .= $html_rightsTable;
 
-        if (! isset($dbname)) {
+        if (! strlen($dbname)) {
             // no database name was given, display select db
             $html_output .= PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows);
 
@@ -2794,12 +2757,12 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
     }
 
     // Provide a line with links to the relevant database and table
-    if (isset($dbname) && empty($dbname_is_wildcard)) {
+    if (strlen($dbname) && empty($dbname_is_wildcard)) {
         $html_output .= PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
 
     }
 
-    if (! isset($dbname) && ! $user_does_not_exists) {
+    if (! strlen($dbname) && ! $user_does_not_exists) {
         //change login information
         include_once 'libraries/display_change_password.lib.php';
         $html_output .= PMA_getChangeLoginInformationHtmlForm($username, $hostname);
diff --git a/server_privileges.php b/server_privileges.php
index 2581d9aa4d..386b444e69 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -333,7 +333,12 @@ if (isset($_REQUEST['change_copy'])) {
  * Updates privileges
  */
 if (! empty($update_privs)) {
-    list($sql_query, $message) = PMA_updatePrivileges($username, $hostname);
+    list($sql_query, $message) = PMA_updatePrivileges(
+        $username,
+        $hostname,
+        (isset($tablename) ? $tablename : ''),
+        (isset($dbname) ? $dbname : '')
+    );
 }
 
 /**
@@ -341,7 +346,10 @@ if (! empty($update_privs)) {
  */
 if (isset($_REQUEST['revokeall'])) {
     list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-        $db_and_table, $dbname, $tablename, $username, $hostname
+        $db_and_table,
+        (isset($dbename) ? $dbname : ''),
+        (isset($tablename) ? $tablename : ''),
+        $username, $hostname
     );
 }
 
@@ -514,7 +522,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         );
         $response->addHTML(
             PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
-                $random_n, $username, $hostname, $link_edit, $link_revoke
+                $random_n, $username, $hostname, $link_edit, $link_revoke,
+                (isset($dbename) ? $dbname : ''),
+                (isset($tablename) ? $tablename : '')
             )
         );
     }

From 45f35c6906ae9f564c19e81bd078ccbcfb3f31d8 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 16 Jul 2012 02:21:49 +0530
Subject: [PATCH 085/102] remove a php notice

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 215dab14e2..ed737b5d8a 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1340,7 +1340,7 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         . '    '
         . sprintf(
            __('Users having access to &quot;%s&quot;'),
-           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">' .  htmlspecialchars($checkprivs) . '</a>'
+           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">' .  htmlspecialchars($dbToCheck) . '</a>'
         )
         . "\n"
         . '</legend>' . "\n";

From d8233fcbb96ab2b897ba87a6ccc4cbbf2576d44e Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 16 Jul 2012 18:00:39 +0530
Subject: [PATCH 086/102] improve coding style

---
 libraries/server_privileges.lib.php | 166 ++++++++++++++++++++--------
 1 file changed, 117 insertions(+), 49 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ed737b5d8a..6c71446ed1 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1119,14 +1119,20 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
     if (empty($message)) {
         $common_functions = PMA_CommonFunctions::getInstance();
         
-        $hashing_function = (! empty($_REQUEST['pw_hash']) && $_REQUEST['pw_hash'] == 'old' ? 'OLD_' : '')
-                      . 'PASSWORD';
+        $hashing_function =
+            (! empty($_REQUEST['pw_hash']) && $_REQUEST['pw_hash'] == 'old' 
+                ? 'OLD_'
+                : ''
+            )
+            . 'PASSWORD';
 
         // in $sql_query which will be displayed, hide the password
         $sql_query        = 'SET PASSWORD FOR \'' 
             . $common_functions->sqlAddSlashes($username) 
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = ' 
-            . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
+            . (($pma_pw == '') 
+                ? '\'\'' 
+                : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
         
         $local_query      = 'SET PASSWORD FOR \'' 
             . $common_functions->sqlAddSlashes($username)
@@ -1137,7 +1143,9 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username,
         PMA_DBI_try_query($local_query)
             or $common_functions->mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
         $message = PMA_Message::success(__('The password for %s was changed successfully.'));
-        $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
+        $message->addParam(
+            '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''
+        );
     }
     return $message;
 }
@@ -1158,7 +1166,8 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
 
     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
-        . ' FROM \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
+        . ' FROM \''
+        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
         . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . '\';';
     
     $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
@@ -1172,7 +1181,9 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     }
     $sql_query = $sql_query0 . ' ' . $sql_query1;
     $message = PMA_Message::success(__('You have revoked the privileges for %s'));
-    $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
+    $message->addParam(
+        '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''
+    );
     
     return array($message, $sql_query);
 }
@@ -1223,7 +1234,8 @@ function PMA_getHtmlForAddUser($random_n, $dbname)
     $html_output = '<h2>' . "\n"
        . $common_functions->getIcon('b_usradd.png') . __('Add user') . "\n"
        . '</h2>' . "\n"
-       . '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
+       . '<form name="usersForm" id="addUsersForm_' . $random_n 
+       . '" action="server_privileges.php" method="post">' . "\n"
        . PMA_generate_common_hidden_inputs('', '')
        . PMA_getHtmlForDisplayLoginInformationFields('new');
     
@@ -1340,7 +1352,8 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         . '    '
         . sprintf(
            __('Users having access to &quot;%s&quot;'),
-           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">' .  htmlspecialchars($dbToCheck) . '</a>'
+           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">'
+                .  htmlspecialchars($dbToCheck) . '</a>'
         )
         . "\n"
         . '</legend>' . "\n";
@@ -1456,17 +1469,21 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, $link_ed
                    . '            ';
                 if (! isset($current['Db']) || $current['Db'] == '*') {
                     $html_output .= __('global');
-                } elseif ($current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($dbToCheck)) {
+                } elseif (
+                    $current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($dbToCheck)
+                ) {
                     $html_output .= __('database-specific');
                 } else {
-                    $html_output .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
+                    $html_output .= __('wildcard'). ': '
+                        . '<code>' . htmlspecialchars($current['Db']) . '</code>';
                 }
                 $html_output .= "\n"
                    . '</td>' . "\n";
                 
                 $html_output .='<td>' . "\n"
                    . '<code>' . "\n"
-                   . '' . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
+                   . '' 
+                   . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
                    . '</code>' . "\n"
                    . '</td>' . "\n";
                 
@@ -1478,7 +1495,9 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, $link_ed
                     $link_edit,
                     urlencode($current_user),
                     urlencode($current_host),
-                    urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']),
+                    urlencode(
+                        ! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']
+                    ),
                     ''
                 );
                 $html_output .= '</td>' . "\n"
@@ -1517,7 +1536,8 @@ function PMA_getStandardLinks($conditional_class)
     $common_functions = PMA_CommonFunctions::getInstance();
     
     $link_edit = '<a class="edit_user_anchor ' . $conditional_class . '"'
-        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . ' href="server_privileges.php?'
+        . str_replace('%', '%%', $GLOBALS['url_query'])
         . '&amp;username=%s'
         . '&amp;hostname=%s'
         . '&amp;dbname=%s'
@@ -1526,7 +1546,8 @@ function PMA_getStandardLinks($conditional_class)
         . '</a>';
 
     $link_revoke = '<a href='
-        .'"server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        .'"server_privileges.php?'
+        . str_replace('%', '%%', $GLOBALS['url_query'])
         . '&amp;username=%s'
         . '&amp;hostname=%s'
         . '&amp;dbname=%s'
@@ -1536,7 +1557,8 @@ function PMA_getStandardLinks($conditional_class)
         . '</a>';
 
     $link_export = '<a class="export_user_anchor ' . $conditional_class . '"'
-        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . ' href="server_privileges.php?'
+        . str_replace('%', '%%', $GLOBALS['url_query'])
         . '&amp;username=%s'
         . '&amp;hostname=%s'
         . '&amp;initial=%s'
@@ -1545,7 +1567,8 @@ function PMA_getStandardLinks($conditional_class)
         . '</a>';
 
     $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '"'
-        . ' href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
+        . ' href="server_privileges.php?'
+        . str_replace('%', '%%', $GLOBALS['url_query'])
         . '&amp;username=%s'
         . '&amp;hostname=%s'
         . '&amp;initial=%s'
@@ -1580,7 +1603,8 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
         $new_user_string = '<tr>'."\n"
             . '<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_"'
             . 'value="' 
-            . htmlspecialchars($_REQUEST['username']) . '&amp;#27;' . htmlspecialchars($_REQUEST['hostname']) . '" />'
+            . htmlspecialchars($_REQUEST['username'])
+            . '&amp;#27;' . htmlspecialchars($_REQUEST['hostname']) . '" />'
             . '</td>' . "\n"
             . '<td><label for="checkbox_sel_users_">' 
             . (empty($_REQUEST['username']) 
@@ -1593,7 +1617,9 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
         if (! empty($password) || isset($_POST['pma_pw'])) {
             $new_user_string .= __('Yes');
         } else {
-            $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>';
+            $new_user_string .= '<span style="color: #FF0000">'
+                . __('No')
+            . '</span>';
         };
 
         $new_user_string .= '</td>'."\n";
@@ -1635,7 +1661,8 @@ function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
          */
         $new_user_initial = strtoupper(substr($_REQUEST['username'], 0, 1));
         $new_user_initial_string = '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&initial=' . $new_user_initial .'">' . $new_user_initial . '</a>';
+            . $GLOBALS['url_query'] . '&initial=' . $new_user_initial .'">'
+            . $new_user_initial . '</a>';
         $extra_data['new_user_initial'] = $new_user_initial;
         $extra_data['new_user_initial_string'] = $new_user_initial_string;
     }
@@ -1668,16 +1695,22 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
         '2' => __('... revoke all active privileges from the old one and delete it afterwards.'),
         '3' => __('... delete the old one from the user tables and reload the privileges afterwards.'));
 
-    $html_output = '<form action="server_privileges.php" method="post" class="copyUserForm">' . "\n"
+    $html_output = '<form action="server_privileges.php" '
+        . 'method="post" class="copyUserForm">' . "\n"
         . PMA_generate_common_hidden_inputs('', '')
-        . '<input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
-        . '<input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
+        . '<input type="hidden" name="old_username" '
+        . 'value="' . htmlspecialchars($username) . '" />' . "\n"
+        . '<input type="hidden" name="old_hostname" '
+        . 'value="' . htmlspecialchars($hostname) . '" />' . "\n"
         . '<fieldset id="fieldset_change_copy_user">' . "\n"
-        . '<legend>' . __('Change Login Information / Copy User') . '</legend>' . "\n"
+        . '<legend>' . __('Change Login Information / Copy User')
+        . '</legend>' . "\n"
         . PMA_getHtmlForDisplayLoginInformationFields('change');
     
     $html_output .= '<fieldset>' . "\n"
-        . ' <legend>' . __('Create a new user with the same privileges and ...') . '</legend>' . "\n";
+        . ' <legend>'
+        . __('Create a new user with the same privileges and ...')
+        . '</legend>' . "\n";
     $html_output .= PMA_CommonFunctions::getInstance()->getRadioFields(
         'mode', $choices, '4', true
     );
@@ -1707,13 +1740,16 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
         . ' <a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?'
         . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;reload=1">'
         . htmlspecialchars($dbname) . ': '
-        . PMA_CommonFunctions::getInstance()->getTitleForTarget($GLOBALS['cfg']['DefaultTabDatabase'])
+        . PMA_CommonFunctions::getInstance()->getTitleForTarget(
+            $GLOBALS['cfg']['DefaultTabDatabase']
+        )
         . "</a> ]\n";
 
     if (strlen($tablename)) {
         $html_output .= ' [ ' . __('Table') . ' <a href="'
             . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query']
-            . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename))
+            . '&amp;db=' . $url_dbname
+            . '&amp;table=' . htmlspecialchars(urlencode($tablename))
             . '&amp;reload=1">' . htmlspecialchars($tablename) . ': '
             . PMA_CommonFunctions::getInstance()->getTitleForTarget(
                 $GLOBALS['cfg']['DefaultTabTable']
@@ -1746,7 +1782,8 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
     } else {
         $user_host_condition .=
             ' AND `Db`'
-            .' LIKE \'' . $common_functions->sqlAddSlashes($dbname, true) . "'";
+            .' LIKE \''
+            . $common_functions->sqlAddSlashes($dbname, true) . "'";
         $tables_to_search_for_users = array('columns_priv',);
         $dbOrTableName = 'Table_name';
     }
@@ -1792,7 +1829,8 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
     PMA_DBI_free_result($db_rights_result);
 
     if (! strlen($dbname)) {
-        $sql_query = 'SELECT * FROM `mysql`.`db`' . $user_host_condition . ' ORDER BY `Db` ASC';
+        $sql_query = 'SELECT * FROM `mysql`.`db`'
+            . $user_host_condition . ' ORDER BY `Db` ASC';
     } else {
         $sql_query = 'SELECT `Table_name`,'
             .' `Table_priv`,'
@@ -1808,7 +1846,8 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
 
     while ($row = PMA_DBI_fetch_assoc($result)) {
         if (isset($db_rights[$row[$dbOrTableName]])) {
-            $db_rights[$row[$dbOrTableName]] = array_merge($db_rights[$row[$dbOrTableName]], $row);
+            $db_rights[$row[$dbOrTableName]]
+                = array_merge($db_rights[$row[$dbOrTableName]], $row);
         } else {
             $db_rights[$row[$dbOrTableName]] = $row;
         }
@@ -1856,7 +1895,8 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
                     : $row['Table_name'])
                 . '</td>' . "\n"
                 . '<td><code>' . "\n"
-                . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
+                . '        '
+                . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
                 . '</code></td>' . "\n"
                 . '<td>' 
                     . ((((! strlen($dbname)) && $row['Grant_priv'] == 'Y')
@@ -1917,19 +1957,29 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
 ) {
     // table header
     $html_output = PMA_generate_common_hidden_inputs('', '')
-        . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
-        . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
+        . '<input type="hidden" name="username" '
+        . 'value="' . htmlspecialchars($username) . '" />' . "\n"
+        . '<input type="hidden" name="hostname" '
+        . 'value="' . htmlspecialchars($hostname) . '" />' . "\n"
         . '<fieldset>' . "\n"
         . '<legend>'
-        . (! strlen($dbname) ? __('Database-specific privileges') : __('Table-specific privileges'))
+        . (! strlen($dbname)
+            ? __('Database-specific privileges')
+            : __('Table-specific privileges')
+        )
         . '</legend>' . "\n"
         . '<table class="data">' . "\n"
         . '<thead>' . "\n"
-        . '<tr><th>' . (! strlen($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"
+        . '<tr><th>'
+        . (! strlen($dbname) ? __('Database') : __('Table'))
+        . '</th>' . "\n"
         . '<th>' . __('Privileges') . '</th>' . "\n"
         . '<th>' . __('Grant') . '</th>' . "\n"
         . '<th>' 
-        . (! strlen($dbname) ? __('Table-specific privileges') : __('Column-specific privileges'))
+        . (! strlen($dbname)
+            ? __('Table-specific privileges')
+            : __('Column-specific privileges')
+        )
         . '</th>' . "\n"
         . '<th colspan="2">' . __('Action') . '</th>' . "\n"
         . '</tr>' . "\n"
@@ -2015,8 +2065,10 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     
-    $html_output = '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n"
-        . '<label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n";
+    $html_output = '<input type="hidden" name="dbname"
+        '. 'value="' . htmlspecialchars($dbname) . '"/>' . "\n"
+    $html_output .= '<label for="text_tablename">' 
+        . __('Add privileges on the following table') . ':</label>' . "\n";
     
     $result = @PMA_DBI_try_query(
         'SHOW TABLES FROM ' . $common_functions->backquote(
@@ -2113,11 +2165,15 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
         'submit_mult', 'mult_submit', 'submit_mult_export',
         __('Export'), 'b_tblexport.png', 'export'
     );
-    $html_output .= '<input type="hidden" name="initial" value="' . (isset($_GET['initial']) ? $_GET['initial'] : '') . '" />';
+    $html_output .= '<input type="hidden" name="initial" '
+        . 'value="' . (isset($_GET['initial']) ? $_GET['initial'] : '') . '" />';
     $html_output .= '</div>'
         . '<div class="clear_both" style="clear:both"></div>'
         . '<div style="float:left; padding-left:10px;">'
-        . sprintf($link_export_all, urlencode('%'), urlencode('%'), (isset($_GET['initial']) ? $_GET['initial'] : ''));
+        . sprintf($link_export_all,
+            urlencode('%'), urlencode('%'),
+            (isset($_GET['initial']) ? $_GET['initial'] : '')
+        );
     $html_output .= '</div>'
         . '</div>'
         . '<div class="clear_both" style="clear:both"></div>';
@@ -2151,7 +2207,9 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export
         foreach ($user as $host) {
             $index_checkbox++;
             $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
-            $html_output .= '<td><input type="checkbox" class="checkall" name="selected_usr[]" id="checkbox_sel_users_'
+            $html_output .= '<td>'
+                . '<input type="checkbox" class="checkall" name="selected_usr[]" '
+                . 'id="checkbox_sel_users_'
                 . $index_checkbox . '" value="'
                 . htmlspecialchars($host['User'] . '&amp;#27;' . $host['Host'])
                 . '"'
@@ -2182,7 +2240,9 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export
             $html_output .= '<td><code>' . "\n"
                 . '' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
                 . '</code></td>' . "\n"
-                . '<td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
+                . '<td>'
+                . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No'))
+                . '</td>' . "\n"
                 . '<td class="center">'
                 . sprintf($link_edit, urlencode($host['User']),
                     urlencode($host['Host']), '', ''
@@ -2496,7 +2556,8 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
         }
     } else {
         // export privileges for a single user
-        $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
+        $title = __('User') . ' `' . htmlspecialchars($username)
+            . '`@`' . htmlspecialchars($hostname) . '`';
         $export .= PMA_getGrants($username, $hostname);
     }
     // remove trailing whitespace
@@ -2645,10 +2706,14 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
         * Display the user overview
         * (if less than 50 users, display them immediately)
         */
-        if (isset($_REQUEST['initial']) || isset($_REQUEST['showall']) || PMA_DBI_num_rows($res) < 50) {
-            $html_output .= PMA_getUsersOverview($res, $db_rights, $link_edit,$pmaThemeImage,
-                    $text_dir, $conditional_class, $link_export, $link_export_all
-                );
+        if (isset($_REQUEST['initial'])
+            || isset($_REQUEST['showall'])
+            || PMA_DBI_num_rows($res) < 50
+        ) {
+            $html_output .= PMA_getUsersOverview($res, $db_rights,
+                $link_edit,$pmaThemeImage, $text_dir, $conditional_class,
+                $link_export, $link_export_all
+            );
         } else {
             $html_output .= PMA_getAddUserHtmlFieldset($conditional_class);
         } // end if (display overview)
@@ -2734,7 +2799,8 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
         // no table name was given, display all table specific rights
         // but only if $dbname contains no wildcards
 
-        $html_output .= '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n";
+        $html_output .= '<form action="server_privileges.php" '
+            . 'id="db_or_table_specific_priv" method="post">' . "\n";
 
         list($html_rightsTable, $found_rows) = PMA_getTableForDisplayAllTableSpecificRights(
             $username, $hostname, $link_edit, $link_revoke, $dbname
@@ -2947,7 +3013,8 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
         // Grant all privileges on wildcard name (username\_%)
         $q = 'GRANT ALL PRIVILEGES ON '
             . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+            . $common_functions->sqlAddSlashes($username)
+            . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
         if (! PMA_DBI_try_query($q)) {
             $message = PMA_Message::rawError(PMA_DBI_getError());
@@ -2958,7 +3025,8 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
         // Grant all privileges on the specified database to the new user
         $q = 'GRANT ALL PRIVILEGES ON '
         . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
-        . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
+        . $common_functions->sqlAddSlashes($username)
+        . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
         if (! PMA_DBI_try_query($q)) {
             $message = PMA_Message::rawError(PMA_DBI_getError());

From 7f0ef97ddebd6853e6567966f0427be24e74d268 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 16 Jul 2012 18:04:30 +0530
Subject: [PATCH 087/102] Spelling mistake

---
 server_privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_privileges.php b/server_privileges.php
index 386b444e69..3fe8815a79 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -298,7 +298,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 }
                 $sql_query = $create_user_show . $sql_query;
             }
-            list($sql_query, $message) = PMA_addUserAndCreateDatabas(
+            list($sql_query, $message) = PMA_addUserAndCreateDatabase(
                 $_error, $real_sql_query, $sql_query, $username, $hostname
             );
 

From 18459099240d67b47951175e175e97d93cf823ea Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Mon, 16 Jul 2012 21:14:53 +0530
Subject: [PATCH 088/102] missing semicolon

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 6c71446ed1..0aa1240fdc 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2066,7 +2066,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
     $common_functions = PMA_CommonFunctions::getInstance();
     
     $html_output = '<input type="hidden" name="dbname"
-        '. 'value="' . htmlspecialchars($dbname) . '"/>' . "\n"
+        '. 'value="' . htmlspecialchars($dbname) . '"/>' . "\n";
     $html_output .= '<label for="text_tablename">' 
         . __('Add privileges on the following table') . ':</label>' . "\n";
     

From a0db338b70345d32cd5d1eee335e0911b90d212e Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 17 Jul 2012 00:02:49 +0530
Subject: [PATCH 089/102] change function signature

---
 libraries/server_privileges.lib.php | 6 +++---
 server_privileges.php               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0aa1240fdc..928ff6599b 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1588,10 +1588,10 @@ function PMA_getStandardLinks($conditional_class)
  * 
  * @return array $extra_data
  */
-function PMA_getExtraDataForAjaxBehavior( $password, $sql_query,$link_edit,
-    $dbname_is_wildcard, $link_export
+function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
+    $link_edit, $dbname_is_wildcard
 ) {
-    if (isset($sql_query)) {
+    if (strlen($sql_query)) {
         $extra_data['sql_query'] 
             = PMA_CommonFunctions::getInstance()->getMessage(null, $sql_query);
     }
diff --git a/server_privileges.php b/server_privileges.php
index 3fe8815a79..02d5ebc9c3 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -446,8 +446,8 @@ if ($GLOBALS['is_ajax_request']
     if (isset($password)) {
         $isPass = true;
     }
-    $extra_data = PMA_getExtraDataForAjaxBehavior( $isPass,
-        $sql_query, $link_edit, $dbname_is_wildcard, $link_export
+    $extra_data = PMA_getExtraDataForAjaxBehavior($isPass, $link_export,
+        (isset($sql_query) ? $sql_query : ''), $link_edit, $dbname_is_wildcard
     );
 
     if ($message instanceof PMA_Message) {

From b984bc397bcd958407174aac2bb3322568063e8c Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 17 Jul 2012 18:25:59 +0530
Subject: [PATCH 090/102] Improve coding style

---
 libraries/server_privileges.lib.php | 87 +++++++++++++++++++----------
 1 file changed, 59 insertions(+), 28 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 928ff6599b..3d96bd2ccc 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -436,7 +436,9 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
         // get columns
         $res = PMA_DBI_try_query(
             'SHOW COLUMNS FROM '
-            . PMA_CommonFunctions::getInstance()->backquote(PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($db))
+            . PMA_CommonFunctions::getInstance()->backquote(
+                PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($db)
+            )
             . '.' . PMA_CommonFunctions::getInstance()->backquote($table) . ';'
         );
         $columns = array();
@@ -480,34 +482,63 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
  */
 function PMA_getHtmlForDisplayResourceLimits($row)
 {
-    return '<fieldset>' . "\n"
+    $html_output = '<fieldset>' . "\n"
        . '<legend>' . __('Resource limits') . '</legend>' . "\n"
-       . '<p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_questions"><code><dfn title="'
-       . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_questions" id="text_max_questions" value="'
-       . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_updates"><code><dfn title="'
-       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_updates" id="text_max_updates" value="'
-       . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_connections"><code><dfn title="'
-       . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_connections" id="text_max_connections" value="'
-       . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="text_max_user_connections"><code><dfn title="'
-       . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
-       . '<input type="text" name="max_user_connections" id="text_max_user_connections" value="'
-       . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
-       . '</div>' . "\n"
-       . '</fieldset>' . "\n";
+       . '<p><small>'
+       . '<i>' . __('Note: Setting these options to 0 (zero) removes the limit.')
+       . '</i></small></p>' . "\n";
+       
+    $html_output .= '<div class="item">' . "\n"
+       . '<label for="text_max_questions">'
+       . '<code><dfn title="' 
+       . __('Limits the number of queries the user may send to the server per hour.'). '">'
+       . 'MAX QUERIES PER HOUR'
+       . '</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_questions" id="text_max_questions" '
+       . 'value="' . $row['max_questions'] . '" '
+       . 'size="11" maxlength="11" '
+       . 'title="'
+       . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
+       . '</div>' . "\n";
+       
+    $html_output .= '<div class="item">' . "\n"
+       . '<label for="text_max_updates">'
+       . '<code><dfn title="'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.') . . '">'
+       . 'MAX UPDATES PER HOUR'
+       . '</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_updates" id="text_max_updates" '
+       . 'value="' . $row['max_updates'] . '" size="11" maxlength="11" '
+       . 'title="'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.')
+       . '" />' . "\n"
+       . '</div>' . "\n";
+       
+    $html_output .= '<div class="item">' . "\n"
+       . '<label for="text_max_connections">'
+       . '<code><dfn title="'
+       . __('Limits the number of new connections the user may open per hour.') . '">'
+       . 'MAX CONNECTIONS PER HOUR'
+       . '</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_connections" id="text_max_connections" '
+       . 'value="' . $row['max_connections'] . '" size="11" maxlength="11" '
+       . 'title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
+       . '</div>' . "\n";
+       
+    $html_output .= '<div class="item">' . "\n"
+       . '<label for="text_max_user_connections">'
+       . '<code><dfn title="'
+       . __('Limits the number of simultaneous connections the user may have.') . '">'
+       . 'MAX USER_CONNECTIONS'
+       . '</dfn></code></label>' . "\n"
+       . '<input type="text" name="max_user_connections" id="text_max_user_connections" '
+       . 'value="' . $row['max_user_connections'] . '" size="11" maxlength="11" '
+       . 'title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
+       . '</div>' . "\n";
+       
+    $html_output .= '</fieldset>' . "\n";
+    
+    return $html_output;
 }
 
 /**

From 9199e0262e3c6ad0bd16b635913c8dec39f38ffd Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 17 Jul 2012 20:57:27 +0530
Subject: [PATCH 091/102] remove php parse error

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 3d96bd2ccc..3f1ede7642 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -504,7 +504,7 @@ function PMA_getHtmlForDisplayResourceLimits($row)
     $html_output .= '<div class="item">' . "\n"
        . '<label for="text_max_updates">'
        . '<code><dfn title="'
-       . __('Limits the number of commands that change any table or database the user may execute per hour.') . . '">'
+       . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">'
        . 'MAX UPDATES PER HOUR'
        . '</dfn></code></label>' . "\n"
        . '<input type="text" name="max_updates" id="text_max_updates" '

From 6eeb80da2484353c298065f64fc59bb08d8379b2 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 17 Jul 2012 23:16:14 +0530
Subject: [PATCH 092/102] improve coding style

---
 libraries/server_privileges.lib.php | 276 ++++++++++++++++++++--------
 1 file changed, 196 insertions(+), 80 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 3f1ede7642..c2ffefe3e4 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -372,8 +372,9 @@ function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
  *
  * @return string html snippet
  */
-function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*', $submit = true)
-{
+function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*',
+     $table = '*', $submit = true
+) {
     $html_output = '';
     
     if ($db == '*') {
@@ -383,7 +384,9 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', $table = '*',
     if (isset($GLOBALS['username'])) {
         $username = $GLOBALS['username'];
         $hostname = $GLOBALS['hostname'];
-        $sql_query = PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname);
+        $sql_query = PMA_getSqlQueryForDisplayPrivTable(
+            $db, $table, $username, $hostname
+        );
         $row = PMA_DBI_fetch_single_row($sql_query);
     }
     if (empty($row)) {
@@ -552,8 +555,9 @@ function PMA_getHtmlForDisplayResourceLimits($row)
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table, $columns,$row)
-{
+function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db
+    , $table, $columns,$row
+) {
     $common_functions = PMA_CommonFunctions::getInstance();
     $res = PMA_DBI_query(
         'SELECT `Column_name`, `Column_priv`'
@@ -563,7 +567,9 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db, $table
         .' AND `Host`'
         .' = \'' . $common_functions->sqlAddSlashes($hostname) . "'"
         .' AND `Db`'
-        .' = \'' . $common_functions->sqlAddSlashes($common_functions->unescapeMysqlWildcards($db)) . "'"
+        .' = \'' . $common_functions->sqlAddSlashes(
+            $common_functions->unescapeMysqlWildcards($db)
+        ) . "'"
         .' AND `Table_name`'
         .' = \'' . $common_functions->sqlAddSlashes($table) . '\';'
     );
@@ -669,16 +675,32 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
            . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
            . 'title="';
 
-        $html_output .= (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-            ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-            : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
+        $html_output .= (isset($GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                    ] )
+                ? $GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                ]
+                : $GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'
+                ]
+            )
+            . '"/>' . "\n";
 
         $html_output .= '<label for="checkbox_' . $current_grant
             . '"><code><dfn title="'
-            . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
-                ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
-                : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-            . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
+            . (isset($GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                ])
+                ? $GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                ]
+                : $GLOBALS[
+                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'
+                ]
+            )
+            . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5))
+            . '</dfn></code></label>' . "\n"
             . '</div>' . "\n";
     } // end foreach ()
     return $html_output;
@@ -697,7 +719,10 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
  */
 function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n)
 {
-    $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
+    $privTable_names = array(0 => __('Data'),
+        1 => __('Structure'),
+        2 => __('Administration')
+    );
     $privTable = array();
     // d a t a
     $privTable[0] = PMA_getDataPrivilegeTable($db);
@@ -709,7 +734,11 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n)
     $privTable[2] = PMA_getAdministrationPrivilegeTable($db);
     
     $html_output = '<input type="hidden" name="grant_count" value="'
-        . (count($privTable[0]) + count($privTable[1]) + count($privTable[2]) - (isset($row['Grant_priv']) ? 1 : 0))
+        . (count($privTable[0])
+            + count($privTable[1])
+            + count($privTable[2])
+            - (isset($row['Grant_priv']) ? 1 : 0)
+        )
         . '" />' . "\n"
         . '<fieldset id="fieldset_user_global_rights">' . "\n"
         . '<legend>' . "\n"
@@ -720,16 +749,22 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n)
                 ? __('Database-specific privileges')
                 : __('Table-specific privileges'))) . "\n"
         . '(<a href="server_privileges.php?'
-        . $GLOBALS['url_query'] . '&amp;checkall=1" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
+        . $GLOBALS['url_query'] . '&amp;checkall=1" '
+        . 'onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
         . __('Check All') . '</a> /' . "\n"
         . '<a href="server_privileges.php?'
-        . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
+        . $GLOBALS['url_query'] . '" '
+        . 'onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
         . __('Uncheck All') . '</a>)' . "\n"
         . '</legend>' . "\n"
-        . '<p><small><i>' . __('Note: MySQL privilege names are expressed in English') . '</i></small></p>' . "\n";
+        . '<p><small><i>' 
+        . __('Note: MySQL privilege names are expressed in English') 
+        . '</i></small></p>' . "\n";
 
     // Output the Global privilege tables with checkboxes
-    $html_output .= PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_names, $row);
+    $html_output .= PMA_getHtmlForGlobalPrivTableWithCheckboxes(
+        $privTable, $privTable_names, $row
+    );
 
     // The "Resource limits" box is not displayed for db-specific privs
     if ($db == '*') {
@@ -852,7 +887,10 @@ function PMA_getStructurePrivilegeTable($table, $row)
 function PMA_getAdministrationPrivilegeTable($db)
 {
     $administration_privTable = array(
-        array('Grant', 'GRANT', __('Allows adding users and privileges without reloading the privilege tables.')),
+        array('Grant',
+            'GRANT',
+            __('Allows adding users and privileges without reloading the privilege tables.')
+        ),
     );
     if ($db == '*') {
         $administration_privTable[] = array('Super',
@@ -921,7 +959,10 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_name
                 . '<input type="checkbox"'
                 . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
                 . ' value="Y" title="' . $priv[2] . '"'
-                . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                . ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y')
+                    ?  ' checked="checked"'
+                    : ''
+                )
                 . '/>' . "\n"
                 . '<label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
                 . $priv[1] . '</dfn></code></label>' . "\n"
@@ -952,46 +993,90 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         $GLOBALS['pred_username'] = 'any';
     }
     $html_output = '<fieldset id="fieldset_add_user_login">' . "\n"
-       . '<legend>' . __('Login Information') . '</legend>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_username">' . "\n"
-       . '    ' . __('User name') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '<select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
-       . '        onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
-       . '<option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
-       . '<option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '</select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="text" name="username" maxlength="'
-       . $username_length . '" title="' . __('User name') . '"'
-       . (empty($GLOBALS['username'])
+        . '<legend>' . __('Login Information') . '</legend>' . "\n"
+        . '<div class="item">' . "\n"
+        . '<label for="select_pred_username">' . "\n"
+        . '    ' . __('User name') . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">' . "\n";
+    
+    $html_output .= '<select name="pred_username" id="select_pred_username" '
+        . 'title="' . __('User name') . '"' . "\n";
+    
+    
+    $html_output .= '        onchange="'
+        . 'if (this.value == \'any\') {'
+        . '    username.value = \'\'; '
+        . '} else if (this.value == \'userdefined\') {'
+        . '    username.focus(); username.select(); '
+        . '}">' . "\n";
+    
+    $html_output .= '<option value="any"'
+        . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any')
+            ? ' selected="selected"' 
+            : '') . '>'
+        . __('Any user')
+        . '</option>' . "\n";
+    
+    $html_output .= '<option value="userdefined"'
+        . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined')
+            ? ' selected="selected"'
+            : '') . '>'
+        . __('Use text field')
+        . ':</option>' . "\n";
+    
+    $html_output .= '</select>' . "\n"
+        . '</span>' . "\n";
+    
+    $html_output .= '<input type="text" name="username" maxlength="'
+        . $username_length . '" title="' . __('User name') . '"'
+        . (empty($GLOBALS['username'])
            ? ''
            : ' value="' . htmlspecialchars(
                isset($GLOBALS['new_username'])
                ? $GLOBALS['new_username']
                : $GLOBALS['username']
            ) . '"'
-       )
-       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item">' . "\n"
-       . '<label for="select_pred_hostname">' . "\n"
-       . '    ' . __('Host') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">' . "\n"
-       . '    <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"' . "\n";
+        )
+        . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
+        . '</div>' . "\n";
+    
+    $html_output .= '<div class="item">' . "\n"
+        . '<label for="select_pred_hostname">' . "\n"
+        . '    ' . __('Host') . ':' . "\n"
+        . '</label>' . "\n";
+    
+    $html_output .= '<span class="options">' . "\n"
+        . '    <select name="pred_hostname" id="select_pred_hostname" '
+        . 'title="' . __('Host') . '"' . "\n";
     $_current_user = PMA_DBI_fetch_value('SELECT USER();');
     if (! empty($_current_user)) {
-        $thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
+        $thishost = str_replace("'",
+            '',
+            substr($_current_user,
+            (strrpos($_current_user, '@') + 1))
+        );
         if ($thishost == 'localhost' || $thishost == '127.0.0.1') {
             unset($thishost);
         }
     }
-    $html_output .= '    onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
-       . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
-       . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
+    $html_output .= '    onchange="'
+        . 'if (this.value == \'any\') { '
+        . '     hostname.value = \'%\'; '
+        . '} else if (this.value == \'localhost\') { '
+        . '    hostname.value = \'localhost\'; '
+        . '} '
+        . (empty($thishost)
+            ? ''
+            : 'else if (this.value == \'thishost\') { '
+            . '    hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; '
+            . '} '
+        )
+        . 'else if (this.value == \'hosttable\') { '
+        . '    hostname.value = \'\'; '
+        . '} else if (this.value == \'userdefined\') {'
+        . '    hostname.focus(); hostname.select(); '
+        . '}">' . "\n";
     unset($_current_user);
 
     // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
@@ -1009,64 +1094,95 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
             break;
         }
     }
-    $html_output .=  '        <option value="any"'
+    $html_output .=  '<option value="any"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
-            ? ' selected="selected"' : '') . '>' . __('Any host')
+            ? ' selected="selected"'
+            : '') . '>' 
+        . __('Any host')
         . '</option>' . "\n"
         . '<option value="localhost"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
-            ? ' selected="selected"' : '') . '>' . __('Local')
+            ? ' selected="selected"'
+            : '') . '>'
+        . __('Local')
         . '</option>' . "\n";
     if (! empty($thishost)) {
-        $html_output .= '        <option value="thishost"'
+        $html_output .= '<option value="thishost"'
             . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
-                ? ' selected="selected"' : '') . '>' . __('This Host')
+                ? ' selected="selected"' 
+                : '') . '>' 
+            . __('This Host')
             . '</option>' . "\n";
     }
     unset($thishost);
-    $html_output .= '        <option value="hosttable"'
+    $html_output .= '<option value="hosttable"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
-            ? ' selected="selected"' : '') . '>' . __('Use Host Table')
-        . '</option>' . "\n"
-        . '        <option value="userdefined"'
+            ? ' selected="selected"'
+            : '') . '>'
+        . __('Use Host Table')
+        . '</option>' . "\n";
+    
+    $html_output .= '<option value="userdefined"'
         . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
-            ? ' selected="selected"' : '')
-        . '>' . __('Use text field') . ':</option>' . "\n"
+            ? ' selected="selected"'
+            : '') . '>' 
+        . __('Use text field') . ':</option>' . "\n"
         . '</select>' . "\n"
-        . '</span>' . "\n"
-        . '<input type="text" name="hostname" maxlength="'
+        . '</span>' . "\n";
+    
+    $html_output .= '<input type="text" name="hostname" maxlength="'
         . $hostname_length . '" value="'
         . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
         . '" title="' . __('Host')
         . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
-        . PMA_CommonFunctions::getInstance()->showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
-        . '</div>' . "\n"
-        . '<div class="item">' . "\n"
+        . PMA_CommonFunctions::getInstance()->showHint(
+            __('When Host table is used, this field is ignored and values stored in Host table are used instead.')
+        )
+        . '</div>' . "\n";
+    
+    $html_output .= '<div class="item">' . "\n"
         . '<label for="select_pred_password">' . "\n"
         . '    ' . __('Password') . ':' . "\n"
         . '</label>' . "\n"
         . '<span class="options">' . "\n"
         . '<select name="pred_password" id="select_pred_password" title="'
-        . __('Password') . '"' . "\n"
-        . '            onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
-        . ($mode == 'change' ? '            <option value="keep" selected="selected">' . __('Do not change the password') . '</option>' . "\n" : '')
+        . __('Password') . '"' . "\n";
+    
+    $html_output .= '            onchange="'
+        . 'if (this.value == \'none\') { '
+        . '    pma_pw.value = \'\'; pma_pw2.value = \'\'; '
+        . '} else if (this.value == \'userdefined\') { '
+        . '    pma_pw.focus(); pma_pw.select(); '
+        . '}">' . "\n"
+        . ($mode == 'change' ? '            <option value="keep" selected="selected">'
+            . __('Do not change the password')
+            . '</option>' . "\n" : '')
         . '<option value="none"';
+    
     if (isset($GLOBALS['username']) && $mode != 'change') {
         $html_output .= '  selected="selected"';
     }
     $html_output .= '>' . __('No Password') . '</option>' . "\n"
-       . '<option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>' . "\n"
-       . '</select>' . "\n"
-       . '</span>' . "\n"
-       . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
-       . '<div class="item" id="div_element_before_generate_password">' . "\n"
-       . '<label for="text_pma_pw2">' . "\n"
-       . '    ' . __('Re-type') . ':' . "\n"
-       . '</label>' . "\n"
-       . '<span class="options">&nbsp;</span>' . "\n"
-       . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n"
-       . '</div>' . "\n"
+        . '<option value="userdefined"'
+        . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>'
+        . __('Use text field')
+        . ':</option>' . "\n"
+        . '</select>' . "\n"
+        . '</span>' . "\n"
+        . '<input type="password" id="text_pma_pw" name="pma_pw" '
+        . 'title="' . __('Password') . '" '
+        . 'onchange="pred_password.value = \'userdefined\';" />' . "\n"
+        . '</div>' . "\n";
+    
+    $html_output .= '<div class="item" id="div_element_before_generate_password">' . "\n"
+        . '<label for="text_pma_pw2">' . "\n"
+        . '    ' . __('Re-type') . ':' . "\n"
+        . '</label>' . "\n"
+        . '<span class="options">&nbsp;</span>' . "\n"
+        . '<input type="password" name="pma_pw2" id="text_pma_pw2" '
+        . 'title="' . __('Re-type') . '" '
+        . 'onchange="pred_password.value = \'userdefined\';" />' . "\n"
+        . '</div>' . "\n"
        // Generate password added here via jQuery
        . '</fieldset>' . "\n";
     

From f998b4c620819befc195f13851829637172cafb5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Tue, 17 Jul 2012 23:26:46 +0530
Subject: [PATCH 093/102] improve coding style

---
 libraries/server_privileges.lib.php | 37 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c2ffefe3e4..55eae0c0f5 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1249,8 +1249,9 @@ function PMA_getGrants($user, $host)
  * 
  * @return string $message  success or error message after updating password
  */
-function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url, $username, $hostname)
-{
+function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url
+    , $username, $hostname
+) {
     // similar logic in user_password.php
     $message = '';
     
@@ -1498,9 +1499,11 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         . $common_functions->getIcon('b_usrcheck.png')
         . '    '
         . sprintf(
-           __('Users having access to &quot;%s&quot;'),
-           '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($dbToCheck) . '">'
-                .  htmlspecialchars($dbToCheck) . '</a>'
+            __('Users having access to &quot;%s&quot;'),
+            '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' 
+                . PMA_generate_common_url($dbToCheck) . '">'
+                .  htmlspecialchars($dbToCheck)
+            . '</a>'
         )
         . "\n"
         . '</legend>' . "\n";
@@ -1556,8 +1559,10 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
            . '<legend>' . __('New') . '</legend>' . "\n";
         
         $html_output .= '<a href="server_privileges.php?'
-            . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($dbToCheck)
-            .'" rel="'.'checkprivs='.htmlspecialchars($dbToCheck). '&amp;'.$GLOBALS['url_query']
+            . $GLOBALS['url_query'] . '&amp;adduser=1&amp;'
+            . 'dbname=' . htmlspecialchars($dbToCheck)
+            .'" rel="'
+            .'checkprivs='.htmlspecialchars($dbToCheck). '&amp;'.$GLOBALS['url_query']
             . '" class="'.$conditional_class
             .'" name="db_specific">' . "\n"
             . $common_functions->getIcon('b_usradd.png')
@@ -1580,8 +1585,9 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
  *            
  * @return string $html_output
  */
-function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, $link_edit, $res, $dbToCheck)
-{
+function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
+    $link_edit, $res, $dbToCheck
+) {
     $html_output = '<tbody>' . "\n";
     if ($found) {
         while (true) {
@@ -1589,7 +1595,10 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row, $link_ed
             $current_privileges = array();
             $current_user = $row['User'];
             $current_host = $row['Host'];
-            while ($row && $current_user == $row['User'] && $current_host == $row['Host']) {
+            while ($row
+                    && $current_user == $row['User']
+                    && $current_host == $row['Host']
+            ) {
                 $current_privileges[] = $row;
                 $row = PMA_DBI_fetch_assoc($res);
             }
@@ -2286,7 +2295,9 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
         . '<th>' . __('Host') . '</th>' . "\n"
         . '<th>' . __('Password') . '</th>' . "\n"
         . '<th>' . __('Global privileges') . ' '
-        . $common_functions->showHint(__('Note: MySQL privilege names are expressed in English'))
+        . $common_functions->showHint(
+            __('Note: MySQL privilege names are expressed in English')
+        )
         . '</th>' . "\n"
         . '<th>' . __('Grant') . '</th>' . "\n"
         . '<th colspan="2">' . __('Action') . '</th>' . "\n"
@@ -2294,7 +2305,9 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
         . '</thead>' . "\n";
     
     $html_output .= '<tbody>' . "\n";
-    $html_output .= PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export);
+    $html_output .= PMA_getTableBodyForUserRightsTable(
+        $db_rights, $link_edit, $link_export
+    );
     $html_output .= '</tbody>'
         . '</table>' . "\n";
     

From 8d43951bcd8466e810ecc205c1afb1944d5425db Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 07:28:58 +0530
Subject: [PATCH 094/102] improve coding style

---
 libraries/server_privileges.lib.php | 25 ++++++++++++++++++-------
 server_privileges.php               | 27 ++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 55eae0c0f5..1198d52e64 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3127,12 +3127,15 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
  * 
  * @return array  $sql_query, $message
  */
-function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $username, $hostname)
-{
+function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
+    $username, $hostname
+) {
     $common_functions = PMA_CommonFunctions::getInstance();
     
     if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
-        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
+        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2']
+            = $_REQUEST['createdb-3']
+            = false;
         $message = PMA_Message::rawError(PMA_DBI_getError());
     } else {
         $message = PMA_Message::success(__('You have added a new user.'));
@@ -3141,7 +3144,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-1'])) {
         // Create database with same name and grant all privileges
         $q = 'CREATE DATABASE IF NOT EXISTS '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
+            . $common_functions->backquote(
+                $common_functions->sqlAddSlashes($username)
+            ) . ';';
         $sql_query .= $q;
         if (! PMA_DBI_try_query($q)) {
             $message = PMA_Message::rawError(PMA_DBI_getError());
@@ -3159,7 +3164,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
 
         $q = 'GRANT ALL PRIVILEGES ON '
             . $common_functions->backquote(
-                $common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))
+                $common_functions->escapeMysqlWildcards(
+                    $common_functions->sqlAddSlashes($username)
+                )
             ) . '.* TO \''
             . $common_functions->sqlAddSlashes($username)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
@@ -3172,7 +3179,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-2'])) {
         // Grant all privileges on wildcard name (username\_%)
         $q = 'GRANT ALL PRIVILEGES ON '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
+            . $common_functions->backquote(
+                $common_functions->sqlAddSlashes($username) . '\_%'
+            ) . '.* TO \''
             . $common_functions->sqlAddSlashes($username)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
@@ -3184,7 +3193,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-3'])) {
         // Grant all privileges on the specified database to the new user
         $q = 'GRANT ALL PRIVILEGES ON '
-        . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
+        . $common_functions->backquote(
+            $common_functions->sqlAddSlashes($dbname)
+        ) . '.* TO \''
         . $common_functions->sqlAddSlashes($username)
         . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
diff --git a/server_privileges.php b/server_privileges.php
index 02d5ebc9c3..56d4faa5d9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -250,16 +250,22 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         $_add_user_error = true;
     } else {
 
-        $create_user_real = 'CREATE USER \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+        $create_user_real = 'CREATE USER \'' 
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+            . $common_functions->sqlAddSlashes($hostname) . '\'';
 
         $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+            . $common_functions->sqlAddSlashes($hostname) . '\'';
+        
         if ($pred_password != 'none' && $pred_password != 'keep') {
             $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
-            $real_sql_query .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+            $real_sql_query .= ' IDENTIFIED BY \'' 
+                . $common_functions->sqlAddSlashes($pma_pw) . '\'';
             if (isset($create_user_real)) {
                 $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
-                $create_user_real .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+                $create_user_real .= ' IDENTIFIED BY \''
+                    . $common_functions->sqlAddSlashes($pma_pw) . '\'';
             }
         } else {
             if ($pred_password == 'keep' && ! empty($password)) {
@@ -370,15 +376,22 @@ if (isset($_REQUEST['delete'])
     || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)
 ) {
     if (isset($_REQUEST['change_copy'])) {
-        $selected_usr = array($_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']);
+        $selected_usr = array(
+            $_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']
+        );
     } else {
         $selected_usr = $_REQUEST['selected_usr'];
         $queries = array();
     }
     foreach ($selected_usr as $each_user) {
         list($this_user, $this_host) = explode('&amp;#27;', $each_user);
-        $queries[] = '# ' . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...';
-        $queries[] = 'DROP USER \'' . $common_functions->sqlAddSlashes($this_user) . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
+        $queries[] = '# ' 
+            . sprintf(__('Deleting %s'),
+                '\'' . $this_user . '\'@\'' . $this_host . '\''
+            ) . ' ...';
+        $queries[] = 'DROP USER \'' 
+            . $common_functions->sqlAddSlashes($this_user) 
+            . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
 
         if (isset($_REQUEST['drop_users_db'])) {
             $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';

From 9210a1acc95a3dc7956d4addfdede75efae84c21 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 07:48:44 +0530
Subject: [PATCH 095/102] remove global variables

---
 libraries/server_privileges.lib.php | 20 ++++++++++----------
 server_privileges.php               |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1198d52e64..2b83f07cd5 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1484,7 +1484,6 @@ function PMA_getListOfPrivilegesAndComparedPrivileges()
 /**
  * Get the HTML for user form and check the privileges for a particular database.
  * 
- * @param string $dbToCheck         database to check for privileges
  * @param string $link_edit         standard link for edit
  * @param string $conditional_class if ajaxable 'Ajax' otherwise ''
  * 
@@ -1501,8 +1500,8 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         . sprintf(
             __('Users having access to &quot;%s&quot;'),
             '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' 
-                . PMA_generate_common_url($dbToCheck) . '">'
-                .  htmlspecialchars($dbToCheck)
+                . PMA_generate_common_url($_REQUEST['checkprivs']) . '">'
+                .  htmlspecialchars($_REQUEST['checkprivs'])
             . '</a>'
         )
         . "\n"
@@ -1525,7 +1524,7 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
 
     $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`'
         .' FROM `mysql`.`db`'
-        .' WHERE \'' . $common_functions->sqlAddSlashes($dbToCheck) . "'"
+        .' WHERE \'' . $common_functions->sqlAddSlashes($_REQUEST['checkprivs']) . "'"
         .' LIKE `Db`'
         .' AND NOT (' . $list_of_compared_privileges. ')) '
         .'UNION '
@@ -1541,7 +1540,7 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         $found = true;
     }
     $html_output .= PMA_getHtmlTableBodyForSpecificDbPrivs(
-        $found, $row, $odd_row, $link_edit, $res, $dbToCheck
+        $found, $row, $odd_row, $link_edit, $res
     );
     $html_output .= '</table>'
         . '</fieldset>'
@@ -1560,9 +1559,9 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
         
         $html_output .= '<a href="server_privileges.php?'
             . $GLOBALS['url_query'] . '&amp;adduser=1&amp;'
-            . 'dbname=' . htmlspecialchars($dbToCheck)
+            . 'dbname=' . htmlspecialchars($_REQUEST['checkprivs'])
             .'" rel="'
-            .'checkprivs='.htmlspecialchars($dbToCheck). '&amp;'.$GLOBALS['url_query']
+            .'checkprivs='.htmlspecialchars($_REQUEST['checkprivs']). '&amp;'.$GLOBALS['url_query']
             . '" class="'.$conditional_class
             .'" name="db_specific">' . "\n"
             . $common_functions->getIcon('b_usradd.png')
@@ -1581,12 +1580,11 @@ function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional
  * @param boolean $odd_row      whether odd or not
  * @param string $link_edit     standard link for edit
  * @param string $res           ran sql query
- * @param string $dbToCheck     database to check for privileges
  *            
  * @return string $html_output
  */
 function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
-    $link_edit, $res, $dbToCheck
+    $link_edit, $res
 ) {
     $html_output = '<tbody>' . "\n";
     if ($found) {
@@ -1626,7 +1624,9 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
                 if (! isset($current['Db']) || $current['Db'] == '*') {
                     $html_output .= __('global');
                 } elseif (
-                    $current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards($dbToCheck)
+                    $current['Db'] == PMA_CommonFunctions::getInstance()->escapeMysqlWildcards(
+                        $_REQUEST['checkprivs']
+                    )
                 ) {
                     $html_output .= __('database-specific');
                 } else {
diff --git a/server_privileges.php b/server_privileges.php
index 56d4faa5d9..8f5c23e70a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -476,7 +476,7 @@ if ($GLOBALS['is_ajax_request']
  * Displays the links
  */
 if (isset($viewing_mode) && $viewing_mode == 'db') {
-    $db = $checkprivs;
+    $db = $_REQUEST['checkprivs'];
     $url_query .= '&amp;goto=db_operations.php';
 
     // Gets the database structure
@@ -512,7 +512,10 @@ if (isset($_REQUEST['export'])
     }
 }
 
-if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs))) {
+if (empty($_REQUEST['adduser'])
+    && (! isset($_REQUEST['checkprivs'])
+    || ! strlen($_REQUEST['checkprivs']))
+) { 
     if (! isset($username)) {
         // No username is given --> display the overview
         $response->addHTML(
@@ -549,7 +552,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 } else {
     // check the privileges for a particular database.
     $response->addHTML(
-        PMA_getHtmlForSpecificDbPrivileges($checkprivs, $link_edit, $conditional_class)
+        PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
     );    
 } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...
 

From 37981416a9fff37b6982b685647a2d8c5cfdf287 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 07:51:10 +0530
Subject: [PATCH 096/102] remove global variable db

---
 server_privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_privileges.php b/server_privileges.php
index 8f5c23e70a..079341b917 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -476,7 +476,7 @@ if ($GLOBALS['is_ajax_request']
  * Displays the links
  */
 if (isset($viewing_mode) && $viewing_mode == 'db') {
-    $db = $_REQUEST['checkprivs'];
+    $_REQUEST['db'] = $_REQUEST['checkprivs'];
     $url_query .= '&amp;goto=db_operations.php';
 
     // Gets the database structure

From 7245209eae1a466c9eafc6afafd78fde1dfe73cd Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 07:58:50 +0530
Subject: [PATCH 097/102] remove global variable

---
 server_privileges.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 079341b917..55eb7349a2 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -196,9 +196,9 @@ $random_n = mt_rand(0, 1000000);
  */
 if (isset($_REQUEST['change_copy'])) {
     $user_host_condition = ' WHERE `User`'
-        .' = \'' . $common_functions->sqlAddSlashes($old_username) . "'"
+        .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_username']) . "'"
         .' AND `Host`'
-        .' = \'' . $common_functions->sqlAddSlashes($old_hostname) . '\';';
+        .' = \'' . $common_functions->sqlAddSlashes($_REQUEST['old_hostname']) . '\';';
     $row = PMA_DBI_fetch_single_row('SELECT * FROM `mysql`.`user` ' . $user_host_condition);
     if (! $row) {
         PMA_Message::notice(__('No user found.'))->display();
@@ -475,7 +475,7 @@ if ($GLOBALS['is_ajax_request']
 /**
  * Displays the links
  */
-if (isset($viewing_mode) && $viewing_mode == 'db') {
+if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
     $_REQUEST['db'] = $_REQUEST['checkprivs'];
     $url_query .= '&amp;goto=db_operations.php';
 

From c6e265c236e3b7d954cf2b88cb51b24a33f65c98 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 08:30:59 +0530
Subject: [PATCH 098/102] remove global variable

---
 libraries/server_privileges.lib.php | 16 ++++++++--------
 server_privileges.php               |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 2b83f07cd5..1d1166fa5d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1249,16 +1249,16 @@ function PMA_getGrants($user, $host)
  * 
  * @return string $message  success or error message after updating password
  */
-function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url
+function PMA_getMessageForUpdatePassword($pma_pw2, $err_url
     , $username, $hostname
 ) {
     // similar logic in user_password.php
     $message = '';
     
-    if (empty($_REQUEST['nopass']) && isset($pma_pw) && isset($pma_pw2)) {
-        if ($pma_pw != $pma_pw2) {
+    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($pma_pw2)) {
+        if ($_POST['pma_pw'] != $pma_pw2) {
             $message = PMA_Message::error(__('The passwords aren\'t the same!'));
-        } elseif (empty($pma_pw) || empty($pma_pw2)) {
+        } elseif (empty($_POST['pma_pw']) || empty($pma_pw2)) {
             $message = PMA_Message::error(__('The password is empty!'));
         }
     }
@@ -1278,15 +1278,15 @@ function PMA_getMessageForUpdatePassword($pma_pw, $pma_pw2, $err_url
         $sql_query        = 'SET PASSWORD FOR \'' 
             . $common_functions->sqlAddSlashes($username) 
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = ' 
-            . (($pma_pw == '') 
+            . (($_POST['pma_pw'] == '') 
                 ? '\'\'' 
-                : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
+                : $hashing_function . '(\'' . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')');
         
         $local_query      = 'SET PASSWORD FOR \'' 
             . $common_functions->sqlAddSlashes($username)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = '
-            . (($pma_pw == '') ? '\'\'' : $hashing_function 
-            . '(\'' . $common_functions->sqlAddSlashes($pma_pw) . '\')');
+            . (($_POST['pma_pw'] == '') ? '\'\'' : $hashing_function 
+            . '(\'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\')');
         
         PMA_DBI_try_query($local_query)
             or $common_functions->mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
diff --git a/server_privileges.php b/server_privileges.php
index 55eb7349a2..bfad2fcc29 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -261,11 +261,11 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         if ($pred_password != 'none' && $pred_password != 'keep') {
             $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
             $real_sql_query .= ' IDENTIFIED BY \'' 
-                . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+                . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
             if (isset($create_user_real)) {
                 $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
                 $create_user_real .= ' IDENTIFIED BY \''
-                    . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+                    . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
             }
         } else {
             if ($pred_password == 'keep' && ! empty($password)) {
@@ -364,7 +364,7 @@ if (isset($_REQUEST['revokeall'])) {
  */
 if (isset($_REQUEST['change_pw'])) {
     $message = PMA_getMessageForUpdatePassword(
-        $pma_pw, $pma_pw2, $err_url, $username, $hostname
+        $pma_pw2, $err_url, $username, $hostname
     );
 }
 

From 6ec2e514b6cc2b740aada33a33998ed8a4a161a5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 08:32:52 +0530
Subject: [PATCH 099/102] remove global variable pma_pw2

---
 libraries/server_privileges.lib.php | 15 ++++++---------
 server_privileges.php               |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1d1166fa5d..db63aa1f30 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1240,25 +1240,22 @@ function PMA_getGrants($user, $host)
 
 /**
  * Update password and get message for password updating
- * 
- * @param string $pma_pw    password that user entered for change, comming from request
- * @param string $pma_pw2   Re typed password, comming from request
+ *
  * @param string $err_url   error url
  * @param string $username  username
  * @param string $hostname  hostname
  * 
  * @return string $message  success or error message after updating password
  */
-function PMA_getMessageForUpdatePassword($pma_pw2, $err_url
-    , $username, $hostname
-) {
+function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
+{
     // similar logic in user_password.php
     $message = '';
     
-    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($pma_pw2)) {
-        if ($_POST['pma_pw'] != $pma_pw2) {
+    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($_POST['pma_pw2'])) {
+        if ($_POST['pma_pw'] != $_POST['pma_pw2']) {
             $message = PMA_Message::error(__('The passwords aren\'t the same!'));
-        } elseif (empty($_POST['pma_pw']) || empty($pma_pw2)) {
+        } elseif (empty($_POST['pma_pw']) || empty($_POST['pma_pw2'])) {
             $message = PMA_Message::error(__('The password is empty!'));
         }
     }
diff --git a/server_privileges.php b/server_privileges.php
index bfad2fcc29..644ab8ff5e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -364,7 +364,7 @@ if (isset($_REQUEST['revokeall'])) {
  */
 if (isset($_REQUEST['change_pw'])) {
     $message = PMA_getMessageForUpdatePassword(
-        $pma_pw2, $err_url, $username, $hostname
+        $err_url, $username, $hostname
     );
 }
 

From f03376076d9b4184e4d7fe16cd5e86b836238582 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 22:51:24 +0530
Subject: [PATCH 100/102] remove php notice

---
 libraries/server_privileges.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index db63aa1f30..73b59a6d1c 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1486,7 +1486,7 @@ function PMA_getListOfPrivilegesAndComparedPrivileges()
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForSpecificDbPrivileges($dbToCheck, $link_edit, $conditional_class)
+function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     // check the privileges for a particular database.

From b05ee596f951efd7f42d6943b41bf9bf9f37461b Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Thu, 19 Jul 2012 01:19:38 +0530
Subject: [PATCH 101/102] remove global variables

---
 libraries/server_privileges.lib.php |  4 +-
 server_privileges.php               | 57 +++++------------------------
 2 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 73b59a6d1c..ce0df26a44 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -138,8 +138,8 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false)
             $privs[] = 'USAGE';
         }
     } elseif ($allPrivileges
-            && (! isset($GLOBALS['grant_count'])
-            || count($privs) == $GLOBALS['grant_count'])
+            && (! isset($_POST['grant_count'])
+            || count($privs) == $_POST['grant_count'])
         ) {
         if ($enableHTML) {
             $privs = array('<dfn title="'
diff --git a/server_privileges.php b/server_privileges.php
index 644ab8ff5e..93cbbc69bd 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -26,49 +26,11 @@ $common_functions = PMA_CommonFunctions::getInstance();
 
 $_add_user_error = false;
 
-/**
- * Sets globals from $_GET
- */
-
-$get_params = array(
-    'checkprivs',
-    'db',
-    'dbname',
-    'hostname',
-    'initial',
-    'old_username',
-    'old_hostname',
-    'tablename',
-    'username',
-    'viewing_mode'
-);
-foreach ($get_params as $one_get_param) {
-    if (isset($_REQUEST[$one_get_param])) {
-        $GLOBALS[$one_get_param] = $_REQUEST[$one_get_param];
-    }
+if (isset ($_REQUEST['username'])) {
+    $username = $_REQUEST['username'];
 }
-/**
- * Sets globals from $_POST
- */
-
-$post_params = array(
-    'createdb-1',
-    'createdb-2',
-    'createdb-3',
-    'grant_count',
-    'hostname',
-    'pma_pw',
-    'pma_pw2',
-    'pred_hostname',
-    'pred_password',
-    'pred_username',
-    'update_privs',
-    'username'
-);
-foreach ($post_params as $one_post_param) {
-    if (isset($_POST[$one_post_param])) {
-        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
-    }
+if (isset ($_REQUEST['hostname'])) {
+    $hostname = $_REQUEST['hostname'];
 }
 
 /**
@@ -221,10 +183,10 @@ if (isset($_REQUEST['change_copy'])) {
  */
 if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
     $sql_query = '';
-    if ($pred_username == 'any') {
+    if ($_POST['pred_username'] == 'any') {
         $username = '';
     }
-    switch ($pred_hostname) {
+    switch ($_POST['pred_hostname']) {
     case 'any':
         $hostname = '%';
         break;
@@ -258,7 +220,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             . $common_functions->sqlAddSlashes($username) . '\'@\'' 
             . $common_functions->sqlAddSlashes($hostname) . '\'';
         
-        if ($pred_password != 'none' && $pred_password != 'keep') {
+        if ($_POST['pred_password'] != 'none' && $_POST['pred_password'] != 'keep') {
             $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
             $real_sql_query .= ' IDENTIFIED BY \'' 
                 . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
@@ -268,7 +230,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                     . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
             }
         } else {
-            if ($pred_password == 'keep' && ! empty($password)) {
+            if ($_POST['pred_password'] == 'keep' && ! empty($password)) {
                 $real_sql_query .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
                 if (isset($create_user_real)) {
                     $create_user_real .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
@@ -338,7 +300,7 @@ if (isset($_REQUEST['change_copy'])) {
 /**
  * Updates privileges
  */
-if (! empty($update_privs)) {
+if (! empty($_POST['update_privs'])) {
     list($sql_query, $message) = PMA_updatePrivileges(
         $username,
         $hostname,
@@ -477,6 +439,7 @@ if ($GLOBALS['is_ajax_request']
  */
 if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
     $_REQUEST['db'] = $_REQUEST['checkprivs'];
+    
     $url_query .= '&amp;goto=db_operations.php';
 
     // Gets the database structure

From 75d20f23fc410de26012b0edfcaf55a085405759 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Sat, 21 Jul 2012 05:21:19 +0530
Subject: [PATCH 102/102] a function for get sql queries for display and add
 user

---
 libraries/server_privileges.lib.php | 66 +++++++++++++++++++++++++++++
 server_privileges.php               | 47 +-------------------
 2 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ce0df26a44..498ce1e770 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3202,4 +3202,70 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
     }
     return array($sql_query, $message);
 }
+
+/**
+ * Get SQL queries for Display and Add user
+ * 
+ * @param string $username  usernam
+ * @param string $hostname  host name
+ * @param string $password  password
+ * 
+ * @return array ($create_user_real, $create_user_show,$real_sql_query, $sql_query)
+ */
+function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
+{   
+    $common_functions = PMA_CommonFunctions::getInstance();
+    $sql_query = '';
+    $create_user_real = 'CREATE USER \'' 
+        . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+        . $common_functions->sqlAddSlashes($hostname) . '\'';
+
+    $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
+        . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+        . $common_functions->sqlAddSlashes($hostname) . '\'';
+
+    if ($_POST['pred_password'] != 'none' && $_POST['pred_password'] != 'keep') {
+        $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
+        $real_sql_query .= ' IDENTIFIED BY \'' 
+            . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
+        if (isset($create_user_real)) {
+            $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
+            $create_user_real .= ' IDENTIFIED BY \''
+                . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
+        }
+    } else {
+        if ($_POST['pred_password'] == 'keep' && ! empty($password)) {
+            $real_sql_query .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
+            if (isset($create_user_real)) {
+                $create_user_real .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
+            }
+        }
+        $sql_query = $real_sql_query;
+        if (isset($create_user_real)) {
+            $create_user_show = $create_user_real;
+        }
+    }
+
+    if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
+        || (isset($_POST['max_questions']) || isset($_POST['max_connections'])
+        || isset($_POST['max_updates']) || isset($_POST['max_user_connections']))
+    ) {
+        $with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
+        $real_sql_query .= $with_clause;
+        $sql_query .= $with_clause;
+    }
+
+    if (isset($create_user_real)) {
+        $create_user_real .= ';';
+        $create_user_show .= ';';
+    }
+    $real_sql_query .= ';';
+    $sql_query .= ';';
+    
+    return array($create_user_real, 
+        $create_user_show,
+        $real_sql_query,
+        $sql_query
+    );
+}
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index 93cbbc69bd..0ade132140 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -211,52 +211,9 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         $_REQUEST['adduser'] = true;
         $_add_user_error = true;
     } else {
-
-        $create_user_real = 'CREATE USER \'' 
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
-            . $common_functions->sqlAddSlashes($hostname) . '\'';
-
-        $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
-            . $common_functions->sqlAddSlashes($hostname) . '\'';
+        list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
+            = PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
         
-        if ($_POST['pred_password'] != 'none' && $_POST['pred_password'] != 'keep') {
-            $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
-            $real_sql_query .= ' IDENTIFIED BY \'' 
-                . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
-            if (isset($create_user_real)) {
-                $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
-                $create_user_real .= ' IDENTIFIED BY \''
-                    . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\'';
-            }
-        } else {
-            if ($_POST['pred_password'] == 'keep' && ! empty($password)) {
-                $real_sql_query .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
-                if (isset($create_user_real)) {
-                    $create_user_real .= ' IDENTIFIED BY PASSWORD \'' . $password . '\'';
-                }
-            }
-            $sql_query = $real_sql_query;
-            if (isset($create_user_real)) {
-                $create_user_show = $create_user_real;
-            }
-        }
-
-        if ((isset($Grant_priv) && $Grant_priv == 'Y')
-            || (isset($max_questions) || isset($max_connections)
-            || isset($max_updates) || isset($max_user_connections))
-        ) {
-            $with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
-            $real_sql_query .= $with_clause;
-            $sql_query .= $with_clause;
-        }
-
-        if (isset($create_user_real)) {
-            $create_user_real .= ';';
-            $create_user_show .= ';';
-        }
-        $real_sql_query .= ';';
-        $sql_query .= ';';
         if (empty($_REQUEST['change_copy'])) {
             $_error = false;