diff --git a/db_operations.php b/db_operations.php
index 0bdb94f046..2818864c6e 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -73,7 +73,8 @@ if (strlen($db) && (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_cop
             "sql",    
             'libraries/plugins/export/',
             array(
-                'single_table' => isset($single_table)
+                'single_table' => isset($single_table),
+                'export_type'  => 'database'
             )
         );
         $GLOBALS['sql_constraints_query_full_db'] = 
diff --git a/db_structure.php b/db_structure.php
index 80e1ee582d..c425e8af19 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -140,7 +140,7 @@ $overhead_check = '';
 $create_time_all = '';
 $update_time_all = '';
 $check_time_all = '';
-$checked        = !empty($checkall) ? ' checked="checked"' : '';
+$checked        = (!empty($checkall) ? ' checked="checked"' : '');
 $num_columns    = $cfg['PropertiesNumColumns'] > 1
     ? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1
     : 0;
@@ -167,7 +167,7 @@ foreach ($tables as $keyname => $current_table) {
     
     list($current_table, $formatted_size, $unit, $formatted_overhead,
         $overhead_unit, $overhead_size, $table_is_view, $sum_size)
-            = PMA_getStuffForEnginetable($current_table, $db_is_information_schema,
+            = PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
                 $is_show_stats, $table_is_view, $sum_size, $overhead_size
             );
 
@@ -218,7 +218,7 @@ foreach ($tables as $keyname => $current_table) {
         );
     }
 
-    list($alias, $truename) = PMA_getAliasAndTruename(
+    list($alias, $truename) = PMA_getAliasAndTrueName(
         $tooltip_aliasname, $current_table, $tooltip_truename
     );
 
@@ -318,7 +318,10 @@ $response->addHTML('</div><hr />');
  */
 /* DATABASE WORK */
 /* Printable view of a table */
-$response->addHTML(PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query));
+$response->addHTML(
+    PMA_getHtmlForTablePrintViewLink($url_query)
+    . PMA_getHtmlForDataDictionaryLink($url_query)
+);
 
 if (empty($db_is_information_schema)) {
     ob_start();
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 5303ac276f..363c938bb0 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -546,6 +546,7 @@ $(function() {
         $.get($(this).attr('href'), {'ajax_request' : true}, function(data) {
             // This form is not on screen when first entering Privileges
             // if there are more than 50 users
+            $("div.notice").remove();
             $("#usersForm").hide("medium").remove();
             $("#fieldset_add_user").hide("medium").remove();
             $("#initials_table")
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index eedaf5437d..76804ba6c0 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -57,7 +57,7 @@ function PMA_getHtmlForRenameDatabase($db)
         . '<form id="rename_db_form" '
         . ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '')
         . 'method="post" action="db_operations.php"'
-        . 'onsubmit="return emptyFormElements(this, ' . "'newname'" . ')">';
+        . 'onsubmit="return emptyFormElements(this, \'newname\')">';
     if (isset($_REQUEST['db_collation'])) {
         $html_output .= '<input type="hidden" name="db_collation" '
             . 'value="' . $_REQUEST['db_collation']
@@ -160,7 +160,7 @@ function PMA_getHtmlForCopyDatabase($db)
     $html_output .= '<form id="copy_db_form" '
         . ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '')
         . 'method="post" action="db_operations.php"'
-        . 'onsubmit="return emptyFormElements(this' . "'newname'" . ')">';
+        . 'onsubmit="return emptyFormElements(this, \'newname\')">';
 
     if (isset($_REQUEST['db_collation'])) {
         $html_output .= '<input type="hidden" name="db_collation" '
@@ -467,7 +467,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db)
 
             if (! PMA_Table::moveCopy(
                 $db, $each_table, $_REQUEST['newname'], $each_table,
-                isset($this_what) ? $this_what : 'data',
+                (isset($this_what) ? $this_what : 'data'),
                 $move, 'db_copy'
             )) {
                 $error = true;
@@ -1033,9 +1033,9 @@ function PMA_getHtmlForCopytable()
 
     $html_output .= '<input type="checkbox" name="switch_to_new" value="true"'
         . 'id="checkbox_switch"'
-        . (isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
+        . ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
             ? ' checked="checked"'
-            : '' . '/>';
+            : '' . '/>');
     $html_output .= '<label for="checkbox_switch">'
         . __('Switch to copied table') . '</label>'
         . '</fieldset>';
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 278883b2d7..e46f03a4db 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -26,17 +26,17 @@ if (! defined('PHPMYADMIN')) {
  */
 function PMA_wildcardEscapeForGrant($dbname, $tablename)
 {
+    $common_functions = PMA_CommonFunctions::getInstance();
     if (! strlen($dbname)) {
         $db_and_table = '*.*';
     } else {
         if (strlen($tablename)) {
-            $db_and_table
-                = PMA_CommonFunctions::getInstance()->backquote(
-                    PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($dbname)
+            $db_and_table = $common_functions->backquote(
+                    $common_functions->unescapeMysqlWildcards($dbname)
                 ) . '.'
-                . PMA_CommonFunctions::getInstance()->backquote($tablename);
+                . $common_functions->backquote($tablename);
         } else {
-            $db_and_table = PMA_CommonFunctions::getInstance()->backquote($dbname) . '.*';
+            $db_and_table = $common_functions->backquote($dbname) . '.*';
         }
     }
     return $db_and_table;
@@ -51,13 +51,14 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename)
  */
 function PMA_rangeOfUsers($initial = '')
 {
+    $common_functions = PMA_CommonFunctions::getInstance();
     // strtolower() is used because the User field
     // might be BINARY, so LIKE would be case sensitive
     if (! empty($initial)) {
         $ret = " WHERE `User` LIKE '"
-            . PMA_CommonFunctions::getInstance()->sqlAddSlashes($initial, true) . "%'"
+            . $common_functions->sqlAddSlashes($initial, true) . "%'"
             . " OR `User` LIKE '"
-            . PMA_CommonFunctions::getInstance()->sqlAddSlashes(strtolower($initial), true) . "%'";
+            . $common_functions->sqlAddSlashes(strtolower($initial), true) . "%'";
     } else {
         $ret = '';
     }
@@ -309,11 +310,15 @@ function PMA_getHtmlForDisplayColumnPrivileges($columns, $row, $name_for_select,
         . $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 .= '<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 .= '>' 
+            . htmlspecialchars($current_column) . '</option>' . "\n";
     }
 
     $html_output .= '</select>' . "\n"
@@ -465,12 +470,16 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*',
         );
     } 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);
+        $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs(
+            $db, $table, $row, $random_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"
+        $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;
@@ -486,58 +495,65 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*',
 function PMA_getHtmlForDisplayResourceLimits($row)
 {
     $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";
+        . '<legend>' . __('Resource limits') . '</legend>' . "\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";
+        . '<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";
+        . '<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";
+        . '<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";
+        . '<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";
 
@@ -583,17 +599,21 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db
     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')
-       . $common_functions->showHint(
+    $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')
+        . $common_functions->showHint(
                __('Note: MySQL privilege names are expressed in English')
            )
-       . '</legend>' . "\n";
+        . '</legend>' . "\n";
 
     // privs that are attached to a specific column
-    $html_output .= PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row);
+    $html_output .= PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn(
+        $columns, $row
+    );
 
     // privs that are not attached to a specific column
     $html_output .= '<div class="item">' . "\n"
@@ -650,7 +670,11 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
     $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'))) {
+        if (in_array(
+                $grant_type,
+                array('Select', 'Insert', 'Update', 'References')
+            )
+        ) {
             continue;
         }
         // make a substitution to match the messages variables;
@@ -676,13 +700,19 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
            . 'title="';
 
         $html_output .= (isset($GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
-                    ] )
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    )
+                ] )
                 ? $GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    )
                 ]
                 : $GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    ) . 'Tbl'
                 ]
             )
             . '"/>' . "\n";
@@ -690,16 +720,24 @@ function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
         $html_output .= '<label for="checkbox_' . $current_grant
             . '"><code><dfn title="'
             . (isset($GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    )
                 ])
                 ? $GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    )
                 ]
                 : $GLOBALS[
-                    'strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'
+                    'strPrivDesc' . substr(
+                        $tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)
+                    ) . 'Tbl'
                 ]
             )
-            . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5))
+            . '">' . strtoupper(substr(
+                $current_grant, 0, strlen($current_grant) - 5)
+            )
             . '</dfn></code></label>' . "\n"
             . '</div>' . "\n";
     } // end foreach ()
@@ -750,11 +788,13 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n)
                 : __('Table-specific privileges'))) . "\n"
         . '(<a href="server_privileges.php?'
         . $GLOBALS['url_query'] . '&amp;checkall=1" '
-        . 'onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', true); return false;">'
+        . '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;">'
+        . 'onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); '
+        . 'return false;">'
         . __('Uncheck All') . '</a>)' . "\n"
         . '</legend>' . "\n"
         . '<p><small><i>'
@@ -943,13 +983,15 @@ function PMA_getAdministrationPrivilegeTable($db)
  * 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 $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)
-{
+function PMA_getHtmlForGlobalPrivTableWithCheckboxes(
+    $privTable, $privTable_names, $row
+) {
     $html_output = '';
     foreach ($privTable as $i => $table) {
         $html_output .= '<fieldset>' . "\n"
@@ -957,14 +999,16 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes($privTable, $privTable_name
         foreach ($table as $priv) {
             $html_output .= '<div class="item">' . "\n"
                 . '<input type="checkbox"'
-                . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                . ' 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] . '">'
+                . '<label for="checkbox_' . $priv[0] . '_priv">'
+                . '<code><dfn title="' . $priv[2] . '">'
                 . $priv[1] . '</dfn></code></label>' . "\n"
                 . '</div>' . "\n";
         }
@@ -1019,7 +1063,9 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . '</option>' . "\n";
 
     $html_output .= '<option value="userdefined"'
-        . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined')
+        . ((! isset($GLOBALS['pred_username'])
+                || $GLOBALS['pred_username'] == 'userdefined'
+            )
             ? ' selected="selected"'
             : '') . '>'
         . __('Use text field')
@@ -1038,7 +1084,8 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
                : $GLOBALS['username']
            ) . '"'
         )
-        . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
+        . ' onchange="pred_username.value = \'userdefined\';" '
+        . 'autofocus="autofocus" />' . "\n"
         . '</div>' . "\n";
 
     $html_output .= '<div class="item">' . "\n"
@@ -1069,7 +1116,8 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . (empty($thishost)
             ? ''
             : 'else if (this.value == \'thishost\') { '
-            . '    hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; '
+            . '    hostname.value = \'' . addslashes(htmlspecialchars($thishost))
+            . '\'; '
             . '} '
         )
         . 'else if (this.value == \'hosttable\') { '
@@ -1095,20 +1143,26 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         }
     }
     $html_output .=  '<option value="any"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == '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')
+        . ((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')
+            . ((isset($GLOBALS['pred_hostname']) 
+                    && $GLOBALS['pred_hostname'] == 'thishost'
+                )
                 ? ' selected="selected"'
                 : '') . '>'
             . __('This Host')
@@ -1116,14 +1170,18 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
     }
     unset($thishost);
     $html_output .= '<option value="hosttable"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
+        . ((isset($GLOBALS['pred_hostname']) 
+                && $GLOBALS['pred_hostname'] == 'hosttable'
+            )
             ? ' selected="selected"'
             : '') . '>'
         . __('Use Host Table')
         . '</option>' . "\n";
 
     $html_output .= '<option value="userdefined"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
+        . ((isset($GLOBALS['pred_hostname']) 
+                && $GLOBALS['pred_hostname'] == 'userdefined'
+            )
             ? ' selected="selected"'
             : '') . '>'
         . __('Use text field') . ':</option>' . "\n"
@@ -1154,7 +1212,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . '} else if (this.value == \'userdefined\') { '
         . '    pma_pw.focus(); pma_pw.select(); '
         . '}">' . "\n"
-        . ($mode == 'change' ? '            <option value="keep" selected="selected">'
+        . ($mode == 'change' ? '<option value="keep" selected="selected">'
             . __('Do not change the password')
             . '</option>' . "\n" : '')
         . '<option value="none"';
@@ -1174,7 +1232,8 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
         . 'onchange="pred_password.value = \'userdefined\';" />' . "\n"
         . '</div>' . "\n";
 
-    $html_output .= '<div class="item" id="div_element_before_generate_password">' . "\n"
+    $html_output .= '<div class="item" '
+        . 'id="div_element_before_generate_password">' . "\n"
         . '<label for="text_pma_pw2">' . "\n"
         . '    ' . __('Re-type') . ':' . "\n"
         . '</label>' . "\n"
@@ -1252,7 +1311,10 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
     // similar logic in user_password.php
     $message = '';
 
-    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($_POST['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($_POST['pma_pw2'])) {
@@ -1277,7 +1339,8 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\' = '
             . (($_POST['pma_pw'] == '')
                 ? '\'\''
-                : $hashing_function . '(\'' . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')');
+                : $hashing_function . '(\'' 
+                . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')');
 
         $local_query      = 'SET PASSWORD FOR \''
             . $common_functions->sqlAddSlashes($username)
@@ -1286,10 +1349,15 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
             . '(\'' . $common_functions->sqlAddSlashes($_POST['pma_pw']) . '\')');
 
         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.'));
+            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) . '\''
+            '\'' . htmlspecialchars($username)
+            . '\'@\'' . htmlspecialchars($hostname) . '\''
         );
     }
     return $message;
@@ -1308,16 +1376,18 @@ function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
 function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
     $tablename, $username, $hostname
 ) {
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
     $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
 
     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table
         . ' FROM \''
-        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
-        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . '\';';
+        . $common_functions->sqlAddSlashes($username) . '\'@\''
+        . $common_functions->sqlAddSlashes($hostname) . '\';';
 
     $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table
-        . ' FROM \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . '\'@\''
-        . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . '\';';
+        . ' FROM \'' . $common_functions->sqlAddSlashes($username) . '\'@\''
+        . $common_functions->sqlAddSlashes($hostname) . '\';';
 
     PMA_DBI_query($sql_query0);
     if (! PMA_DBI_try_query($sql_query1)) {
@@ -1325,9 +1395,12 @@ function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
         $sql_query1 = '';
     }
     $sql_query = $sql_query0 . ' ' . $sql_query1;
-    $message = PMA_Message::success(__('You have revoked the privileges for %s'));
+    $message = PMA_Message::success(
+        __('You have revoked the privileges for %s')
+    );
     $message->addParam(
-        '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''
+        '\'' . htmlspecialchars($username)
+        . '\'@\'' . htmlspecialchars($hostname) . '\''
     );
 
     return array($message, $sql_query);
@@ -1412,11 +1485,15 @@ function PMA_getHtmlForAddUser($random_n, $dbname)
     }
 
     $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";
+    $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;
 }
@@ -1490,7 +1567,8 @@ function PMA_getHtmlForSpecificDbPrivileges($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 = '<form id="usersForm" action="server_privileges.php">'
+        . '<fieldset>' . "\n";
     $html_output .= '<legend>' . "\n"
         . $common_functions->getIcon('b_usrcheck.png')
         . '    '
@@ -1521,7 +1599,8 @@ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
 
     $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`'
         .' FROM `mysql`.`db`'
-        .' WHERE \'' . $common_functions->sqlAddSlashes($_REQUEST['checkprivs']) . "'"
+        .' WHERE \'' . $common_functions->sqlAddSlashes($_REQUEST['checkprivs'])
+        . "'"
         .' LIKE `Db`'
         .' AND NOT (' . $list_of_compared_privileges. ')) '
         .'UNION '
@@ -1558,7 +1637,8 @@ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
             . $GLOBALS['url_query'] . '&amp;adduser=1&amp;'
             . 'dbname=' . htmlspecialchars($_REQUEST['checkprivs'])
             .'" rel="'
-            .'checkprivs='.htmlspecialchars($_REQUEST['checkprivs']). '&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')
@@ -1573,7 +1653,8 @@ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class)
  * 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 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
@@ -1597,7 +1678,9 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
                 $current_privileges[] = $row;
                 $row = PMA_DBI_fetch_assoc($res);
             }
-            $html_output .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
+            $html_output .= '<tr '
+                . 'class="noclick ' . ($odd_row ? 'odd' : 'even') 
+                . '">' . "\n"
                 . '<td';
             if (count($current_privileges) > 1) {
                 $html_output .= ' rowspan="' . count($current_privileges) . '"';
@@ -1636,27 +1719,34 @@ function PMA_getHtmlTableBodyForSpecificDbPrivs($found, $row, $odd_row,
                 $html_output .='<td>' . "\n"
                    . '<code>' . "\n"
                    . ''
-                   . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\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";
+                    . '' . ($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']
+                        ! (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";
+                    $html_output .= '<tr '
+                        . 'class="noclick ' . ($odd_row ? 'odd' : 'even') . '">'
+                        . "\n";
                 }
             }
             if (empty($row)) {
@@ -1727,13 +1817,21 @@ function PMA_getStandardLinks($conditional_class)
  *
  * @param string $sql_query           sql query
  * @param string $link_edit           standard link for edit
- * @param boolean $dbname_is_wildcard whether database name is wildcard or not
  *
  * @return array $extra_data
  */
 function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
-    $link_edit, $dbname_is_wildcard, $hostname, $username
+    $link_edit, $hostname, $username
 ) {
+    if (isset($GLOBALS['dbname'])) {
+        //if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
+        if (preg_match('/(?<!\\\\)(?:_|%)/i', $GLOBALS['dbname'])) {
+            $dbname_is_wildcard = true;
+        } else {
+            $dbname_is_wildcard = false;
+        }
+    }
+
     if (strlen($sql_query)) {
         $extra_data['sql_query']
             = PMA_CommonFunctions::getInstance()->getMessage(null, $sql_query);
@@ -1744,7 +1842,8 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
          * 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_"'
+            . '<td> <input type="checkbox" name="selected_usr[]" '
+            . 'id="checkbox_sel_users_"'
             . 'value="' 
             . htmlspecialchars($username)
             . '&amp;#27;' . htmlspecialchars($hostname) . '" />'
@@ -1812,7 +1911,7 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
 
     if (isset($_POST['update_privs'])) {
         $extra_data['db_specific_privs'] = false;
-        if (empty($dbname_is_wildcard)) {
+        if (isset($dbname_is_wildcard)) {
             $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
         }
         $new_privileges = join(', ', PMA_extractPrivInfo('', true));
@@ -1860,10 +1959,12 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
     $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";
+    $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;
 }
@@ -2039,7 +2140,9 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
                 . '</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')
@@ -2059,7 +2162,10 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
                 $link_edit,
                 htmlspecialchars(urlencode($username)),
                 urlencode(htmlspecialchars($hostname)),
-                urlencode((! strlen($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                urlencode((! strlen($dbname))
+                    ? $row['Db'] 
+                    : htmlspecialchars($dbname)
+                ),
                 urlencode((! strlen($dbname)) ? '' : $row['Table_name'])
             );
             $html_output .= '</td>' . "\n"
@@ -2072,7 +2178,10 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
                     $link_revoke,
                     htmlspecialchars(urlencode($username)),
                     urlencode(htmlspecialchars($hostname)),
-                    urlencode((! strlen($dbname)) ? $row['Db'] : htmlspecialchars($dbname)),
+                    urlencode((! strlen($dbname)) 
+                        ? $row['Db'] 
+                        : htmlspecialchars($dbname)
+                    ),
                     urlencode((! strlen($dbname)) ? '' : $row['Table_name'])
                 );
             }
@@ -2098,6 +2207,8 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $link_edit, $dbname,
 function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
     , $link_edit, $link_revoke, $dbname
 ) {
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
     // table header
     $html_output = PMA_generate_common_hidden_inputs('', '')
         . '<input type="hidden" name="username" '
@@ -2129,9 +2240,9 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
         . '</thead>' . "\n";
 
     $user_host_condition = ' WHERE `User`'
-        . ' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
+        . ' = \'' . $common_functions->sqlAddSlashes($username) . "'"
         . ' AND `Host`'
-        . ' = \'' . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "'";
+        . ' = \'' . $common_functions->sqlAddSlashes($hostname) . "'";
 
     // table body
     // get data
@@ -2169,15 +2280,18 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname
  */
 function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows)
 {
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
     $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";
+        $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);
+            $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,
@@ -2190,7 +2304,7 @@ function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows)
         $html_output .= '</select>' . "\n";
     }
     $html_output .= '<input type="text" id="text_dbname" name="dbname" />' . "\n"
-        . PMA_CommonFunctions::getInstance()->showHint(
+        . $common_functions->showHint(
             __('Wildcards % and _ should be escaped with a \ to use them literally')
         );
     return $html_output;
@@ -2230,18 +2344,21 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
         PMA_DBI_free_result($result);
 
         if (! empty($pred_tbl_array)) {
-            $html_output .= '<select name="pred_tablename" class="autosubmit">' . "\n"
+            $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) . '">'
+                $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";
+    $html_output .= '<input type="text" id="text_tablename" name="tablename" />'
+        . "\n";
 
     return $html_output;
 }
@@ -2272,7 +2389,8 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
     @PMA_DBI_free_result($result);
 
     $html_output =
-        '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"
+        '<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"
@@ -2341,7 +2459,8 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export
         ksort($user);
         foreach ($user as $host) {
             $index_checkbox++;
-            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
+            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
+                . "\n";
             $html_output .= '<td>'
                 . '<input type="checkbox" class="checkall" name="selected_usr[]" '
                 . 'id="checkbox_sel_users_'
@@ -2351,7 +2470,8 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export
                 . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
                 . ' /></td>' . "\n";
 
-            $html_output .= '<td><label for="checkbox_sel_users_' . $index_checkbox . '">'
+            $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"
@@ -2363,7 +2483,8 @@ function PMA_getTableBodyForUserRightsTable($db_rights, $link_edit, $link_export
                 $html_output .= __('Yes');
                 break;
             case 'N':
-                $html_output .= '<span style="color: #FF0000">' . __('No') . '</span>';
+                $html_output .= '<span style="color: #FF0000">' . __('No') 
+                    . '</span>';
                 break;
             // this happens if this is a definition not coming from mysql.user
             default:
@@ -2409,7 +2530,8 @@ 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"'
+    $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";
@@ -2477,20 +2599,24 @@ function PMA_getHtmlForDisplayTheInitials($array_initials, $conditional_class)
 
     uksort($array_initials, "strnatcasecmp");
 
-    $html_output = '<table id="initials_table" class="' . $conditional_class . '" <cellspacing="5">'
+    $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>'
+                . '<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" '
+        . '<a href="server_privileges.php?' . $GLOBALS['url_query'] 
+        . '&amp;showall=1" '
         . 'class="nowrap">[' . __('Show all') . ']</a></td>' . "\n";
     $html_output .= '</tr></table>';
 
@@ -2577,7 +2703,9 @@ function PMA_deleteUser($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.'));
+            $message = PMA_Message::success(
+                __('The selected users have been deleted successfully.')
+            );
         }
     }
     return array($sql_query, $message);
@@ -2645,7 +2773,8 @@ function PMA_updatePrivileges($username, $hostname, $tablename, $dbname)
     $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) . '\''
+        '\'' . htmlspecialchars($username) 
+            . '\'@\'' . htmlspecialchars($hostname) . '\''
     );
 
     return array($sql_query, $message);
@@ -2673,7 +2802,8 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
             $export .= '# '
                 . sprintf(
                     __('Privileges for %s'),
-                    '`' . htmlspecialchars($export_username) . '`@`' . htmlspecialchars($export_hostname) . '`'
+                    '`' . htmlspecialchars($export_username) 
+                        . '`@`' . htmlspecialchars($export_hostname) . '`'
                 )
                 . "\n\n";
             $export .= PMA_getGrants($export_username, $export_hostname) . "\n";
@@ -2702,7 +2832,8 @@ function PMA_getHtmlForExportUserDefinition($username, $hostname)
 function PMA_getAddUserHtmlFieldset($conditional_class)
 {
     return '<fieldset id="fieldset_add_user">' . "\n"
-        . '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" '
+        . '<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"
@@ -2717,40 +2848,41 @@ function PMA_getAddUserHtmlFieldset($conditional_class)
  *
  * @return string $html_output
  */
-function PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard, $url_dbname)
-{
+function PMA_getHtmlHeaderForDisplayUserProperties(
+    $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename
+) {
     $html_output = '<h2>' . "\n"
        . PMA_CommonFunctions::getInstance()->getIcon('b_usredit.png')
        . __('Edit Privileges') . ': '
        . __('User');
 
-    if (isset($_REQUEST['dbname'])) {
+    if (isset($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'])
+            . '&amp;username=' . htmlspecialchars(urlencode($username))
+            . '&amp;hostname=' . htmlspecialchars(urlencode($hostname))
+            . '&amp;dbname=&amp;tablename=">\'' . htmlspecialchars($username)
+            . '\'@\'' . htmlspecialchars($hostname)
             . '\'</a></i>' . "\n";
 
         $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;username=' . htmlspecialchars(urlencode($username))
+                . '&amp;hostname=' . htmlspecialchars(urlencode($hostname))
                 . '&amp;dbname=' . htmlspecialchars($url_dbname)
-                . '&amp;tablename=">' . htmlspecialchars($_REQUEST['dbname'])
+                . '&amp;tablename=">' . htmlspecialchars($dbname)
                 . '</a></i>';
 
             $html_output .= ' - ' . __('Table')
-                . ' <i>' . htmlspecialchars($_REQUEST['tablename']) . '</i>';
+                . ' <i>' . htmlspecialchars($tablename) . '</i>';
         } else {
-            $html_output .= ' <i>' . htmlspecialchars($_REQUEST['dbname']) . '</i>';
+            $html_output .= ' <i>' . htmlspecialchars($dbname) . '</i>';
         }
 
     } else {
-        $html_output .= ' <i>\'' . htmlspecialchars($_REQUEST['username'])
-            . '\'@\'' . htmlspecialchars($_REQUEST['hostname'])
+        $html_output .= ' <i>\'' . htmlspecialchars($username)
+            . '\'@\'' . htmlspecialchars($hostname)
             . '\'</i>' . "\n";
 
     }
@@ -2782,7 +2914,9 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
         "       IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" .
         '  FROM `mysql`.`user`';
 
-    $sql_query .= (isset($_REQUEST['initial']) ? PMA_rangeOfUsers($_REQUEST['initial']) : '');
+    $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);
@@ -2822,7 +2956,9 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
          * 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);
+            $html_output .= PMA_getHtmlForDisplayTheInitials(
+                $array_initials, $conditional_class
+            );
         }
 
         /**
@@ -2841,10 +2977,6 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
             $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
@@ -2878,20 +3010,24 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
 function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname,
     $random_n, $username, $hostname, $link_edit, $link_revoke, $dbname, $tablename
 ) {
-    $html_output = PMA_getHtmlHeaderForDisplayUserProperties($dbname_is_wildcard, $url_dbname);
+    $common_functions = PMA_CommonFunctions::getInstance();
+    
+    $html_output = PMA_getHtmlHeaderForDisplayUserProperties(
+        $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename
+    );
 
     $sql = "SELECT '1' FROM `mysql`.`user`"
-        . " WHERE `User` = '" . PMA_CommonFunctions::getInstance()->sqlAddSlashes($username) . "'"
-        . " AND `Host` = '" . PMA_CommonFunctions::getInstance()->sqlAddSlashes($hostname) . "';";
+        . " WHERE `User` = '" . $common_functions->sqlAddSlashes($username) . "'"
+        . " AND `Host` = '" . $common_functions->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();
+                __('The selected user was not found in the privilege table.')
+            )->getDisplay();
         $html_output .= PMA_getHtmlForDisplayLoginInformationFields();
-        //exit;
+            //exit;
     }
 
     $html_output .= '<form name="usersForm" id="addUsersForm_' . $random_n . '"'
@@ -2925,9 +3061,10 @@ 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, $dbname
-        );
+        list($html_rightsTable, $found_rows) 
+            = PMA_getTableForDisplayAllTableSpecificRights(
+                $username, $hostname, $link_edit, $link_revoke, $dbname
+            );
         $html_output .= $html_rightsTable;
 
         if (! strlen($dbname)) {
@@ -2975,7 +3112,8 @@ function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     $res = PMA_DBI_query(
-        'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' . $user_host_condition,
+        'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`' 
+            . $user_host_condition,
         $GLOBALS['userlink'],
         PMA_DBI_QUERY_STORE
     );
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index a6685b12c9..837ec0e532 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -128,9 +128,9 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table)
             $current_table['TABLE_NAME']
         );
     $drop_message = sprintf(
-        ($table_is_view || $current_table['ENGINE'] == null)
+        (($table_is_view || $current_table['ENGINE'] == null)
             ? __('View %s has been dropped')
-            : __('Table %s has been dropped'),
+            : __('Table %s has been dropped')),
         str_replace(
             ' ',
             '&nbsp;',
@@ -349,32 +349,39 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check) {
 
 
 /**
- * Get HTML links for "Print view" and "Data Dictionary" options
+ * Get HTML links for "Print view" options
  * 
  * @param string $url_query     url query
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query)
+function PMA_getHtmlForTablePrintViewLink($url_query)
 {
-    $common_functions = PMA_CommonFunctions::getInstance();
-    $html_output = '<p>'
+    return '<p>'
         . '<a href="db_printview.php?' . $url_query . '">'
-        . $common_functions->getIcon(
+        . PMA_CommonFunctions::getInstance()->getIcon(
             'b_print.png',
             __('Print view'),
             true
         ) . '</a>';
+}
 
-    $html_output .= '<a href="db_datadict.php?' . $url_query . '">'
-        . $common_functions->getIcon(
+/**
+ * Get HTML links "Data Dictionary" options
+ * 
+ * @param string $url_query     url query
+ * 
+ * @return string $html_output
+ */
+function PMA_getHtmlForDataDictionaryLink($url_query)
+{
+    return '<a href="db_datadict.php?' . $url_query . '">'
+        . PMA_CommonFunctions::getInstance()->getIcon(
             'b_tblanalyse.png',
             __('Data Dictionary'),
             true
         ) . '</a>'
         . '</p>';
-    
-    return $html_output;
 }
 
 /**
@@ -756,7 +763,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
         .'<thead>' . "\n"
         .'<tr><th></th>' . "\n"
         .'<th>' 
-        . PMA_SortableTableHeader(__('Table'), 'table') 
+        . PMA_sortableTableHeader(__('Table'), 'table') 
         . '</th>' . "\n";
     if ($replication) {
         $html_output .= '<th>' . "\n"
@@ -767,7 +774,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
         .'        ' . __('Action') . "\n"
         .'</th>'
         // larger values are more interesting so default sort order is DESC
-        .'<th>' . PMA_SortableTableHeader(__('Rows'), 'records', 'DESC')
+        .'<th>' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC')
         . PMA_CommonFunctions::getInstance()->showHint(
             PMA_sanitize(
                 __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')
@@ -775,43 +782,43 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
         ) . "\n"
         .'</th>' . "\n";
     if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
-        $html_output .= '<th>' . PMA_SortableTableHeader(__('Type'), 'type') 
+        $html_output .= '<th>' . PMA_sortableTableHeader(__('Type'), 'type') 
             . '</th>' . "\n";
         $cnt++;
         $html_output .= '<th>' 
-            . PMA_SortableTableHeader(__('Collation'), 'collation') 
+            . PMA_sortableTableHeader(__('Collation'), 'collation') 
             . '</th>' . "\n";
         $cnt++;
     }
     if ($GLOBALS['is_show_stats']) {
         // larger values are more interesting so default sort order is DESC
         $html_output .= '<th>' 
-            . PMA_SortableTableHeader(__('Size'), 'size', 'DESC')
+            . PMA_sortableTableHeader(__('Size'), 'size', 'DESC')
             . '</th>' . "\n"
         // larger values are more interesting so default sort order is DESC
             . '<th>' 
-            . PMA_SortableTableHeader(__('Overhead'), 'overhead', 'DESC') 
+            . PMA_sortableTableHeader(__('Overhead'), 'overhead', 'DESC') 
             . '</th>' . "\n";
         $cnt += 2;
     }
     if ($GLOBALS['cfg']['ShowDbStructureCreation']) {
         // larger values are more interesting so default sort order is DESC
         $html_output .= '<th>' 
-            . PMA_SortableTableHeader(__('Creation'), 'creation', 'DESC')
+            . PMA_sortableTableHeader(__('Creation'), 'creation', 'DESC')
             . '</th>' . "\n";
         $cnt += 2;
     }
     if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) {
         // larger values are more interesting so default sort order is DESC
         $html_output .= '<th>' 
-            . PMA_SortableTableHeader(__('Last update'), 'last_update', 'DESC') 
+            . PMA_sortableTableHeader(__('Last update'), 'last_update', 'DESC') 
             . '</th>' . "\n";
         $cnt += 2;
     }
     if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) {
         // larger values are more interesting so default sort order is DESC
         $html_output .= '<th>' 
-            . PMA_SortableTableHeader(__('Last check'), 'last_check', 'DESC')
+            . PMA_sortableTableHeader(__('Last check'), 'last_check', 'DESC')
             . '</th>' . "\n";
         $cnt += 2;
     }
@@ -833,7 +840,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
  *
  * @return string link to be displayed in the table header
  */
-function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
+function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     // Set some defaults
@@ -914,7 +921,7 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
  * 
  * @return array ($alias, $truename) 
  */
-function PMA_getAliasAndTruename($tooltip_aliasname, $current_table,
+function PMA_getAliasAndTrueName($tooltip_aliasname, $current_table,
     $tooltip_truename
 ) {
     $alias = (! empty($tooltip_aliasname) 
@@ -1004,7 +1011,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename) {
  * 
  * @return array 
  */
-function PMA_getStuffForEnginetable($current_table, $db_is_information_schema,
+function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
     $is_show_stats, $table_is_view, $sum_size, $overhead_size
 ) {
     $common_functions = PMA_CommonFunctions::getInstance();
@@ -1115,7 +1122,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table,
             list($formatted_overhead, $overhead_unit)
                 = $common_functions->formatByteDown(
                     $current_table['Data_free'], 3,
-                    ($current_table['Data_free'] > 0) ? 1 : 0
+                    (($current_table['Data_free'] > 0) ? 1 : 0)
                 );
             $overhead_size += $current_table['Data_free'];
         }
@@ -1156,7 +1163,7 @@ function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size)
         $tblsize =  $current_table['Data_length'] + $current_table['Index_length'];
         $sum_size += $tblsize;
         list($formatted_size, $unit) = $common_functions->formatByteDown(
-            $tblsize, 3, ($tblsize > 0) ? 1 : 0
+            $tblsize, 3, (($tblsize > 0) ? 1 : 0)
         );
     }
     
@@ -1351,7 +1358,7 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema,
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir,
+function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
     $tbl_is_view, $db_is_information_schema, $tbl_storage_engine
 ) {
     $common_functions = PMA_CommonFunctions::getInstance();
@@ -1478,7 +1485,7 @@ function PMA_getHtmlForEditView($url_params)
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForSomeLinks($url_query, $tbl_is_view,
+function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
     $db_is_information_schema, $tbl_storage_engine, $cfgRelation
 ) {
     $common_functions = PMA_CommonFunctions::getInstance();
@@ -1680,7 +1687,7 @@ function PMA_getHtmlForOptimizeLink($url_query)
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForRowStatstableRow($odd_row, $name, $value)
+function PMA_getHtmlForRowStatsTableRow($odd_row, $name, $value)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     
@@ -1723,7 +1730,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         } else {
             $value = $showtable['Row_format'];
         }
-        $html_output .= PMA_getHtmlForRowStatstableRow(
+        $html_output .= PMA_getHtmlForRowStatsTableRow(
             $odd_row, __('Format'), $value
         );
         $odd_row = !$odd_row;
@@ -1734,7 +1741,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         } else {
             $value = $showtable['Create_options'];
         }
-        $html_output .= PMA_getHtmlForRowStatstableRow(
+        $html_output .= PMA_getHtmlForRowStatsTableRow(
             $odd_row, __('Options'), $value
         );
         $odd_row = !$odd_row;
@@ -1742,13 +1749,13 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
     if (!empty($tbl_collation)) {
         $value = '<dfn title="' . PMA_getCollationDescr($tbl_collation) . '">' 
             . $tbl_collation . '</dfn>';
-        $html_output .= PMA_getHtmlForRowStatstableRow(
+        $html_output .= PMA_getHtmlForRowStatsTableRow(
             $odd_row, __('Collation'), $value
         );
         $odd_row = !$odd_row;
     }
     if (!$is_innodb && isset($showtable['Rows'])) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row,
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row,
             __('Rows'), $common_functions->formatNumber($showtable['Rows'], 0)
         );
         $odd_row = !$odd_row;
@@ -1757,7 +1764,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         && isset($showtable['Avg_row_length']) 
         && $showtable['Avg_row_length'] > 0
     ) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Row length'),
             $common_functions->formatNumber($showtable['Avg_row_length'], 0)
         );
@@ -1768,33 +1775,33 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         && $showtable['Rows'] > 0 
         && $mergetable == false
     ) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Row size'), ($avg_size . ' ' . $avg_unit)
         );
         $odd_row = !$odd_row;
     }
     if (isset($showtable['Auto_increment'])) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Next autoindex'),
             $common_functions->formatNumber($showtable['Auto_increment'], 0)
         );
         $odd_row = !$odd_row;
     }
     if (isset($showtable['Create_time'])) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Creation'),
             $common_functions->localisedDate(strtotime($showtable['Create_time']))
         );
     }
     if (isset($showtable['Update_time'])) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Last update'),
             $common_functions->localisedDate(strtotime($showtable['Update_time']))
         );
         $odd_row = !$odd_row;
     }
     if (isset($showtable['Check_time'])) {
-        $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, 
+        $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, 
             __('Last check'),
             $common_functions->localisedDate(strtotime($showtable['Check_time']))
         );
@@ -1828,29 +1835,27 @@ function PMA_getHtmlDivsForStructureActionsDropdown($class, $isActionEnabled,
 ) {
     $common_functions = PMA_CommonFunctions::getInstance();
     
-    $html_output = '<div  class="' . $class . '"';
-    if (!empty ($isActionEnabled)) {
-        if ($isActionEnabled) {
-            $html_output .= '<a href="sql.php?' .  $url_query 
-                . '&amp;sql_query=' 
-                . urlencode(
-                    'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table']) 
-                        . ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '') 
-                        . ' ' . $syntax . '(' 
-                        . $common_functions->backquote($row['Field']) . ');'
-                ) 
-                . '&amp;message_to_show=' . urlencode(
-                    sprintf(
-                        $message,
-                        htmlspecialchars($row['Field'])
-                    )
+    $html_output = '<div  class="' . $class . '">';
+    if ($isActionEnabled) {
+        $html_output .= '<a href="sql.php?' .  $url_query 
+            . '&amp;sql_query=' 
+            . urlencode(
+                'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table']) 
+                    . ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '') 
+                    . ' ' . $syntax . '(' 
+                    . $common_functions->backquote($row['Field']) . ');'
+            ) 
+            . '&amp;message_to_show=' . urlencode(
+                sprintf(
+                    $message,
+                    htmlspecialchars($row['Field'])
                 )
-                . '">'
-                . $hidden_titles
-                . '</a>';      
-        } else {
-             $html_output .= $hidden_titles_no;
-         }
+            )
+            . '">'
+            . $hidden_titles
+            . '</a>';      
+    } else {
+         $html_output .= $hidden_titles_no;
     }
     $html_output .= '</div>';
     
@@ -1910,17 +1915,17 @@ function PMA_getHtmlForMoreOptionInTableStructure($rownum, $primary_enabled,
     if (!PMA_DRIZZLE) {
         $html_output .= PMA_getHtmlDivsForStructureActionsDropdown(
             'action_spatial replace_in_more',
-            $fulltext_enabled, $url_query, $row,
+            $spatial_enabled, $url_query, $row,
             $hidden_titles['Spatial'],
-            $hidden_titles['NoSpatial'], false, 'ADD FULLTEXT',
+            $hidden_titles['NoSpatial'], false, 'ADD SPATIAL',
             __('An index has been added on %s'), false
         );
 
         $html_output .= PMA_getHtmlDivsForStructureActionsDropdown(
             'action_fulltext replace_in_more',
-            $spatial_enabled, $url_query, $row,
+            $fulltext_enabled, $url_query, $row,
             $hidden_titles['IdxFulltext'],
-            $hidden_titles['NoIdxFulltext'], false, 'ADD SPATIAL',
+            $hidden_titles['NoIdxFulltext'], false, 'ADD FULLTEXT',
             __('An index has been added on %s'), false
         );
         
@@ -2027,7 +2032,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
     )
     && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))
     ) {
-        $html_output = "\n";
+        $html_output .= "\n";
         $html_output .= '<a href="sql.php?' . $url_query . '&amp;sql_query=' 
             . urlencode(
                 'ALTER TABLE ' . $common_functions->backquote($GLOBALS['table']) 
@@ -2059,7 +2064,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
  * 
  * @return string $html_output
  */
-function PMA_getHtmlForDistincValueAction($url_query, $row, $titles)
+function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles)
 {
     $common_functions = PMA_CommonFunctions::getInstance();
     $html_output = '<td class="browse replaced_by_more center">';
@@ -2094,7 +2099,7 @@ function PMA_getHtmlForDistincValueAction($url_query, $row, $titles)
  * 
  * @return string $html_output;
  */
-function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
+function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
     $primary, $field_name, $url_query, $titles, $row, $rownum, $hidden_titles,
     $columns_with_unique_index
 ) {
@@ -2150,7 +2155,7 @@ function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
                 $url_query, $row, $titles);
         $html_output .= $fulltext;
     }
-    $html_output .= PMA_getHtmlForDistincValueAction($url_query, $row, $titles);
+    $html_output .= PMA_getHtmlForDistinctValueAction($url_query, $row, $titles);
 
     if ($GLOBALS['cfg']['PropertiesIconic'] !== true 
         && $GLOBALS['cfg']['HideStructureActions'] === true
diff --git a/po/ckb.po b/po/ckb.po
index 2255625cdb..17d897c6a3 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-08-10 12:59+0200\n"
-"PO-Revision-Date: 2012-08-04 12:39+0200\n"
-"Last-Translator: renwar kurd <renwarkurd@yahoo.com>\n"
-"Language-Team: Kurdish Sorani <http://l10n.cihar.com/projects/phpmyadmin/"
-"master/ckb/>\n"
+"PO-Revision-Date: 2012-08-18 12:25+0200\n"
+"Last-Translator: Ahmed Ameen <ah.shwani@gmail.com>\n"
+"Language-Team: Kurdish Sorani "
+"<http://l10n.cihar.com/projects/phpmyadmin/master/ckb/>\n"
 "Language: ckb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -428,6 +428,8 @@ msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
 "%s."
 msgstr ""
+"لەم تێڕوانیینە بەلایەنی کەم ئەم ژمارە دێڕە بوونی هەیە.تکایە سەردانی %"
+"sبەڵگەسازی%s بکە ."
 
 #: db_structure.php:548 db_structure.php:582 libraries/Menu.class.php:191
 #: libraries/tbl_info.inc.php:59 tbl_structure.php:212
@@ -470,7 +472,7 @@ msgstr "پشکنینی هەموو"
 
 #: db_structure.php:693
 msgid "Check tables having overhead"
-msgstr ""
+msgstr "پشکنین بۆ ئەو خشتانە بکەن کە ژوورسەریان هەیە."
 
 #: db_structure.php:701 libraries/CommonFunctions.class.php:3608
 #: libraries/CommonFunctions.class.php:3609
@@ -510,7 +512,7 @@ msgstr "پشکنینی خشتە"
 #: db_structure.php:714 libraries/operations.lib.php:1164
 #: tbl_structure.php:880
 msgid "Optimize table"
-msgstr ""
+msgstr "چاکسازی خشتە"
 
 #: db_structure.php:716 libraries/operations.lib.php:1149
 msgid "Repair table"
@@ -612,8 +614,9 @@ msgid "Tracking report"
 msgstr "ڕاپۆرتە شوێنکەتووەکان"
 
 #: db_tracking.php:139 tbl_tracking.php:282 tbl_tracking.php:755
+#, fuzzy
 msgid "Structure snapshot"
-msgstr ""
+msgstr "وێنەی هەنووکەیی پێکهاتە"
 
 #: db_tracking.php:185
 msgid "Untracked tables"
@@ -621,44 +624,47 @@ msgstr "خشتە شوێن نەکەوتوەکان"
 
 #: db_tracking.php:204 tbl_structure.php:681
 msgid "Track table"
-msgstr ""
+msgstr "شوێنکەوتنی خشتە"
 
 #: db_tracking.php:230
 msgid "Database Log"
-msgstr ""
+msgstr "پێشینەی کارکردی بنکەی زانیاری"
 
 #: export.php:44
 msgid "Bad type!"
-msgstr ""
+msgstr "جۆری هەڵە !"
 
 #: export.php:95
 msgid "Selected export type has to be saved in file!"
 msgstr "دەستنیشانکردنی جۆری هەناردن بۆ پاشەکەوتکردنی لە پەڕگە!"
 
 #: export.php:124
+#, fuzzy
 msgid "Bad parameters!"
-msgstr ""
+msgstr "ڕاگه‌یێنە هەڵەکان!"
 
 #: export.php:195 export.php:226 export.php:782
-#, fuzzy, php-format
+#, php-format
 msgid "Insufficient space to save the file %s."
-msgstr "پاشکەوتکردنی فایل وەک"
+msgstr "شوێنی پێویست بۆ پاشەکەوت کردنی فایل %s ."
 
 #: export.php:363
 #, php-format
 msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
+"فایلی %s لە ئێستادا بوونی هەیە , ناوی فایلەکە بگۆڕن وە یان ڕێکخستنەکانی "
+"لەسەرنوسین بپشکنە ."
 
 #: export.php:370 export.php:376
 #, php-format
 msgid "The web server does not have permission to save the file %s."
-msgstr ""
+msgstr "وێبڕاژه‌كار مۆڵەتی پاشه‌كه‌وت کردنی فایلی %s نییە ."
 
 #: export.php:788
 #, php-format
 msgid "Dump has been saved to file %s."
-msgstr ""
+msgstr "زانیاری وەدەست هاتوو لە فایلی %s پاشەکەوت کرا."
 
 #: file_echo.php:21
 msgid "Invalid export type"
@@ -667,11 +673,12 @@ msgstr "هەناردنی ئەم جۆرە ڕێگەپێدراو نییە"
 #: gis_data_editor.php:75
 #, php-format
 msgid "Value for the column \"%s\""
-msgstr ""
+msgstr "نرخی ستوون \"%s\""
 
 #: gis_data_editor.php:104 tbl_gis_visualization.php:171
+#, fuzzy
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "بەکارهێنانی OpenStreetMaps وەک چینی بنچینەیی."
 
 #: gis_data_editor.php:124
 msgid "SRID"
@@ -680,7 +687,7 @@ msgstr "SRID"
 #: gis_data_editor.php:141 js/messages.php:326
 #: libraries/DisplayResults.class.php:1649
 msgid "Geometry"
-msgstr ""
+msgstr "ئەندازەزانی"
 
 #: gis_data_editor.php:161 js/messages.php:322
 msgid "Point"
@@ -689,18 +696,18 @@ msgstr "خاڵ"
 #: gis_data_editor.php:162 gis_data_editor.php:186 gis_data_editor.php:234
 #: gis_data_editor.php:286 js/messages.php:320
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: gis_data_editor.php:164 gis_data_editor.php:188 gis_data_editor.php:236
 #: gis_data_editor.php:288 js/messages.php:321
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: gis_data_editor.php:184 gis_data_editor.php:232 gis_data_editor.php:284
 #: js/messages.php:323
 #, php-format
 msgid "Point %d"
-msgstr ""
+msgstr "خاڵ %d"
 
 #: gis_data_editor.php:193 gis_data_editor.php:239 gis_data_editor.php:291
 #: js/messages.php:329
@@ -709,31 +716,31 @@ msgstr "زیادکردنی خاڵ"
 
 #: gis_data_editor.php:209 js/messages.php:324
 msgid "Linestring"
-msgstr ""
+msgstr "ڕیزبه‌ندی هێڵی"
 
 #: gis_data_editor.php:212 gis_data_editor.php:268 js/messages.php:328
 msgid "Outer Ring"
-msgstr ""
+msgstr "ئەڵفەی دەرەکی"
 
 #: gis_data_editor.php:214 gis_data_editor.php:270 js/messages.php:327
 msgid "Inner Ring"
-msgstr ""
+msgstr "ئەڵقەی ناوەکی"
 
 #: gis_data_editor.php:241
 msgid "Add a linestring"
-msgstr ""
+msgstr "زیاد کردنی ڕیزبەندە هێڵ"
 
 #: gis_data_editor.php:241 gis_data_editor.php:293 js/messages.php:330
 msgid "Add an inner ring"
-msgstr ""
+msgstr "زیاد کردنی ئەڵقەیەکی ناوەکی"
 
 #: gis_data_editor.php:255 js/messages.php:325
 msgid "Polygon"
-msgstr ""
+msgstr "فرە گۆشە"
 
 #: gis_data_editor.php:295 js/messages.php:331
 msgid "Add a polygon"
-msgstr ""
+msgstr "زیاد کردنی فرە گۆشەیەک"
 
 #: gis_data_editor.php:299
 msgid "Add geometry"
@@ -741,13 +748,15 @@ msgstr "زیادکردنی ئەندازەگەری"
 
 #: gis_data_editor.php:306
 msgid "Output"
-msgstr "بەرهەم"
+msgstr "دەرچە"
 
 #: gis_data_editor.php:307
 msgid ""
 "Chose \"GeomFromText\" from the \"Function\" column and paste the below "
 "string into the \"Value\" field"
 msgstr ""
+"هەڵبژاردەی \"GeomFromText\" لە ستوونی \"Function\" هەڵبژێرن وە ڕیزبەنی خوارەوە "
+"لە خانەی \"نرخ(value)\" داخڵ بکەن."
 
 #: import.php:94
 #, php-format
@@ -755,14 +764,16 @@ msgid ""
 "You probably tried to upload too large file. Please refer to %sdocumentation"
 "%s for ways to workaround this limit."
 msgstr ""
+"لەوانەیە ئێوە هەوڵتان دابێت فایلێک بە قەبارەیەکی زۆر بار بکەن.تکایە بۆ ڕیگە "
+"چارەیەک بۆ ئەم سنوردار کردنە سەردانی %sبەڵگەسازی%s بکەن."
 
 #: import.php:232 import.php:485
 msgid "Showing bookmark"
-msgstr ""
+msgstr "پیشاندانی شوێندۆز"
 
 #: import.php:247 import.php:481
 msgid "The bookmark has been deleted."
-msgstr ""
+msgstr "شوێندۆز سڕایەوە"
 
 #: import.php:342 import.php:395 libraries/File.class.php:426
 #: libraries/File.class.php:517
@@ -776,38 +787,46 @@ msgid ""
 "You attempted to load file with unsupported compression (%s). Either support "
 "for it is not implemented or disabled by your configuration."
 msgstr ""
+"ئێوە فایلێک بە پەستێنەر سازێکی پاڵپشتی نەکراو بار ئەکەن (%s).لەوانەیە لە "
+"ڕێکخستنەکان ناچالاک بێت وە یان پاڵپشتی بەردەست نییە بۆ ئەم فایلە."
 
 #: import.php:400
 msgid ""
 "No data was received to import. Either no file name was submitted, or the "
 "file size exceeded the maximum size permitted by your PHP configuration. See "
 "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr "هێنان"
+msgstr ""
+"هیچ داتایەک وەرنەگیرا بۆ هاوردە کردن. یان فایلێک دیاری نەکراوە ، یان فایلەکە "
+"لە ڕێژە دیاری کراوەکە زیاترە. سەردانی  "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a] بکەن."
 
 #: import.php:418
 msgid ""
 "Cannot convert file's character set without character set conversion library"
-msgstr ""
+msgstr "ناکرێت فایلەکانی نوسە بگۆڕدرێن بە بێ نوسەى کتێبخانەی تایبەت بەم کارە"
 
 #: import.php:454 libraries/display_import.lib.php:29
 msgid "Could not load import plugins, please check your installation!"
-msgstr ""
+msgstr "هەڵە لە بارکردنی پێوەکراەکان, تکایە فۆناغەکانی دامەزراندن بپشکنن!"
 
 #: import.php:488 sql.php:1109
 #, php-format
 msgid "Bookmark %s created"
-msgstr ""
+msgstr "شوێندۆز  %s دروستکرا"
 
 #: import.php:496 import.php:502
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
-msgstr ""
+msgstr "داخڵ کردنی زانیاریەکان بە سەرکەوتوویی بە کۆتا هات، %d پرسگە دامەزرا ."
 
 #: import.php:511
 msgid ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 msgstr ""
+"کاتی جێ بە جێ کردنی کردار بە کۆتا هاتووە، ئەگەر دەتانەوێت کردارەکە بە کۆتا "
+"بینن، فایلی مەبەست دووبارە تۆمار بکەن تاکوو درێژە بە داخڵ کردنی زانیاریەکان "
+"بدەن."
 
 #: import.php:513
 msgid ""
diff --git a/po/de.po b/po/de.po
index bc452df56f..ae082042d3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-08-10 12:59+0200\n"
-"PO-Revision-Date: 2012-08-16 15:36+0200\n"
-"Last-Translator: Jan Erik Zassenhaus <Jan.Zassenhaus@jgerman.de>\n"
+"PO-Revision-Date: 2012-08-16 22:05+0200\n"
+"Last-Translator: Jan Mienert <jan.mienert@heinze.de>\n"
 "Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1923,7 +1923,7 @@ msgstr ", aktuelle stabile Version:"
 
 #: js/messages.php:374
 msgid "up to date"
-msgstr "auf dem neusten Stand"
+msgstr "auf dem neuesten Stand"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:393
diff --git a/po/th.po b/po/th.po
index 684eb90cb4..8c0423808f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-08-10 12:59+0200\n"
-"PO-Revision-Date: 2012-08-08 08:31+0200\n"
+"PO-Revision-Date: 2012-08-19 09:13+0200\n"
 "Last-Translator: Anusuk Sangubon <jaideejung007@gmail.com>\n"
 "Language-Team: Thai <http://l10n.cihar.com/projects/phpmyadmin/master/th/>\n"
 "Language: th\n"
@@ -287,16 +287,16 @@ msgid "The database name is empty!"
 msgstr "ไม่มีชื่อฐานข้อมูล"
 
 #: db_operations.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been renamed to %s"
 msgid "Database %1$s has been renamed to %2$s"
-msgstr "ฐานข้อมูล %s ได้ถูกเปลี่ยนชื่อเป็น %s"
+msgstr "ฐานข้อมูล %1$s ได้ถูกเปลี่ยนชื่อเป็น %2$s"
 
 #: db_operations.php:132
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been copied to %s"
 msgid "Database %1$s has been copied to %2$s"
-msgstr "คัดลอกฐานข้อมูล %s ไปเก็บในชื่อ %s เรียบร้อยแล้ว"
+msgstr "คัดลอกฐานข้อมูล %1$s ไปเก็บในชื่อ %2$s เรียบร้อยแล้ว"
 
 #: db_operations.php:255
 #, php-format
@@ -420,7 +420,9 @@ msgstr "หยุดการติดตามแล้ว"
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
 "%s."
-msgstr "การแสดงผลนี้แสดงเพียงจำนวนข้อมูลเท่านี้, ดูข้อมูลเพิ่มเติมได้ที่ %sdocumentation%s"
+msgstr ""
+"การแสดงผลนี้ จะแสดงเพียงจำนวนข้อมูลนี้เท่านั้น ดูข้อมูลเพิ่มเติมได้ที่ %"
+"sdocumentation%s"
 
 #: db_structure.php:548 db_structure.php:582 libraries/Menu.class.php:191
 #: libraries/tbl_info.inc.php:59 tbl_structure.php:212
@@ -626,7 +628,7 @@ msgstr "ประเภทไม่ถูกต้อง!"
 
 #: export.php:95
 msgid "Selected export type has to be saved in file!"
-msgstr "ชนิดการส่งออกที่ถูกเลือกต้องถูกบันทึกลงไฟล์"
+msgstr "ประเภทการส่งออกที่เลือกจะต้องมีการบันทึกไว้ในไฟล์"
 
 #: export.php:124
 msgid "Bad parameters!"
@@ -646,7 +648,7 @@ msgstr "ให้เปลี่ยนชื่อไฟล์ หรือเ
 #: export.php:370 export.php:376
 #, php-format
 msgid "The web server does not have permission to save the file %s."
-msgstr "บันทึกไฟล์ %s ไม่ได้ เพราะเว็บเซิร์ฟเวอร์ไม่อนุญาติ"
+msgstr "บันทึกไฟล์ %s ไม่ได้ เพราะเว็บเซิร์ฟเวอร์ไม่อนุญาต"
 
 #: export.php:788
 #, php-format
diff --git a/server_privileges.php b/server_privileges.php
index 26114a00f2..b0df0cc435 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -130,12 +130,13 @@ 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;
     }
 }
 
@@ -143,11 +144,13 @@ if (isset($dbname)) {
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    echo '<h2>' . "\n"
+    $response->addHTML(
+        '<h2>' . "\n"
        . $common_functions->getIcon('b_usrlist.png')
        . __('Privileges') . "\n"
-       . '</h2>' . "\n";
-    PMA_Message::error(__('No Privileges'))->display();
+       . '</h2>' . "\n"
+    );
+    $response->addHTML(PMA_Message::error(__('No Privileges'))->getDisplay());
     exit;
 }
 
@@ -215,7 +218,9 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         $_add_user_error = true;
     } else {
         list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
-            = PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
+            = PMA_getSqlQueriesForDisplayAndAddUser(
+                $username, $hostname, (isset ($password) ? $password : '')
+            );
 
         if (empty($_REQUEST['change_copy'])) {
             $_error = false;
@@ -323,7 +328,9 @@ if (isset($_REQUEST['delete'])
             $GLOBALS['reload'] = true;
 
             if ($GLOBALS['is_ajax_request'] != true) {
-                echo $common_functions->getReloadNavigationScript();
+                $response->addHTML(
+                    $common_functions->getReloadNavigationScript()
+                );
             }
         }
     }
@@ -380,16 +387,10 @@ if ($GLOBALS['is_ajax_request']
     && ! isset($_REQUEST['edit_user_dialog'])
     && ! isset($_REQUEST['db_specific'])
 ) {
-    $isPass = false;
-    if (isset($password)) {
-        $isPass = true;
-    }
-
     $extra_data = PMA_getExtraDataForAjaxBehavior(
-        $isPass, $link_export,
+        (isset ($password) ? $password : ''), $link_export,
         (isset($sql_query) ? $sql_query : ''),
-        $link_edit, $dbname_is_wildcard,
-        $hostname, $username
+        $link_edit, $hostname, $username
     );
 
     if ($message instanceof PMA_Message) {
@@ -411,11 +412,14 @@ if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
 
     // Gets the database structure
     $sub_part = '_structure';
+    ob_start();
     include 'libraries/db_info.inc.php';
-    echo "\n";
+    $content = ob_get_contents();
+    ob_end_clean();
+    $response->addHTML($content . "\n");
 } else {
     if (! empty($GLOBALS['message'])) {
-        echo $common_functions->getMessage($GLOBALS['message']);
+        $response->addHTML($common_functions->getMessage($GLOBALS['message']));
         unset($GLOBALS['message']);
     }
 }
@@ -469,7 +473,8 @@ if (empty($_REQUEST['adduser'])
         );
         $response->addHTML(
             PMA_getHtmlForDisplayUserProperties(
-                $dbname_is_wildcard, $url_dbname, $random_n,
+                ((isset ($dbname_is_wildcard)) ? $dbname_is_wildcard : ''),
+                $url_dbname, $random_n,
                 $username, $hostname, $link_edit, $link_revoke,
                 (isset($dbename) ? $dbname : ''),
                 (isset($tablename) ? $tablename : '')
@@ -479,7 +484,7 @@ if (empty($_REQUEST['adduser'])
 } elseif (isset($_REQUEST['adduser'])) {
     // Add user
     $response->addHTML(
-        PMA_getHtmlForAddUser($random_n, $dbname)
+        PMA_getHtmlForAddUser($random_n, (isset($dbname) ? $dbname : ''))
     );
 } else {
     // check the privileges for a particular database.
diff --git a/tbl_structure.php b/tbl_structure.php
index 95ab1b39e9..4de2e5528f 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -321,7 +321,7 @@ foreach ($fields as $row) {
     
     if (! $tbl_is_view && ! $db_is_information_schema) {
         $response->addHTML(
-            PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine,
+            PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
                 $primary, $field_name, $url_query, $titles, $row, $rownum,
                 $hidden_titles, $columns_with_unique_index
             )
@@ -339,7 +339,7 @@ $response->addHTML(
 );
 
 $response->addHTML(
-    PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir,
+    PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
         $tbl_is_view, $db_is_information_schema, $tbl_storage_engine
     )
 );
@@ -360,7 +360,7 @@ if ($tbl_is_view) {
     $response->addHTML(PMA_getHtmlForEditView($url_params));
 }
 $response->addHTML(
-    PMA_getHtmlForSomeLinks($url_query, $tbl_is_view,
+    PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
         $db_is_information_schema, $tbl_storage_engine, $cfgRelation
     )
 );