From 20abe0c1b117c369ac0cc1b5ed92975c8867774f Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:10:16 +0100
Subject: [PATCH 01/36] Added Javascript fieldset reset button styling in
 pmahomme theme.

---
 themes/pmahomme/css/theme_right.css.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 993a9b14b7..848c702b22 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -197,7 +197,8 @@ input[type=submit] {
 }
 
 input[type=submit],
-input[type=reset] {
+input[type=reset],
+input[name=submit_reset] {
     margin-left: 14px;
     border: 1px solid #aaa;
     padding: 3px 7px;
@@ -215,14 +216,16 @@ input[type=reset] {
 }
 
 input[type=submit]:hover,
-input[type=reset]:hover {
+input[type=reset]:hover,
+input[name=submit_reset]:hover {
     position: relative;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?>
     cursor: pointer;
 }
 
 input[type=submit]:active,
-input[type=reset]:active {
+input[type=reset]:active,
+input[name=submit_reset]:active {
     position: relative;
     top: 1px;
     left: 1px;

From a3511ff31d5a617608c414ccb3835f271c4dbb9d Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:28:05 +0100
Subject: [PATCH 02/36] Added Generate Password button styling in pmahomme
 theme.

---
 js/functions.js                         | 4 ++--
 libraries/replication_gui.lib.php       | 2 +-
 themes/pmahomme/css/theme_right.css.php | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 2e1de549ed..628255fecc 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -157,8 +157,8 @@ function PMA_current_version()
 
 function displayPasswordGenerateButton()
 {
-    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
-    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
+    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
+    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
 }
 
 /*
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c1098fce3f..35970cd8e8 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -366,7 +366,7 @@ function PMA_replication_gui_master_addslaveuser()
         . '    ' . __('Generate Password') . ':'
         . '</label>'
         . '<span class="options">'
-        . '    <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
+        . '    <input type="button" class="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
         . '</span>'
         . '<input type="text" name="generated_pw" id="generated_pw" />'
         . '</div>'
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 848c702b22..53a7b2060d 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -198,7 +198,8 @@ input[type=submit] {
 
 input[type=submit],
 input[type=reset],
-input[name=submit_reset] {
+input[name=submit_reset],
+input.button {
     margin-left: 14px;
     border: 1px solid #aaa;
     padding: 3px 7px;
@@ -217,7 +218,8 @@ input[name=submit_reset] {
 
 input[type=submit]:hover,
 input[type=reset]:hover,
-input[name=submit_reset]:hover {
+input[name=submit_reset]:hover,
+input.button:hover {
     position: relative;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?>
     cursor: pointer;
@@ -225,7 +227,8 @@ input[name=submit_reset]:hover {
 
 input[type=submit]:active,
 input[type=reset]:active,
-input[name=submit_reset]:active {
+input[name=submit_reset]:active,
+input.button:active {
     position: relative;
     top: 1px;
     left: 1px;

From 7d5a945a0143176deae72648ed0b33a2bcb575b3 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:52:48 +0100
Subject: [PATCH 03/36] Don't rely on $GLOBALS for 'Add User' form

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

diff --git a/server_privileges.php b/server_privileges.php
index 60c2c485d9..f3bcc41824 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -46,6 +46,44 @@ foreach ($get_params as $one_get_param) {
     }
 }
 
+/**
+ * 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',
+    'username'
+);
+foreach ($post_params as $one_post_param) {
+    if (isset($_POST[$one_post_param])) {
+        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
+    }
+}
+
+/**
+ * Sets globals from $_POST patterns, for privileges and max_* vars
+ */
+
+$post_patterns = array(
+    '/_priv$/i',
+    '/^max_/i'
+);
+foreach (array_keys($_POST) as $post_key) {
+    foreach ($post_patterns as $one_post_pattern) {
+        if (preg_match($one_post_pattern, $post_key)) {
+            $GLOBALS[$post_key] = $_POST[$post_key];
+        }
+    }
+}
 
 /**
  * Messages are built using the message name
@@ -2282,15 +2320,15 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     echo '<fieldset id="fieldset_add_user_database">' . "\n"
         . '<legend>' . __('Database for user') . '</legend>' . "\n";
 
-    PMA_display_html_checkbox('createdb-1', __('Create database with same name and grant all privileges'), false, false);
-    echo '<br />' . "\n";
-    PMA_display_html_checkbox('createdb-2', __('Grant all privileges on wildcard name (username\\_%)'), false, false);
-    echo '<br />' . "\n";
+    PMA_display_html_checkbox('createdb-1', __('Create database with same name and grant all privileges'), false, false);
+    echo '<br />' . "\n";
+    PMA_display_html_checkbox('createdb-2', __('Grant all privileges on wildcard name (username\\_%)'), false, false);
+    echo '<br />' . "\n";
 
     if (! empty($dbname) ) {
-        PMA_display_html_checkbox('createdb-3', sprintf(__('Grant all privileges on database &quot;%s&quot;'), htmlspecialchars($dbname)), true, false);
+        PMA_display_html_checkbox('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 '<br />' . "\n";
     }
 
     echo '</fieldset>' . "\n";

From 91e0d2f5842fc35d6d08577899157aea7ba84ce0 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 16:49:01 +0100
Subject: [PATCH 04/36] Added user export for checkbox-selected users

---
 js/server_privileges.js | 47 +++++++++++++++++++++++++++++++++++++++++
 server_privileges.php   | 35 ++++++++++++++++++++++++------
 2 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js
index 7214d74dbe..4e356ba304 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -473,6 +473,53 @@ $(document).ready(function() {
      * @memberOf    jQuery
      * @name        export_user_click
      */
+    $("button.mult_submit[value=export]").live('click', function(event) {
+        event.preventDefault();
+        var $msgbox = PMA_ajaxShowMessage();
+        var button_options = {};
+        button_options[PMA_messages['strClose']] = function() {
+            $(this).dialog("close");
+        };
+        $.post($(this.form).prop('action'), 
+            $(this.form).serialize() + '&submit_mult=export&ajax_request=true', 
+            function(data) {
+                var $ajaxDialog = $('<div />')
+                .append(data.message)
+                .dialog({
+                    title: data.title,
+                    width: 500,
+                    buttons: button_options,
+                    close: function () {
+                        $(this).remove();
+                    }
+                });
+                PMA_ajaxRemoveMessage($msgbox);
+                // Attach syntax highlited editor to export dialog
+                CodeMirror.fromTextArea(
+                    $ajaxDialog.find('textarea')[0],
+                    {
+                        lineNumbers: true,
+                        matchBrackets: true,
+                        indentUnit: 4,
+                        mode: "text/x-mysql"
+                    }
+                );
+        }); //end $.post
+    });
+    // if exporting non-ajax, highlight anyways
+    if ($("textarea.export"))
+    {
+        CodeMirror.fromTextArea(
+            $('textarea.export')[0],
+            {
+                lineNumbers: true,
+                matchBrackets: true,
+                indentUnit: 4,
+                mode: "text/x-mysql"
+            }
+        );
+    }
+
     $(".export_user_anchor.ajax").live('click', function(event) {
         event.preventDefault();
         var $msgbox = PMA_ajaxShowMessage();
diff --git a/server_privileges.php b/server_privileges.php
index f3bcc41824..14cffd4bfc 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1528,14 +1528,15 @@ $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" hre
     . '&amp;hostname=%s'
     . '&amp;initial=%s'
     . '&amp;export=1">'
-    . PMA_getIcon('b_tblexport.png', __('Export all'))
+    . PMA_getIcon('b_tblexport.png', __('Export all')) . ' '
+    . __('Export all')
     . '</a>';
 
 /**
  * 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['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
+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']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
 
     if (isset($sql_query)) {
         $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
@@ -1623,8 +1624,8 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
  */
 
 // export user definition
-if (isset($_REQUEST['export'])) {
-    $response = '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
+if (isset($_REQUEST['export']) || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')) {
+    $response = '<textarea class="export" cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
     if ($username == '%') {
         // export privileges for all users
         $title = __('Privileges for all users');
@@ -1632,11 +1633,26 @@ if (isset($_REQUEST['export'])) {
             $response .= PMA_getGrants($pair['user'], $pair['host']);
             $response .= "\n";
         }
-    } else {
+    } 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);
+            $response .= '# ' . __('User') . ' `' . 
+                htmlspecialchars($export_username) . '`@`' . 
+                htmlspecialchars($export_hostname) . "`\n\n";
+            $response .= PMA_getGrants($export_username, $export_hostname) . "\n";
+        }
+    }
+    else {
         // export privileges for a single user
         $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
         $response .= PMA_getGrants($username, $hostname);
     }
+    // remove trailing whitespace
+    $response = trim($response);
+    
     $response .= '</textarea>';
     unset($username, $hostname, $grants, $one_grant);
     if ($GLOBALS['is_ajax_request']) {
@@ -1863,7 +1879,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                    .'<a href="server_privileges.php?' . $GLOBALS['url_query'] .  '"'
                    .' onclick="if (unMarkAllRows(\'usersForm\')) return false;">'
                    . __('Uncheck All') . '</a>' . "\n"
-                   . '</div>'
+                   .'<i>' . __('With selected:') . '</i>' . "\n";
+
+                PMA_buttonOrImage(
+                    'submit_mult', 'mult_submit', 'submit_mult_export',
+                    __('Export'), 'b_tblexport.png', 'export'
+                );
+                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 : ''));

From d77a882a4936c9cb552bbed0417b5f0422c908b2 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:10:16 +0100
Subject: [PATCH 05/36] Added Javascript fieldset reset button styling in
 pmahomme theme.

---
 themes/pmahomme/css/theme_right.css.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 993a9b14b7..848c702b22 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -197,7 +197,8 @@ input[type=submit] {
 }
 
 input[type=submit],
-input[type=reset] {
+input[type=reset],
+input[name=submit_reset] {
     margin-left: 14px;
     border: 1px solid #aaa;
     padding: 3px 7px;
@@ -215,14 +216,16 @@ input[type=reset] {
 }
 
 input[type=submit]:hover,
-input[type=reset]:hover {
+input[type=reset]:hover,
+input[name=submit_reset]:hover {
     position: relative;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?>
     cursor: pointer;
 }
 
 input[type=submit]:active,
-input[type=reset]:active {
+input[type=reset]:active,
+input[name=submit_reset]:active {
     position: relative;
     top: 1px;
     left: 1px;

From e8f21029e795791b2c3cfef5fcf60ba3d6260aca Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:28:05 +0100
Subject: [PATCH 06/36] Added Generate Password button styling in pmahomme
 theme.

---
 js/functions.js                         | 4 ++--
 libraries/replication_gui.lib.php       | 2 +-
 themes/pmahomme/css/theme_right.css.php | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 2e1de549ed..628255fecc 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -157,8 +157,8 @@ function PMA_current_version()
 
 function displayPasswordGenerateButton()
 {
-    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
-    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
+    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
+    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
 }
 
 /*
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c1098fce3f..35970cd8e8 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -366,7 +366,7 @@ function PMA_replication_gui_master_addslaveuser()
         . '    ' . __('Generate Password') . ':'
         . '</label>'
         . '<span class="options">'
-        . '    <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
+        . '    <input type="button" class="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
         . '</span>'
         . '<input type="text" name="generated_pw" id="generated_pw" />'
         . '</div>'
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 848c702b22..53a7b2060d 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -198,7 +198,8 @@ input[type=submit] {
 
 input[type=submit],
 input[type=reset],
-input[name=submit_reset] {
+input[name=submit_reset],
+input.button {
     margin-left: 14px;
     border: 1px solid #aaa;
     padding: 3px 7px;
@@ -217,7 +218,8 @@ input[name=submit_reset] {
 
 input[type=submit]:hover,
 input[type=reset]:hover,
-input[name=submit_reset]:hover {
+input[name=submit_reset]:hover,
+input.button:hover {
     position: relative;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?>
     cursor: pointer;
@@ -225,7 +227,8 @@ input[name=submit_reset]:hover {
 
 input[type=submit]:active,
 input[type=reset]:active,
-input[name=submit_reset]:active {
+input[name=submit_reset]:active,
+input.button:active {
     position: relative;
     top: 1px;
     left: 1px;

From 375f9257cbd38d0f18f5f6eef7c08b4d6649f9f3 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 15:52:48 +0100
Subject: [PATCH 07/36] Don't rely on $GLOBALS for 'Add User' form

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

diff --git a/server_privileges.php b/server_privileges.php
index 60c2c485d9..f3bcc41824 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -46,6 +46,44 @@ foreach ($get_params as $one_get_param) {
     }
 }
 
+/**
+ * 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',
+    'username'
+);
+foreach ($post_params as $one_post_param) {
+    if (isset($_POST[$one_post_param])) {
+        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
+    }
+}
+
+/**
+ * Sets globals from $_POST patterns, for privileges and max_* vars
+ */
+
+$post_patterns = array(
+    '/_priv$/i',
+    '/^max_/i'
+);
+foreach (array_keys($_POST) as $post_key) {
+    foreach ($post_patterns as $one_post_pattern) {
+        if (preg_match($one_post_pattern, $post_key)) {
+            $GLOBALS[$post_key] = $_POST[$post_key];
+        }
+    }
+}
 
 /**
  * Messages are built using the message name
@@ -2282,15 +2320,15 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     echo '<fieldset id="fieldset_add_user_database">' . "\n"
         . '<legend>' . __('Database for user') . '</legend>' . "\n";
 
-    PMA_display_html_checkbox('createdb-1', __('Create database with same name and grant all privileges'), false, false);
-    echo '<br />' . "\n";
-    PMA_display_html_checkbox('createdb-2', __('Grant all privileges on wildcard name (username\\_%)'), false, false);
-    echo '<br />' . "\n";
+    PMA_display_html_checkbox('createdb-1', __('Create database with same name and grant all privileges'), false, false);
+    echo '<br />' . "\n";
+    PMA_display_html_checkbox('createdb-2', __('Grant all privileges on wildcard name (username\\_%)'), false, false);
+    echo '<br />' . "\n";
 
     if (! empty($dbname) ) {
-        PMA_display_html_checkbox('createdb-3', sprintf(__('Grant all privileges on database &quot;%s&quot;'), htmlspecialchars($dbname)), true, false);
+        PMA_display_html_checkbox('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 '<br />' . "\n";
     }
 
     echo '</fieldset>' . "\n";

From 013fe8d24040b1e468fbff04f168c7523369bd84 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 16:49:01 +0100
Subject: [PATCH 08/36] Added user export for checkbox-selected users

---
 js/server_privileges.js | 51 +++++++++++++++++++++++++++++++++++++++++
 server_privileges.php   | 35 +++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js
index 7214d74dbe..2c9e83a375 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -473,6 +473,57 @@ $(document).ready(function() {
      * @memberOf    jQuery
      * @name        export_user_click
      */
+    $("button.mult_submit[value=export]").live('click', function(event) {
+        event.preventDefault();
+        // can't export if no users checked
+        if ($(this.form).find("input:checked").length == 0) {
+            return;
+        }
+        var $msgbox = PMA_ajaxShowMessage();
+        var button_options = {};
+        button_options[PMA_messages['strClose']] = function() {
+            $(this).dialog("close");
+        };
+        $.post($(this.form).prop('action'), 
+            $(this.form).serialize() + '&submit_mult=export&ajax_request=true', 
+            function(data) {
+                var $ajaxDialog = $('<div />')
+                .append(data.message)
+                .dialog({
+                    title: data.title,
+                    width: 500,
+                    buttons: button_options,
+                    close: function () {
+                        $(this).remove();
+                    }
+                });
+                PMA_ajaxRemoveMessage($msgbox);
+                // Attach syntax highlited editor to export dialog
+                CodeMirror.fromTextArea(
+                    $ajaxDialog.find('textarea')[0],
+                    {
+                        lineNumbers: true,
+                        matchBrackets: true,
+                        indentUnit: 4,
+                        mode: "text/x-mysql"
+                    }
+                );
+        }); //end $.post
+    });
+    // if exporting non-ajax, highlight anyways
+    if ($("textarea.export").length > 0)
+    {
+        CodeMirror.fromTextArea(
+            $('textarea.export')[0],
+            {
+                lineNumbers: true,
+                matchBrackets: true,
+                indentUnit: 4,
+                mode: "text/x-mysql"
+            }
+        );
+    }
+
     $(".export_user_anchor.ajax").live('click', function(event) {
         event.preventDefault();
         var $msgbox = PMA_ajaxShowMessage();
diff --git a/server_privileges.php b/server_privileges.php
index f3bcc41824..9106249630 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1528,14 +1528,15 @@ $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" hre
     . '&amp;hostname=%s'
     . '&amp;initial=%s'
     . '&amp;export=1">'
-    . PMA_getIcon('b_tblexport.png', __('Export all'))
+    . PMA_getIcon('b_tblexport.png', __('Export all')) . ' '
+    . __('Export all')
     . '</a>';
 
 /**
  * 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['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
+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']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
 
     if (isset($sql_query)) {
         $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
@@ -1623,8 +1624,8 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
  */
 
 // export user definition
-if (isset($_REQUEST['export'])) {
-    $response = '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
+if (isset($_REQUEST['export']) || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')) {
+    $response = '<textarea class="export" cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">';
     if ($username == '%') {
         // export privileges for all users
         $title = __('Privileges for all users');
@@ -1632,11 +1633,26 @@ if (isset($_REQUEST['export'])) {
             $response .= PMA_getGrants($pair['user'], $pair['host']);
             $response .= "\n";
         }
-    } else {
+    } 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);
+            $response .= '# ' . __('Privileges for ') . '`' . 
+                htmlspecialchars($export_username) . '`@`' . 
+                htmlspecialchars($export_hostname) . "`\n\n";
+            $response .= PMA_getGrants($export_username, $export_hostname) . "\n";
+        }
+    }
+    else {
         // export privileges for a single user
         $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`';
         $response .= PMA_getGrants($username, $hostname);
     }
+    // remove trailing whitespace
+    $response = trim($response);
+    
     $response .= '</textarea>';
     unset($username, $hostname, $grants, $one_grant);
     if ($GLOBALS['is_ajax_request']) {
@@ -1863,7 +1879,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                    .'<a href="server_privileges.php?' . $GLOBALS['url_query'] .  '"'
                    .' onclick="if (unMarkAllRows(\'usersForm\')) return false;">'
                    . __('Uncheck All') . '</a>' . "\n"
-                   . '</div>'
+                   .'<i>' . __('With selected:') . '</i>' . "\n";
+
+                PMA_buttonOrImage(
+                    'submit_mult', 'mult_submit', 'submit_mult_export',
+                    __('Export'), 'b_tblexport.png', 'export'
+                );
+                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 : ''));

From cdd9f0a0dfb74507336db4403afea2bbd6aed98c Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 19:18:07 +0100
Subject: [PATCH 09/36] Added easy-click sqlbutton button styling for pmahomme.

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

diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 9005f7d125..5efe04176e 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -251,13 +251,13 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         .$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n";
     // Add buttons to generate query easily for select all,single select,insert,update and delete
     if (count($fields_list)) {
-        echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />';
-        echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />';
-        echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />';
-        echo '<input type="button" value="UPDATE" id="update" class="sqlbutton" />';
-        echo '<input type="button" value="DELETE" id="delete" class="sqlbutton" />';
+        echo '<input type="button" value="SELECT *" id="selectall" class="button sqlbutton" />';
+        echo '<input type="button" value="SELECT" id="select" class="button sqlbutton" />';
+        echo '<input type="button" value="INSERT" id="insert" class="button sqlbutton" />';
+        echo '<input type="button" value="UPDATE" id="update" class="button sqlbutton" />';
+        echo '<input type="button" value="DELETE" id="delete" class="button sqlbutton" />';
     }
-    echo '<input type="button" value="' . __('Clear') . '" id="clear" class="sqlbutton" />';
+    echo '<input type="button" value="' . __('Clear') . '" id="clear" class="button sqlbutton" />';
     echo '</div>' . "\n";
 
     if (count($fields_list)) {

From 5904800e03510dd5f6f210be703ef1805f3fb743 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 19:46:02 +0100
Subject: [PATCH 10/36] Don't rely on grab_globals for export.php

---
 export.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/export.php b/export.php
index 882c820ebd..69a2de32b8 100644
--- a/export.php
+++ b/export.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Main export hanling code
+ * Main export handling code
  * @package PhpMyAdmin
  */
 
@@ -12,6 +12,15 @@ require_once './libraries/common.inc.php';
 require_once './libraries/zip.lib.php';
 require_once './libraries/plugin_interface.lib.php';
 
+/**
+ * Sets globals from all $_POST (in export.php only)
+ * Would it not be tiresome to list all export-plugin options here?
+ */
+foreach ($_POST as $one_post_param => $one_post_value)
+{
+    $GLOBALS[$one_post_param] = $one_post_value;
+}
+
 PMA_checkParameters(array('what', 'export_type'));
 
 // Scan plugins

From 0326405d005fc4d938b2ad2fc9b6d7a7e498c0c4 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 20:14:27 +0100
Subject: [PATCH 11/36] Don't rely on grab_globals for import.php

---
 import.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/import.php b/import.php
index 2ecd6a4a63..95561557a1 100644
--- a/import.php
+++ b/import.php
@@ -21,12 +21,20 @@ if (isset($_REQUEST['show_as_php'])) {
  */
 $post_params = array(
     'action_bookmark',
+    'allow_interrupt',
     'bkm_label',
     'bookmark_variable',
+    'charset_of_file',
+    'format',
     'id_bookmark',
+    'import_type',
     'is_js_confirmed',
-    'message_to_show'
+    'MAX_FILE_SIZE',
+    'message_to_show',
+    'noplugin',
+    'skip_queries'
 );
+
 foreach ($post_params as $one_post_param) {
     if (isset($_POST[$one_post_param])) {
         $GLOBALS[$one_post_param] = $_POST[$one_post_param];
@@ -87,6 +95,23 @@ if ($_POST == array() && $_GET == array()) {
     include './libraries/footer.inc.php';
 }
 
+/**
+ * Sets globals from $_POST patterns, for import plugins
+ * We only need to load the selected plugin
+ */
+
+$post_patterns = array(
+    '/^force_file_/',
+    '/^'. $format . '_/'
+);
+foreach (array_keys($_POST) as $post_key) {
+    foreach ($post_patterns as $one_post_pattern) {
+        if (preg_match($one_post_pattern, $post_key)) {
+            $GLOBALS[$post_key] = $_POST[$post_key];
+        }
+    }
+}
+
 // Check needed parameters
 PMA_checkParameters(array('import_type', 'format'));
 

From 33d6b783a4b6239b3d2f88fc8e145a7d2c581671 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 20:31:03 +0100
Subject: [PATCH 12/36] Added print button styling for pmahomme

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

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 733a0b7d7f..145a5d22fb 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3859,7 +3859,7 @@ function PMA_analyzeLimitClause($limit_clause)
 function PMA_printButton()
 {
     echo '<p class="print_ignore">';
-    echo '<input type="button" id="print" value="' . __('Print') . '" />';
+    echo '<input type="button" class="button" id="print" value="' . __('Print') . '" />';
     echo '</p>';
 }
 ?>

From 42d0a85aba071fcfe3e2962d2bd255b3fc0f3f88 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 20:38:29 +0100
Subject: [PATCH 13/36] Don't rely on grab_globals for db_structure.php

---
 db_structure.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/db_structure.php b/db_structure.php
index 14586833b5..ed6ef18182 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -16,6 +16,24 @@ $GLOBALS['js_include'][] = 'tbl_change.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 
+/**
+ * Sets globals from $_POST
+ */
+$post_params = array(
+    'error',
+    'is_info',
+    'message',
+    'mult_btn',
+    'selected_tbl',
+    'submit_mult'
+);
+
+foreach ($post_params as $one_post_param) {
+    if (isset($_POST[$one_post_param])) {
+        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
+    }
+}
+
 /**
  * Prepares the tables list if the user where not redirected to this script
  * because there is no table in the database ($is_info is true)

From d10d853629e43d2d8c879c0be57fe7c89a42429a Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 20:50:48 +0100
Subject: [PATCH 14/36] Some newer code parts use buttons instead of inputs,
 added pmahomme styling

---
 themes/pmahomme/css/theme_right.css.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 53a7b2060d..3fd8178141 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -192,11 +192,13 @@ input[type=password] {
 
 }
 
-input[type=submit] {
-    font-weight: bold;
+input[type=submit],
+button[type=submit] {
+    font-weight: bold !important;
 }
 
 input[type=submit],
+button[type=submit],
 input[type=reset],
 input[name=submit_reset],
 input.button {
@@ -217,6 +219,7 @@ input.button {
 }
 
 input[type=submit]:hover,
+button[type=submit]:hover,
 input[type=reset]:hover,
 input[name=submit_reset]:hover,
 input.button:hover {
@@ -226,6 +229,7 @@ input.button:hover {
 }
 
 input[type=submit]:active,
+button[type=submit]:active,
 input[type=reset]:active,
 input[name=submit_reset]:active,
 input.button:active {

From 3277c99787c46cff7e1d5b3b8cc69115b9becf9d Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 21:28:59 +0100
Subject: [PATCH 15/36] Fixed event schedule toggle-button showing wrong if OFF
 on pageload

---
 js/functions.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 628255fecc..181ffcd657 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3060,9 +3060,9 @@ var toggleButton = function ($obj) {
     // OFF state we need to move it now.
     if ($('.container', $obj).hasClass('off')) {
         if (right == 'right') {
-            $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0);
+            $('.container', $obj).animate({'left': '-=' + move + 'px'}, 0);
         } else {
-            $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0);
+            $('.container', $obj).animate({'left': '+=' + move + 'px'}, 0);
         }
     }
     // Attach an 'onclick' event to the switch
@@ -3118,9 +3118,7 @@ var toggleButton = function ($obj) {
  */
 $(window).load(function () {
     $('.toggleAjax').each(function () {
-        $(this)
-        .show()
-        .find('.toggleButton')
+        $(this).show();
         toggleButton($(this));
     });
 });

From 57278c76014bad85124dd8b6c9d239b5a5e4018f Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 21:59:00 +0100
Subject: [PATCH 16/36] Multi-submit buttons should stay transparent in
 pmahomme

---
 themes/pmahomme/css/theme_right.css.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 3fd8178141..76cdc6c609 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -193,12 +193,12 @@ input[type=password] {
 }
 
 input[type=submit],
-button[type=submit] {
+button[type=submit]:not(.mult_submit) {
     font-weight: bold !important;
 }
 
 input[type=submit],
-button[type=submit],
+button[type=submit]:not(.mult_submit),
 input[type=reset],
 input[name=submit_reset],
 input.button {
@@ -219,7 +219,7 @@ input.button {
 }
 
 input[type=submit]:hover,
-button[type=submit]:hover,
+button[type=submit]:not(.mult_submit):hover,
 input[type=reset]:hover,
 input[name=submit_reset]:hover,
 input.button:hover {
@@ -229,7 +229,7 @@ input.button:hover {
 }
 
 input[type=submit]:active,
-button[type=submit]:active,
+button[type=submit]:not(.mult_submit):active,
 input[type=reset]:active,
 input[name=submit_reset]:active,
 input.button:active {

From dc4442e6fbaacbf50466e25e4bbf9133dcadf49e Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 22:07:34 +0100
Subject: [PATCH 17/36] Added inline SQL editor buttons pmahomme styling

---
 js/functions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 181ffcd657..d08f1b3c9c 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1069,8 +1069,8 @@ $(document).ready(function(){
         var old_text   = $inner_sql.html();
 
         var new_content = "<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">" + sql_query + "</textarea>\n";
-        new_content    += "<input type=\"button\" class=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\">\n";
-        new_content    += "<input type=\"button\" class=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">\n";
+        new_content    += "<input type=\"submit\" class=\"button btnSave\" value=\"" + PMA_messages['strGo'] + "\">\n";
+        new_content    += "<input type=\"button\" class=\"button btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">\n";
         $inner_sql.replaceWith(new_content);
 
         // These settings are duplicated from the .ready()function in functions.js

From a49a7683b4a01aed07c8f712d75e72c2f12f5c8a Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 22:15:39 +0100
Subject: [PATCH 18/36] Added insertValueQuery button pmahomme styling

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

diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 5efe04176e..fb55c79b5c 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -277,11 +277,11 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         echo '</select>' . "\n"
             .'<div id="tablefieldinsertbuttoncontainer">' . "\n";
         if ($GLOBALS['cfg']['PropertiesIconic']) {
-            echo '<input type="button" name="insert" value="&lt;&lt;"'
+            echo '<input type="button" class="button" name="insert" value="&lt;&lt;"'
                 .' onclick="insertValueQuery()"'
                 .' title="' . __('Insert') . '" />' . "\n";
         } else {
-            echo '<input type="button" name="insert"'
+            echo '<input type="button" class="button" name="insert"'
                 .' value="' . __('Insert') . '"'
                 .' onclick="insertValueQuery()" />' . "\n";
         }

From 92dddc2d0ebe3f8959aa6ac326c4bd077aac4d58 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 22:16:22 +0100
Subject: [PATCH 19/36] Fixed double server-privs "Export all" label if
 PropertiesIconic is 0

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

diff --git a/server_privileges.php b/server_privileges.php
index 9106249630..f234c07e34 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1528,8 +1528,7 @@ $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" hre
     . '&amp;hostname=%s'
     . '&amp;initial=%s'
     . '&amp;export=1">'
-    . PMA_getIcon('b_tblexport.png', __('Export all')) . ' '
-    . __('Export all')
+    . PMA_getIcon('b_tblexport.png', __('Export all'))
     . '</a>';
 
 /**

From 7a88029f455e5744fc5911e2fe852c6e1ac670f7 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 22:37:34 +0100
Subject: [PATCH 20/36] Open "More themes" link from theme previewer in new tab
 instead of popup

---
 js/functions.js | 8 ++++++++
 themes.php      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index d08f1b3c9c..9d104caedb 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3624,3 +3624,11 @@ function toggleRowColors($start)
         }
     }
 }
+
+/**
+ * Opens pma more themes link in themes browser, in new window instead of popup
+ * This way, we don't break HTML validity
+ */
+$(function () {
+    $("a[rel=_blank]").prop("target", "_blank");
+});
diff --git a/themes.php b/themes.php
index e0347bd0c0..f343987291 100644
--- a/themes.php
+++ b/themes.php
@@ -25,7 +25,7 @@ require './libraries/header_scripts.inc.php';
 
 <body id="bodythemes">
 <h1>phpMyAdmin - <?php echo __('Theme'); ?></h1>
-<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>"><?php echo __('Get more themes!'); ?></a></p>
+<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" rel="_blank"><?php echo __('Get more themes!'); ?></a></p>
 <?php
 $_SESSION['PMA_Theme_Manager']->printPreviews();
 ?>

From af0e6c71e72cc3bbcd9c8d35c64836e4e3b07b1e Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 22:54:32 +0100
Subject: [PATCH 21/36] Use HTML5 DOCTYPE along with new charset meta-tag

---
 Documentation.html                  |  5 ++---
 browse_foreigners.php               |  5 ++---
 changelog.php                       | 12 +++++-------
 examples/openid.php                 |  4 ++--
 examples/signon.php                 |  4 ++--
 libraries/error.inc.php             |  8 ++++----
 libraries/header_meta_style.inc.php |  5 ++---
 libraries/header_printview.inc.php  |  5 ++---
 navigation.php                      |  5 ++---
 scripts/decode_bug.php              |  5 ++---
 setup/index.php                     |  4 ++--
 11 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 9342d48ed3..33c08603b5 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE HTML>
 <!-- 
 vim: expandtab ts=4 sw=4 sts=4 tw=78 
 -->
@@ -8,7 +7,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <head>
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <title>phpMyAdmin 4.0.0-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 3eff09f4c9..54b0ab702c 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -72,8 +72,7 @@ if (is_array($foreignData['disp_row'])) {
     }
 }
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml"
     xml:lang="<?php echo $available_languages[$lang][1]; ?>"
     lang="<?php echo $available_languages[$lang][1]; ?>"
@@ -81,7 +80,7 @@ if (is_array($foreignData['disp_row'])) {
 
 <head>
     <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <link rel="stylesheet" type="text/css"
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
 <?php
diff --git a/changelog.php b/changelog.php
index fcd727f250..82787b2c09 100644
--- a/changelog.php
+++ b/changelog.php
@@ -99,16 +99,14 @@ $replaces = array(
 );
 
 header('Content-type: text/html; charset=utf-8');
-echo '<?xml version="1.0" encoding="utf-8"?'.'>';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
-<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
-<title>phpMyAdmin - ChangeLog</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+    <title>phpMyAdmin - ChangeLog</title>
+    <meta charset="utf-8" />
 </head>
 <body>
 <h1>phpMyAdmin - ChangeLog</h1>
diff --git a/examples/openid.php b/examples/openid.php
index d57b83c75a..8033a149d1 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -36,12 +36,12 @@ function show_page($contents)
     header('Content-Type: text/html; charset=utf-8');
     echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
     <link rel="icon" href="../favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+    <meta charset="utf-8" />
     <title>phpMyAdmin OpenID signon example</title>
 </head>
 <body>
diff --git a/examples/signon.php b/examples/signon.php
index 0dfd356d3d..01e1331db9 100644
--- a/examples/signon.php
+++ b/examples/signon.php
@@ -37,12 +37,12 @@ if (isset($_POST['user'])) {
     header('Content-Type: text/html; charset=utf-8');
     echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
     <link rel="icon" href="../favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+    <meta charset="utf-8" />
     <title>phpMyAdmin single signon example</title>
 </head>
 <body>
diff --git a/libraries/error.inc.php b/libraries/error.inc.php
index 316639addb..550a1bb222 100644
--- a/libraries/error.inc.php
+++ b/libraries/error.inc.php
@@ -12,13 +12,13 @@ if (! defined('PHPMYADMIN')) {
 
 header('Content-Type: text/html; charset=utf-8');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
 <head>
-    <link rel="icon" href="./favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <style type="text/css">
     <!--
     html {
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 21e5d2f597..c99087435f 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -31,11 +31,10 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 /* echo '<?xml version="1.0" encoding="utf-8"?>'; */
 
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <title><?php
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 2f39b87c3a..ad53ce9415 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -38,12 +38,11 @@ if ($text_dir == 'ltr') {
     $cell_align_right = 'left';
 }
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta charset="utf-8" />
 <link rel="icon" href="./favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
 <title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
diff --git a/navigation.php b/navigation.php
index 748c9abcb0..bb7b9e05e5 100644
--- a/navigation.php
+++ b/navigation.php
@@ -88,8 +88,7 @@ require_once './libraries/header_http.inc.php';
 // xml declaration moves IE into quirks mode, making much trouble with CSS
 /* echo '<?xml version="1.0" encoding="utf-8"?>'; */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml"
     xml:lang="<?php echo $available_languages[$lang][1]; ?>"
     lang="<?php echo $available_languages[$lang][1]; ?>"
@@ -99,7 +98,7 @@ require_once './libraries/header_http.inc.php';
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <base target="frame_content" />
     <link rel="stylesheet" type="text/css"
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index aff4d34e8a..e4ea6f70fc 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -15,14 +15,13 @@
  * Displays the form
  */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 
 <head>
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta charset="iso-8859-1" />
     <title>phpMyAdmin - Parser bug report decoder</title>
     <style type="text/css">
     <!--
diff --git a/setup/index.php b/setup/index.php
index dde1ffe9dc..5c75eb8664 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -28,10 +28,10 @@ $action_done = preg_replace('/[^a-z_]/', '', $action_done);
 // send no-cache headers
 require './libraries/header_http.inc.php';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta charset="utf-8" />
 <title>phpMyAdmin setup</title>
 <link href="../favicon.ico" rel="icon" type="image/x-icon" />
 <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />

From 3b56f6a53b1cb74319fe58308907371ea93f725d Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 23:04:12 +0100
Subject: [PATCH 22/36] Leading ./ paths for links and favicons can be omitted,
 part 1

---
 Documentation.html                        |  4 ++--
 db_operations.php                         |  2 +-
 db_structure.php                          |  2 +-
 index.php                                 |  4 ++--
 libraries/auth/cookie.auth.lib.php        |  2 +-
 libraries/auth/swekey/swekey.auth.lib.php |  2 +-
 libraries/build_html_for_db.lib.php       |  2 +-
 libraries/common.lib.php                  |  4 ++--
 libraries/core.lib.php                    |  4 ++--
 libraries/header_meta_style.inc.php       |  4 ++--
 libraries/header_printview.inc.php        |  4 ++--
 libraries/schema/User_Schema.class.php    |  4 ++--
 libraries/sql_query_form.lib.php          |  4 ++--
 libraries/sqlvalidator.lib.php            |  2 +-
 libraries/tbl_properties.inc.php          |  2 +-
 navigation.php                            |  4 ++--
 schema_export.php                         |  4 ++--
 server_binlog.php                         |  8 ++++----
 server_databases.php                      | 12 ++++++------
 server_engines.php                        |  6 +++---
 tbl_change.php                            |  2 +-
 tbl_indexes.php                           |  2 +-
 tbl_structure.php                         |  2 +-
 23 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 33c08603b5..5071b1c85d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -5,8 +5,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 <head>
-    <link rel="icon" href="./favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <meta charset="utf-8" />
     <title>phpMyAdmin 4.0.0-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
diff --git a/db_operations.php b/db_operations.php
index 080686735f..98506d0736 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -558,7 +558,7 @@ echo __('Remove database');
     if ($GLOBALS['cfg']['AjaxEnable']) {
         echo ' class="ajax" ';
     }
-    echo 'method="post" action="./db_operations.php">'
+    echo 'method="post" action="db_operations.php">'
        . PMA_generate_common_hidden_inputs($db, $table)
        . '<fieldset>' . "\n"
        . '    <legend>';
diff --git a/db_structure.php b/db_structure.php
index ed6ef18182..8c6806ee66 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -644,7 +644,7 @@ echo '<p>';
 echo '<a href="db_printview.php?' . $url_query . '">';
 echo PMA_getIcon('b_print.png', __('Print view'), true) . '</a>';
 
-echo '<a href="./db_datadict.php?' . $url_query . '">';
+echo '<a href="db_datadict.php?' . $url_query . '">';
 echo PMA_getIcon('b_tblanalyse.png', __('Data Dictionary'), true) . '</a>';
 echo '</p>';
 
diff --git a/index.php b/index.php
index 574f96fd49..62169b763f 100644
--- a/index.php
+++ b/index.php
@@ -78,8 +78,8 @@ require './libraries/header_http.inc.php';
     lang="<?php echo $lang_iso_code; ?>"
     dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
-<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+<link rel="icon" href="favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> -
     <?php echo htmlspecialchars($HTTP_HOST); ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 0c3d8a61dc..5e74f48a93 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -198,7 +198,7 @@ if (top != self) {
     <legend>
 <?php
     echo __('Log in');
-    echo '<a href="./Documentation.html" target="documentation" ' .
+    echo '<a href="Documentation.html" target="documentation" ' .
         'title="' . __('phpMyAdmin documentation') . '"> ';
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
         echo PMA_getImage('b_help.png', __('phpMyAdmin documentation'));
diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
index df7e56e5f4..1a27480e13 100644
--- a/libraries/auth/swekey/swekey.auth.lib.php
+++ b/libraries/auth/swekey/swekey.auth.lib.php
@@ -115,7 +115,7 @@ function Swekey_auth_error()
     if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0)
         return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']);
 
-    include_once "./libraries/auth/swekey/swekey.php";
+    include_once "libraries/auth/swekey/swekey.php";
 
     Swekey_SetCheckServer($_SESSION['SWEKEY']['CONF_SERVER_CHECK']);
     Swekey_SetRndTokenServer($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN']);
diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php
index a6836c8c5a..d59ffb9bda 100644
--- a/libraries/build_html_for_db.lib.php
+++ b/libraries/build_html_for_db.lib.php
@@ -146,7 +146,7 @@ function PMA_buildHtmlForDb($current, $is_superuser, $checkall, $url_query, $col
         $out .= '<td class="tool">'
                . '<a onclick="'
                . 'if (window.parent.setDb) window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');'
-               . '" href="./server_privileges.php?' . $url_query
+               . '" href="server_privileges.php?' . $url_query
                . '&amp;checkprivs=' . urlencode($current['SCHEMA_NAME'])
                . '" title="' . sprintf(__('Check privileges for database &quot;%s&quot;.'), htmlspecialchars($current['SCHEMA_NAME']))
                . '">'
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 145a5d22fb..aeb7d6532d 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -929,7 +929,7 @@ function PMA_removeBackquote($a_name)
  */
 function PMA_whichCrlf()
 {
-    // The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php"
+    // The 'PMA_USR_OS' constant is defined in "libraries/Config.class.php"
     // Win case
     if (PMA_USR_OS == 'Win') {
         $the_crlf = "\r\n";
@@ -2500,7 +2500,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
                 . $frame . '">' . $caption2 . '</a>';
         }
 
-        echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n";
+        echo "\n", '<form action="', basename($script), '" method="post" target="', $frame, '">', "\n";
         echo PMA_generate_common_hidden_inputs($_url_params);
         echo PMA_pageselector(
             $max_count,
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 36df934cc8..92f71b0b2f 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -704,9 +704,9 @@ function PMA_linkURL($url)
 function PMA_includeJS($url)
 {
     if (strpos($url, '?') === false) {
-        return '<script src="./js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n";
+        return '<script src="js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n";
     } else {
-        return '<script src="./js/' . $url . '" type="text/javascript"></script>' . "\n";
+        return '<script src="js/' . $url . '" type="text/javascript"></script>' . "\n";
     }
 }
 
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index c99087435f..ad26071f76 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -35,8 +35,8 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="./favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <title><?php
     if (!empty($page_title)) {
         echo htmlspecialchars($page_title);
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index ad53ce9415..ff2c100f95 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -43,8 +43,8 @@ if ($text_dir == 'ltr') {
 
 <head>
 <meta charset="utf-8" />
-<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+<link rel="icon" href="favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 <title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
 <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=print&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
 <?php
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 399341247f..867635020f 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -502,7 +502,7 @@ class PMA_User_Schema
     {
         global $with_field_names, $db;
         ?>
-        <script type="text/javascript" src="./js/dom-drag.js"></script>
+        <script type="text/javascript" src="js/dom-drag.js"></script>
         <form method="post" action="schema_edit.php" name="dragdrop">
         <input type="button" name="dragdrop" value="<?php echo __('Toggle scratchboard'); ?>" onclick="ToggleDragDrop('pdflayout');" />
         <input type="button" name="dragdropreset" value="<?php echo __('Reset'); ?>" onclick="resetDrag();" />
@@ -613,7 +613,7 @@ class PMA_User_Schema
 
         PMA_DBI_select_db($db);
 
-        include "./libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
+        include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
         $obj_schema = eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
     }
 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index fb55c79b5c..ded404d1f0 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -387,11 +387,11 @@ function PMA_sqlQueryFormBookmark()
     echo '<div class="formelement">' . "\n";
     echo __('Variable');
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        echo ' <a href="./Documentation.html#faqbookmark"'
+        echo ' <a href="Documentation.html#faqbookmark"'
             .' target="documentation">'
             . PMA_getImage('b_help.png', __('Documentation')) . '</a>';
     } else {
-        echo ' (<a href="./Documentation.html#faqbookmark"'
+        echo ' (<a href="Documentation.html#faqbookmark"'
             .' target="documentation">' . __('Documentation') . '</a>): ';
     }
     echo '<input type="text" name="bookmark_variable" class="textfield"'
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index 4b958feb2d..27e1dfbec7 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -64,7 +64,7 @@ function PMA_validateSQL($sql)
     if ($cfg['SQLValidator']['use']) {
         if (isset($GLOBALS['sqlvalidator_error'])
             && $GLOBALS['sqlvalidator_error']) {
-            $str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '<a href="./Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
+            $str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '<a href="Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
         } else {
             // create new class instance
             $srv = new PMA_SQLValidator();
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 8fdce579db..9a20ce5406 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -549,7 +549,7 @@ for ($i = 0; $i < $num_fields; $i++) {
 } // end for
 
     ?>
-<script src="./js/keyhandler.js" type="text/javascript"></script>
+<script src="js/keyhandler.js" type="text/javascript"></script>
 <script type="text/javascript">
 // <![CDATA[
 var switch_movement = 0;
diff --git a/navigation.php b/navigation.php
index bb7b9e05e5..34b279f20d 100644
--- a/navigation.php
+++ b/navigation.php
@@ -95,8 +95,8 @@ require_once './libraries/header_http.inc.php';
     dir="<?php echo $GLOBALS['text_dir']; ?>">
 
 <head>
-    <link rel="icon" href="./favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <title>phpMyAdmin</title>
     <meta charset="utf-8" />
     <base target="frame_content" />
diff --git a/schema_export.php b/schema_export.php
index 1430e57378..31a1264813 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -21,7 +21,7 @@ $cfgRelation = PMA_getRelationsParam();
 
 require_once './libraries/transformations.lib.php';
 require_once './libraries/Index.class.php';
-require_once "./libraries/schema/Export_Relation_Schema.class.php";
+require_once "libraries/schema/Export_Relation_Schema.class.php";
 
 /**
  * get all the export options and verify
@@ -38,5 +38,5 @@ $path = PMA_securePath(ucfirst($export_type));
 if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) {
     PMA_Export_Relation_Schema::dieSchema($_POST['chpage'], $export_type, __('File doesn\'t exist'));
 }
-require "./libraries/schema/".$path."_Relation_Schema.class.php";
+require "libraries/schema/".$path."_Relation_Schema.class.php";
 $obj_schema = eval("new PMA_".$path."_Relation_Schema();");
diff --git a/server_binlog.php b/server_binlog.php
index 89a424a835..7d902a8fff 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -130,7 +130,7 @@ if ($pos > 0) {
         $this_url_params['pos'] = $pos - $GLOBALS['cfg']['MaxRows'];
     }
 
-    echo '<a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
+    echo '<a href="server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
         echo ' title="' . _pgettext('Previous page', 'Previous') . '">';
     } else {
@@ -146,7 +146,7 @@ if ($pos > 0) {
 if ($dontlimitchars) {
     unset($this_url_params['dontlimitchars']);
     ?>
-        <a href="./server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>"
+        <a href="server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>"
             title="<?php __('Truncate Shown Queries'); ?>">
                 <img src="<?php echo $pmaThemeImage; ?>s_partialtext.png"
                     alt="<?php echo __('Truncate Shown Queries'); ?>" /></a>
@@ -154,7 +154,7 @@ if ($dontlimitchars) {
 } else {
     $this_url_params['dontlimitchars'] = 1;
     ?>
-        <a href="./server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>"
+        <a href="server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>"
             title="<?php __('Show Full Queries'); ?>">
                 <img src="<?php echo $pmaThemeImage; ?>s_fulltext.png"
                     alt="<?php echo __('Show Full Queries'); ?>" /></a>
@@ -165,7 +165,7 @@ if ($dontlimitchars) {
 if ($num_rows >= $GLOBALS['cfg']['MaxRows']) {
     $this_url_params = $url_params;
     $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
-    echo ' - <a href="./server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
+    echo ' - <a href="server_binlog.php' . PMA_generate_common_url($this_url_params) . '"';
     if ($GLOBALS['cfg']['NavigationBarIconic']) {
         echo ' title="' . _pgettext('Next page', 'Next') . '">';
     } else {
diff --git a/server_databases.php b/server_databases.php
index b2d9ccdeb5..4db42d9243 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -161,7 +161,7 @@ if ($databases_count > 0) {
 
     $_url_params['pos'] = $pos;
 
-    echo '<form action="./server_databases.php" method="post" name="dbStatsForm" id="dbStatsForm">' . "\n"
+    echo '<form action="server_databases.php" method="post" name="dbStatsForm" id="dbStatsForm">' . "\n"
        . PMA_generate_common_hidden_inputs($_url_params);
 
     $_url_params['sort_by'] = 'SCHEMA_NAME';
@@ -171,7 +171,7 @@ if ($databases_count > 0) {
        . '<thead>' . "\n"
        . '<tr>' . "\n"
        . ($is_superuser || $cfg['AllowUserDropDatabase'] ? '        <th></th>' . "\n" : '')
-       . '    <th><a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
+       . '    <th><a href="server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
        . '            ' . __('Database') . "\n"
        . ($sort_by == 'SCHEMA_NAME' ? '                ' . PMA_getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
        . '        </a></th>' . "\n";
@@ -188,7 +188,7 @@ if ($databases_count > 0) {
             $_url_params['sort_by'] = $stat_name;
             $_url_params['sort_order'] = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc';
             echo '    <th' . $colspan . '>'
-                .'<a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
+                .'<a href="server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
                 .'            ' . $stat['disp_name'] . "\n"
                 .($sort_by == $stat_name ? '            ' . PMA_getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
                 .'        </a></th>' . "\n";
@@ -275,9 +275,9 @@ if ($databases_count > 0) {
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
         $common_url_query = PMA_generate_common_url(array('sort_by' => $sort_by, 'sort_order' => $sort_order, 'dbstats' => $dbstats));
         echo '<img class="selectallarrow" src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" width="38" height="22" alt="' . __('With selected:') . '" />' . "\n"
-           . '<a href="./server_databases.php' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
+           . '<a href="server_databases.php' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . __('Check All') . '</a> / ' . "\n"
-           . '<a href="./server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
+           . '<a href="server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . __('Uncheck All') . '</a>' . "\n"
            . '<i>' . __('With selected:') . '</i>' . "\n";
         PMA_buttonOrImage('drop_selected_dbs', 'mult_submit', 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
@@ -285,7 +285,7 @@ if ($databases_count > 0) {
 
     if (empty($dbstats)) {
         echo '<ul><li id="li_switch_dbstats"><strong>' . "\n";
-            echo '        <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1"'
+            echo '        <a href="server_databases.php?' . $url_query . '&amp;dbstats=1"'
                 .' title="' . __('Enable Statistics') . '">' . "\n"
                 .'            ' . __('Enable Statistics');
         echo '</a></strong><br />' . "\n";
diff --git a/server_engines.php b/server_engines.php
index d7fd4ce4e0..b961ed5421 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -69,7 +69,7 @@ if (empty($_REQUEST['engine'])
                 ? ' disabled'
                 : '')
            . '">' . "\n"
-           . '    <td><a href="./server_engines.php'
+           . '    <td><a href="server_engines.php'
            . PMA_generate_common_url(array('engine' => $engine)) . '">' . "\n"
            . '            ' . htmlspecialchars($details['Engine']) . "\n"
            . '        </a></td>' . "\n"
@@ -106,7 +106,7 @@ if (empty($_REQUEST['engine'])
         if (empty($_REQUEST['page'])) {
             echo '    <strong>' . __('Variables') . '</strong>' . "\n";
         } else {
-            echo '    <a href="./server_engines.php'
+            echo '    <a href="server_engines.php'
                 . PMA_generate_common_url(array('engine' => $_REQUEST['engine'])) . '">'
                 . __('Variables') . '</a>' . "\n";
         }
@@ -115,7 +115,7 @@ if (empty($_REQUEST['engine'])
             if (isset($_REQUEST['page']) && $_REQUEST['page'] == $current) {
                 echo '    <strong>' . $label . '</strong>' . "\n";
             } else {
-                echo '    <a href="./server_engines.php'
+                echo '    <a href="server_engines.php'
                     . PMA_generate_common_url(
                         array('engine' => $_REQUEST['engine'], 'page' => $current))
                     . '">' . htmlspecialchars($label) . '</a>' . "\n";
diff --git a/tbl_change.php b/tbl_change.php
index ba1aba296c..017f1f66f5 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -234,7 +234,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 &&
 
     ?>
 <!-- Set on key handler for moving using by Ctrl+arrows -->
-<script src="./js/keyhandler.js" type="text/javascript"></script>
+<script src="js/keyhandler.js" type="text/javascript"></script>
 <script type="text/javascript">
 //<![CDATA[
 var switch_movement = 0;
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 8552783b86..14b5785255 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -144,7 +144,7 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
 // end preparing form values
 ?>
 
-<form action="./tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>
+<form action="tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>
     onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') {
         this.elements['index[Key_name]'].disabled = false}">
 <?php
diff --git a/tbl_structure.php b/tbl_structure.php
index 5ea46370b8..6d8d961d66 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -697,7 +697,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
     echo PMA_Index::getView($table, $db);
     ?>
         <fieldset class="tblFooters" style="text-align: left;">
-            <form action="./tbl_indexes.php" method="post">
+            <form action="tbl_indexes.php" method="post">
                 <?php
                 echo PMA_generate_common_hidden_inputs($db, $table);
                 echo sprintf(__('Create an index on &nbsp;%s&nbsp;columns'),

From b2fd866d87abe49b7003393004dcec8805125362 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 16 Mar 2012 23:11:57 +0100
Subject: [PATCH 23/36] Leading ./ paths for includes can be omitted, part 2

---
 browse_foreigners.php     | 10 +++----
 changelog.php             |  2 +-
 chk_rel.php               |  6 ++---
 db_create.php             | 16 +++++------
 db_datadict.php           | 10 +++----
 db_events.php             |  8 +++---
 db_export.php             | 12 ++++-----
 db_import.php             | 10 +++----
 db_operations.php         | 16 +++++------
 db_printview.php          |  6 ++---
 db_qbe.php                | 12 ++++-----
 db_routines.php           | 14 +++++-----
 db_search.php             |  8 +++---
 db_sql.php                | 12 ++++-----
 db_structure.php          | 24 ++++++++---------
 db_tracking.php           | 14 +++++-----
 db_triggers.php           |  8 +++---
 enum_editor.php           |  6 ++---
 export.php                | 52 ++++++++++++++++++------------------
 file_echo.php             |  2 +-
 gis_data_editor.php       | 12 ++++-----
 import.php                | 28 ++++++++++----------
 import_status.php         |  4 +--
 index.php                 |  4 +--
 license.php               |  2 +-
 main.php                  | 30 ++++++++++-----------
 navigation.php            | 20 +++++++-------
 phpinfo.php               |  2 +-
 phpmyadmin.css.php        |  4 +--
 pmd_display_field.php     |  2 +-
 pmd_general.php           |  8 +++---
 pmd_pdf.php               |  4 +--
 pmd_relation_new.php      |  2 +-
 pmd_relation_upd.php      |  2 +-
 pmd_save_pos.php          |  2 +-
 prefs_forms.php           | 22 +++++++--------
 prefs_manage.php          | 32 +++++++++++-----------
 querywindow.php           | 20 +++++++-------
 schema_edit.php           | 24 ++++++++---------
 schema_export.php         | 12 ++++-----
 server_binlog.php         |  8 +++---
 server_collations.php     | 10 +++----
 server_databases.php      | 16 +++++------
 server_engines.php        | 10 +++----
 server_export.php         |  8 +++---
 server_import.php         | 10 +++----
 server_plugins.php        |  8 +++---
 server_privileges.php     | 18 ++++++-------
 server_replication.php    | 20 +++++++-------
 server_sql.php            | 10 +++----
 server_status.php         | 12 ++++-----
 server_synchronize.php    | 10 +++----
 server_variables.php      | 10 +++----
 show_config_errors.php    |  2 +-
 sql.php                   | 56 +++++++++++++++++++--------------------
 tbl_addfield.php          | 18 ++++++-------
 tbl_alter.php             | 18 ++++++-------
 tbl_change.php            | 22 +++++++--------
 tbl_chart.php             | 18 ++++++-------
 tbl_create.php            | 16 +++++------
 tbl_export.php            | 12 ++++-----
 tbl_get_field.php         |  4 +--
 tbl_gis_visualization.php | 10 +++----
 tbl_import.php            | 12 ++++-----
 tbl_indexes.php           | 14 +++++-----
 tbl_move_copy.php         |  2 +-
 tbl_operations.php        | 22 +++++++--------
 tbl_printview.php         | 14 +++++-----
 tbl_relation.php          | 10 +++----
 tbl_replace.php           | 24 ++++++++---------
 tbl_row_action.php        | 18 ++++++-------
 tbl_select.php            | 16 +++++------
 tbl_sql.php               | 12 ++++-----
 tbl_structure.php         | 26 +++++++++---------
 74 files changed, 490 insertions(+), 490 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php
index 54b0ab702c..d8016857b7 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -9,19 +9,19 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 PMA_checkParameters(array('db', 'table', 'field'));
 
-require_once './libraries/ob.lib.php';
+require_once 'libraries/ob.lib.php';
 PMA_outBufferPre();
 
-require_once './libraries/header_http.inc.php';
+require_once 'libraries/header_http.inc.php';
 
 /**
  * Displays the frame
  */
-require_once './libraries/transformations.lib.php'; // Transformations
+require_once 'libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
 $foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);
 
@@ -85,7 +85,7 @@ if (is_array($foreignData['disp_row'])) {
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
 <?php
 // includes everything asked for by libraries/common.inc.php
-require_once './libraries/header_scripts.inc.php';
+require_once 'libraries/header_scripts.inc.php';
 ?>
     <script type="text/javascript">
     //<![CDATA[
diff --git a/changelog.php b/changelog.php
index 82787b2c09..d5bea88cd1 100644
--- a/changelog.php
+++ b/changelog.php
@@ -9,7 +9,7 @@
 /**
  * Gets core libraries and defines some variables
  */
-require './libraries/common.inc.php';
+require 'libraries/common.inc.php';
 
 $filename = CHANGELOG_FILE;
 
diff --git a/chk_rel.php b/chk_rel.php
index e838d2e741..ea89eef2ca 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -8,8 +8,8 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/header.inc.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/header.inc.php';
 
 
 /**
@@ -21,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(true);
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_create.php b/db_create.php
index 6f9b367277..497a000e3b 100644
--- a/db_create.php
+++ b/db_create.php
@@ -8,15 +8,15 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 if (!PMA_DRIZZLE) {
-    include_once './libraries/replication.inc.php';
+    include_once 'libraries/replication.inc.php';
 }
-require './libraries/build_html_for_db.lib.php';
+require 'libraries/build_html_for_db.lib.php';
 
 /**
  * Sets globals from $_POST
@@ -67,8 +67,8 @@ if (! $result) {
         PMA_ajaxResponse($message, false);
     }
 
-    include_once './libraries/header.inc.php';
-    include_once './main.php';
+    include_once 'libraries/header.inc.php';
+    include_once 'main.php';
 } else {
     $message = PMA_Message::success(__('Database %1$s has been created.'));
     $message->addParam($new_db);
@@ -138,7 +138,7 @@ if (! $result) {
         PMA_ajaxResponse($message, true, $extra_data);
     }
 
-    include_once './libraries/header.inc.php';
-    include_once './' . $cfg['DefaultTabDatabase'];
+    include_once 'libraries/header.inc.php';
+    include_once '' . $cfg['DefaultTabDatabase'];
 }
 ?>
diff --git a/db_datadict.php b/db_datadict.php
index 1f62a09d60..9b4562d9d1 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -8,11 +8,11 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 if (! isset($selected_tbl)) {
-    include './libraries/db_common.inc.php';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_common.inc.php';
+    include 'libraries/db_info.inc.php';
 }
 
 
@@ -21,7 +21,7 @@ if (! isset($selected_tbl)) {
  */
 $cfgRelation  = PMA_getRelationsParam();
 
-require_once './libraries/transformations.lib.php';
+require_once 'libraries/transformations.lib.php';
 
 
 /**
@@ -271,5 +271,5 @@ foreach ($tables as $table) {
  */
 PMA_printButton();
 
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_events.php b/db_events.php
index 7716fb0965..af41eb1f56 100644
--- a/db_events.php
+++ b/db_events.php
@@ -9,8 +9,8 @@
 /**
  * Include required files
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/common.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/common.lib.php';
 
 /**
  * Include JavaScript libraries
@@ -25,12 +25,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 /**
  * Include all other files
  */
-require_once './libraries/rte/rte_events.lib.php';
+require_once 'libraries/rte/rte_events.lib.php';
 
 /**
  * Do the magic
  */
 $_PMA_RTE = 'EVN';
-require_once './libraries/rte/rte_main.inc.php';
+require_once 'libraries/rte/rte_main.inc.php';
 
 ?>
diff --git a/db_export.php b/db_export.php
index 326b73ae86..a006e4b134 100644
--- a/db_export.php
+++ b/db_export.php
@@ -9,16 +9,16 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'export.js';
 
 // $sub_part is also used in db_info.inc.php to see if we are coming from
 // db_export.php, in which case we don't obey $cfg['MaxTableList']
 $sub_part  = '_export';
-require_once './libraries/db_common.inc.php';
+require_once 'libraries/db_common.inc.php';
 $url_query .= '&amp;goto=db_export.php';
-require_once './libraries/db_info.inc.php';
+require_once 'libraries/db_info.inc.php';
 
 /**
  * Displays the form
@@ -28,7 +28,7 @@ $export_page_title = __('View dump (schema) of database');
 // exit if no tables in db found
 if ($num_tables < 1) {
     PMA_Message::error(__('No tables found in database.'))->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
     exit;
 } // end if
 
@@ -77,10 +77,10 @@ $multi_values .= "\n";
 $multi_values .= '</select></div>';
 
 $export_type = 'database';
-require_once './libraries/display_export.lib.php';
+require_once 'libraries/display_export.lib.php';
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_import.php b/db_import.php
index fcf56b6551..146e331e9c 100644
--- a/db_import.php
+++ b/db_import.php
@@ -8,22 +8,22 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'import.js';
 
 /**
  * Gets tables informations and displays top links
  */
-require './libraries/db_common.inc.php';
-require './libraries/db_info.inc.php';
+require 'libraries/db_common.inc.php';
+require 'libraries/db_info.inc.php';
 
 $import_type = 'database';
-require './libraries/display_import.lib.php';
+require 'libraries/display_import.lib.php';
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
 
diff --git a/db_operations.php b/db_operations.php
index 98506d0736..2209606013 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -15,8 +15,8 @@
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 // add a javascript file for jQuery functions to handle Ajax actions
 // also add jQueryUI
@@ -129,7 +129,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
         $views = array();
 
         // remove all foreign key constraints, otherwise we can get errors
-        include_once './libraries/export/sql.php';
+        include_once 'libraries/export/sql.php';
         foreach ($tables_full as $each_table => $tmp) {
             $sql_constraints = '';
             $sql_drop_foreign_keys = '';
@@ -289,7 +289,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
             /**
              * cleanup pmadb stuff for this db
              */
-            include_once './libraries/relation_cleanup.lib.php';
+            include_once 'libraries/relation_cleanup.lib.php';
             PMA_relationsCleanupDatabase($db);
 
             // if someday the RENAME DATABASE reappears, do not DROP
@@ -355,12 +355,12 @@ if (isset($_REQUEST['comment'])) {
  * because there is no table in the database ($is_info is true)
  */
 if (empty($is_info)) {
-    include './libraries/db_common.inc.php';
+    include 'libraries/db_common.inc.php';
     $url_query .= '&amp;goto=db_operations.php';
 
     // Gets the database structure
     $sub_part = '_structure';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_info.inc.php';
     echo "\n";
 
     if (isset($message)) {
@@ -403,7 +403,7 @@ if (!$is_information_schema) {
     }
     ?>
     <div class="operations_half_width">
-    <?php include './libraries/display_create_table.lib.php'; ?>
+    <?php include 'libraries/display_create_table.lib.php'; ?>
     </div>
     <?php
     /**
@@ -618,5 +618,5 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_printview.php b/db_printview.php
index 5512fa6391..328a900576 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -8,13 +8,13 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
 $print_view = true;
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 
 PMA_checkParameters(array('db'));
 
@@ -248,5 +248,5 @@ PMA_printButton();
 
 echo "<div id='PMA_disable_floating_menubar'></div>\n";
 
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_qbe.php b/db_qbe.php
index b4249bff32..8d559f3d5c 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -9,7 +9,7 @@
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Gets the relation settings
@@ -26,16 +26,16 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
         $message_to_display = true;
     } else {
         $goto      = 'db_sql.php';
-        include './sql.php';
+        include 'sql.php';
         exit;
     }
 }
 
 $sub_part  = '_qbe';
-require './libraries/db_common.inc.php';
+require 'libraries/db_common.inc.php';
 $url_query .= '&amp;goto=db_qbe.php';
 $url_params['goto'] = 'db_qbe.php';
-require './libraries/db_info.inc.php';
+require 'libraries/db_info.inc.php';
 
 if ($message_to_display) {
     PMA_Message::error(__('You have to choose at least one column to display'))->display();
@@ -99,7 +99,7 @@ $tbl_result     = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';',
 $tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
 if (0 == $tbl_result_cnt) {
     PMA_Message::error(__('No tables found in database.'))->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
     exit;
 }
 
@@ -962,5 +962,5 @@ if (!empty($qry_orderby)) {
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_routines.php b/db_routines.php
index 1d4ee0cb40..154e0b22dc 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -9,13 +9,13 @@
 /**
  * Include required files
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/common.lib.php';
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/common.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 if (PMA_DRIZZLE) {
-    include_once './libraries/data_drizzle.inc.php';
+    include_once 'libraries/data_drizzle.inc.php';
 } else {
-    include_once './libraries/data_mysql.inc.php';
+    include_once 'libraries/data_mysql.inc.php';
 }
 
 /**
@@ -31,12 +31,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 /**
  * Include all other files
  */
-require_once './libraries/rte/rte_routines.lib.php';
+require_once 'libraries/rte/rte_routines.lib.php';
 
 /**
  * Do the magic
  */
 $_PMA_RTE = 'RTN';
-require_once './libraries/rte/rte_main.inc.php';
+require_once 'libraries/rte/rte_main.inc.php';
 
 ?>
diff --git a/db_search.php b/db_search.php
index 7c1ec19a6e..a669591b8a 100644
--- a/db_search.php
+++ b/db_search.php
@@ -11,7 +11,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'db_search.js';
 $GLOBALS['js_include'][] = 'sql.js';
@@ -21,7 +21,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 /**
  * Gets some core libraries and send headers
  */
-require './libraries/db_common.inc.php';
+require 'libraries/db_common.inc.php';
 
 /**
  * init
@@ -94,7 +94,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
 $sub_part = '';
 
 if ( $GLOBALS['is_ajax_request'] != true) {
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_info.inc.php';
     echo '<div id="searchresults">';
 }
 
@@ -357,5 +357,5 @@ $alter_select
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_sql.php b/db_sql.php
index 5c64af77b6..23c1c64162 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Runs common work
@@ -19,8 +19,8 @@ $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
 $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 
-require './libraries/db_common.inc.php';
-require_once './libraries/sql_query_form.lib.php';
+require 'libraries/db_common.inc.php';
+require_once 'libraries/sql_query_form.lib.php';
 
 // After a syntax error, we return to this script
 // with the typed query in the textarea.
@@ -45,11 +45,11 @@ foreach ($get_params as $one_get_param) {
  * Gets informations about the database and, if it is empty, move to the
  * "db_structure.php" script where table can be created
  */
-require './libraries/db_info.inc.php';
+require 'libraries/db_info.inc.php';
 if ($num_tables == 0 && empty($db_query_force)) {
     $sub_part   = '';
     $is_info    = true;
-    include './db_structure.php';
+    include 'db_structure.php';
     exit();
 }
 
@@ -61,5 +61,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_structure.php b/db_structure.php
index 8c6806ee66..d1198eb9ca 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'db_structure.js';
@@ -51,33 +51,33 @@ if (empty($is_info)) {
         // -> db_structure.php and if we got an error on the multi submit,
         // we must display it here and not call again mult_submits.inc.php
         if (! isset($error) || false === $error) {
-            include './libraries/mult_submits.inc.php';
+            include 'libraries/mult_submits.inc.php';
         }
         if (empty($message)) {
             $message = PMA_Message::success();
         }
     }
-    include './libraries/db_common.inc.php';
+    include 'libraries/db_common.inc.php';
     $url_query .= '&amp;goto=db_structure.php';
 
     // Gets the database structure
     $sub_part = '_structure';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_info.inc.php';
 
     if (!PMA_DRIZZLE) {
-        include_once './libraries/replication.inc.php';
+        include_once 'libraries/replication.inc.php';
     } else {
         $server_slave_status = false;
     }
 }
 
-require_once './libraries/bookmark.lib.php';
+require_once 'libraries/bookmark.lib.php';
 
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 $db_collation = PMA_getDbCollation($db);
 
 // in a separate file to avoid redeclaration of functions in some code paths
-require_once './libraries/db_structure.lib.php';
+require_once 'libraries/db_structure.lib.php';
 $titles = PMA_buildActionTitles();
 
 // 1. No tables
@@ -86,13 +86,13 @@ if ($num_tables == 0) {
     echo '<p>' . __('No tables found in database') . '</p>' . "\n";
 
     if (empty($db_is_information_schema)) {
-        include './libraries/display_create_table.lib.php';
+        include 'libraries/display_create_table.lib.php';
     } // end if (Create Table dialog)
 
     /**
      * Displays the footer
      */
-    include_once './libraries/footer.inc.php';
+    include_once 'libraries/footer.inc.php';
     exit;
 }
 
@@ -649,11 +649,11 @@ echo PMA_getIcon('b_tblanalyse.png', __('Data Dictionary'), true) . '</a>';
 echo '</p>';
 
 if (empty($db_is_information_schema)) {
-    include './libraries/display_create_table.lib.php';
+    include 'libraries/display_create_table.lib.php';
 } // end if (Create Table dialog)
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_tracking.php b/db_tracking.php
index 6fd9a9c527..76c24fb713 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -7,7 +7,7 @@
 /**
  * Run common work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 //Get some js files needed for Ajax requests
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
@@ -17,13 +17,13 @@ $GLOBALS['js_include'][] = 'db_structure.js';
  * If we are not in an Ajax request, then do the common work and show the links etc.
  */
 if ($GLOBALS['is_ajax_request'] != true) {
-    include './libraries/db_common.inc.php';
+    include 'libraries/db_common.inc.php';
 }
 $url_query .= '&amp;goto=tbl_tracking.php&amp;back=db_tracking.php';
 
 // Get the database structure
 $sub_part = '_structure';
-require './libraries/db_info.inc.php';
+require 'libraries/db_info.inc.php';
 
 // Work to do?
 //  (here, do not use $_REQUEST['db] as it can be crafted)
@@ -48,11 +48,11 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
     echo '<p>' . __('No tables found in database.') . '</p>' . "\n";
 
     if (empty($db_is_information_schema)) {
-        include './libraries/display_create_table.lib.php';
+        include 'libraries/display_create_table.lib.php';
     }
 
     // Display the footer
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
     exit;
 }
 
@@ -61,7 +61,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
 /*
  * Display top menu links
  */
-require_once './libraries/db_links.inc.php';
+require_once 'libraries/db_links.inc.php';
 
 // Prepare statement to get HEAD version
 $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
@@ -230,5 +230,5 @@ if (count($data['ddlog']) > 0) {
 /**
  * Display the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_triggers.php b/db_triggers.php
index 210dbfd07b..a83733807f 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -9,8 +9,8 @@
 /**
  * Include required files
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/common.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/common.lib.php';
 
 /**
  * Include JavaScript libraries
@@ -24,12 +24,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 /**
  * Include all other files
  */
-require_once './libraries/rte/rte_triggers.lib.php';
+require_once 'libraries/rte/rte_triggers.lib.php';
 
 /**
  * Do the magic
  */
 $_PMA_RTE = 'TRI';
-require_once './libraries/rte/rte_main.inc.php';
+require_once 'libraries/rte/rte_main.inc.php';
 
 ?>
diff --git a/enum_editor.php b/enum_editor.php
index 10e0ba30a9..e0da559afc 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -10,9 +10,9 @@
  * @package PhpMyAdmin
  */
 
-require_once './libraries/common.inc.php';
-require_once './libraries/header_http.inc.php';
-require_once './libraries/header_meta_style.inc.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/header_http.inc.php';
+require_once 'libraries/header_meta_style.inc.php';
 ?>
 </head>
 <body>
diff --git a/export.php b/export.php
index 69a2de32b8..8051dbaf8f 100644
--- a/export.php
+++ b/export.php
@@ -8,9 +8,9 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/zip.lib.php';
-require_once './libraries/plugin_interface.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/zip.lib.php';
+require_once 'libraries/plugin_interface.lib.php';
 
 /**
  * Sets globals from all $_POST (in export.php only)
@@ -25,7 +25,7 @@ PMA_checkParameters(array('what', 'export_type'));
 
 // Scan plugins
 $export_list = PMA_getPlugins(
-    './libraries/export/',
+    'libraries/export/',
     array(
         'export_type' => $export_type,
         'single_table' => isset($single_table)));
@@ -84,16 +84,16 @@ if ($_REQUEST['output_format'] == 'astext') {
 // Does export require to be into file?
 if (isset($export_list[$type]['force_file']) && ! $asfile) {
     $message = PMA_Message::error(__('Selected export type has to be saved in file!'));
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     if ($export_type == 'server') {
         $active_page = 'server_export.php';
-        include './server_export.php';
+        include 'server_export.php';
     } elseif ($export_type == 'database') {
         $active_page = 'db_export.php';
-        include './db_export.php';
+        include 'db_export.php';
     } else {
         $active_page = 'tbl_export.php';
-        include './tbl_export.php';
+        include 'tbl_export.php';
     }
     exit();
 }
@@ -116,7 +116,7 @@ if ($export_type == 'server') {
 }
 
 // Get the functions specific to the export type
-require './libraries/export/' . PMA_securePath($type) . '.php';
+require 'libraries/export/' . PMA_securePath($type) . '.php';
 
 /**
  * Increase time limit for script execution and initializes some variables
@@ -337,16 +337,16 @@ if ($save_on_server) {
         }
     }
     if (isset($message)) {
-        include_once './libraries/header.inc.php';
+        include_once 'libraries/header.inc.php';
         if ($export_type == 'server') {
             $active_page = 'server_export.php';
-            include './server_export.php';
+            include 'server_export.php';
         } elseif ($export_type == 'database') {
             $active_page = 'db_export.php';
-            include './db_export.php';
+            include 'db_export.php';
         } else {
             $active_page = 'tbl_export.php';
-            include './tbl_export.php';
+            include 'tbl_export.php';
         }
         exit();
     }
@@ -371,14 +371,14 @@ if (!$save_on_server) {
             $num_tables = count($tables);
             if ($num_tables == 0) {
                 $message = PMA_Message::error(__('No tables found in database.'));
-                include_once './libraries/header.inc.php';
+                include_once 'libraries/header.inc.php';
                 $active_page = 'db_export.php';
-                include './db_export.php';
+                include 'db_export.php';
                 exit();
             }
         }
         $backup_cfgServer = $cfg['Server'];
-        include_once './libraries/header.inc.php';
+        include_once 'libraries/header.inc.php';
         $cfg['Server'] = $backup_cfgServer;
         unset($backup_cfgServer);
         echo "\n" . '<div align="' . $cell_align_left . '">' . "\n";
@@ -435,7 +435,7 @@ do {
         $cfgRelation = PMA_getRelationsParam();
     }
     if ($do_mime) {
-        include_once './libraries/transformations.lib.php';
+        include_once 'libraries/transformations.lib.php';
     }
 
     // Include dates in export?
@@ -620,16 +620,16 @@ do {
 // End of fake loop
 
 if ($save_on_server && isset($message)) {
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     if ($export_type == 'server') {
         $active_page = 'server_export.php';
-        include './server_export.php';
+        include 'server_export.php';
     } elseif ($export_type == 'database') {
         $active_page = 'db_export.php';
-        include './db_export.php';
+        include 'db_export.php';
     } else {
         $active_page = 'tbl_export.php';
-        include './tbl_export.php';
+        include 'tbl_export.php';
     }
     exit();
 }
@@ -674,16 +674,16 @@ if (!empty($asfile)) {
             $message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
         }
 
-        include_once './libraries/header.inc.php';
+        include_once 'libraries/header.inc.php';
         if ($export_type == 'server') {
             $active_page = 'server_export.php';
-            include_once './server_export.php';
+            include_once 'server_export.php';
         } elseif ($export_type == 'database') {
             $active_page = 'db_export.php';
-            include_once './db_export.php';
+            include_once 'db_export.php';
         } else {
             $active_page = 'tbl_export.php';
-            include_once './tbl_export.php';
+            include_once 'tbl_export.php';
         }
         exit();
     } else {
@@ -724,6 +724,6 @@ if (!empty($asfile)) {
 //]]>
 </script>
 <?php
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 } // end if
 ?>
diff --git a/file_echo.php b/file_echo.php
index d3391fcbc0..d3f7f4a6e2 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -7,7 +7,7 @@
  * @package PhpMyAdmin
  */
 
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /* For chart exporting */
 if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 6fb2436bb6..18cb6e0dca 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,11 +1,11 @@
 <?php
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
-    include_once './libraries/header_http.inc.php';
-    include_once './libraries/header_meta_style.inc.php';
+    include_once 'libraries/header_http.inc.php';
+    include_once 'libraries/header_meta_style.inc.php';
 }
-require_once './libraries/gis/pma_gis_factory.php';
-require_once './libraries/gis_visualization.lib.php';
+require_once 'libraries/gis/pma_gis_factory.php';
+require_once 'libraries/gis_visualization.lib.php';
 
 // Get data if any posted
 $gis_data = array();
@@ -336,6 +336,6 @@ if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/import.php b/import.php
index 95561557a1..7179fd093b 100644
--- a/import.php
+++ b/import.php
@@ -9,8 +9,8 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require_once './libraries/common.inc.php';
-//require_once './libraries/display_import_functions.lib.php';
+require_once 'libraries/common.inc.php';
+//require_once 'libraries/display_import_functions.lib.php';
 
 if (isset($_REQUEST['show_as_php'])) {
     $GLOBALS['show_as_php'] = $_REQUEST['show_as_php'];
@@ -82,7 +82,7 @@ if (!empty($sql_query)) {
 // upload limit has been reached, let's assume the second possibility.
 ;
 if ($_POST == array() && $_GET == array()) {
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     $message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
     $message->addParam('[a@./Documentation.html#faq1_16@_blank]');
     $message->addParam('[/a]');
@@ -92,7 +92,7 @@ if ($_POST == array() && $_GET == array()) {
     $_SESSION['Import_message']['go_back_url'] = $goto;
 
     $message->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 
 /**
@@ -119,7 +119,7 @@ PMA_checkParameters(array('import_type', 'format'));
 $format = PMA_securePath($format);
 
 // Import functions
-require_once './libraries/import.lib.php';
+require_once 'libraries/import.lib.php';
 
 // Create error and goto url
 if ($import_type == 'table') {
@@ -194,7 +194,7 @@ $bookmark_created = false;
 // Bookmark Support: get a query back from bookmark if required
 if (!empty($id_bookmark)) {
     $id_bookmark = (int)$id_bookmark;
-    include_once './libraries/bookmark.lib.php';
+    include_once 'libraries/bookmark.lib.php';
     switch ($action_bookmark) {
         case 0: // bookmarked query that have to be run
             $import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all));
@@ -243,7 +243,7 @@ if (isset($GLOBALS['show_as_php'])) {
 
 // Store the query as a bookmark before executing it if bookmarklabel was given
 if (!empty($bkm_label) && !empty($import_text)) {
-    include_once './libraries/bookmark.lib.php';
+    include_once 'libraries/bookmark.lib.php';
     $bfields = array(
                  'dbase' => $db,
                  'user'  => $cfg['Bookmark']['user'],
@@ -316,7 +316,7 @@ if ($import_file != 'none' && !$error) {
 
     if (!empty($open_basedir)) {
 
-        $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
+        $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
 
         if (is_writable($tmp_subdir)) {
 
@@ -364,7 +364,7 @@ if ($import_file != 'none' && !$error) {
                     /**
                      * Load interface for zip extension.
                      */
-                    include_once './libraries/zip_extension.lib.php';
+                    include_once 'libraries/zip_extension.lib.php';
                     $result = PMA_getZipContents($import_file);
                     if (! empty($result['error'])) {
                         $message = PMA_Message::rawError($result['error']);
@@ -434,13 +434,13 @@ if (!$error && isset($skip)) {
 
 if (!$error) {
     // Check for file existance
-    if (!file_exists('./libraries/import/' . $format . '.php')) {
+    if (!file_exists('libraries/import/' . $format . '.php')) {
         $error = true;
         $message = PMA_Message::error(__('Could not load import plugins, please check your installation!'));
     } else {
         // Do the real import
         $plugin_param = $import_type;
-        include './libraries/import/' . $format . '.php';
+        include 'libraries/import/' . $format . '.php';
     }
 }
 
@@ -504,7 +504,7 @@ if (isset($message)) {
 // (but if the query is too large, in case of an imported file, the parser
 //  can choke on it so avoid parsing)
 if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-    include_once './libraries/parse_analyze.lib.php';
+    include_once 'libraries/parse_analyze.lib.php';
 }
 
 // There was an error?
@@ -524,10 +524,10 @@ if (! empty($last_query_with_results)) {
 }
 
 if ($go_sql) {
-    include './sql.php';
+    include 'sql.php';
 } else {
     $active_page = $goto;
-    include './' . $goto;
+    include '' . $goto;
 }
 exit();
 ?>
diff --git a/import_status.php b/import_status.php
index 1f0e0015a7..e1db636ca6 100644
--- a/import_status.php
+++ b/import_status.php
@@ -5,8 +5,8 @@
  * @package PhpMyAdmin
  */
 
-require_once './libraries/common.inc.php';
-require_once './libraries/display_import_ajax.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/display_import_ajax.lib.php';
 
 /**
  * Sets globals from $_GET
diff --git a/index.php b/index.php
index 62169b763f..9b6ab8a3af 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,7 @@
 /**
  * Gets core libraries and defines some variables
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 // free the session file, for the other frames to be loaded
 session_write_close();
@@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
 
 
 // start output
-require './libraries/header_http.inc.php';
+require 'libraries/header_http.inc.php';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
diff --git a/license.php b/license.php
index b9a9ec8fbf..d076cae49f 100644
--- a/license.php
+++ b/license.php
@@ -12,7 +12,7 @@
 /**
  * Gets core libraries and defines some variables
  */
-require './libraries/common.inc.php';
+require 'libraries/common.inc.php';
 
 /**
  *
diff --git a/main.php b/main.php
index e918482085..a77d8d997e 100644
--- a/main.php
+++ b/main.php
@@ -8,7 +8,7 @@
 /**
  * Gets some core libraries and displays a top message if required
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
@@ -17,7 +17,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 $GLOBALS['db'] = '';
 $GLOBALS['table'] = '';
 $show_query = '1';
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 
 // Any message to display?
 if (! empty($message)) {
@@ -30,9 +30,9 @@ $common_url_query =  PMA_generate_common_url('', '');
 // when $server > 0, a server has been chosen so we can display
 // all MySQL-related information
 if ($server > 0) {
-    include './libraries/server_common.inc.php';
-    include './libraries/StorageEngine.class.php';
-    include './libraries/server_links.inc.php';
+    include 'libraries/server_common.inc.php';
+    include 'libraries/StorageEngine.class.php';
+    include 'libraries/server_links.inc.php';
 
     // Use the verbose name of the server instead of the hostname
     // if a value is set
@@ -71,7 +71,7 @@ if ($server > 0
     if (! $cfg['LeftDisplayServers']
      && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
         echo '<li id="li_select_server">';
-        include_once './libraries/select_server.lib.php';
+        include_once 'libraries/select_server.lib.php';
         PMA_select_server(true, true);
         echo '</li>';
     }
@@ -80,7 +80,7 @@ if ($server > 0
      * Displays the mysql server related links
      */
     if ($server > 0 && !PMA_DRIZZLE) {
-        include_once './libraries/check_user_privileges.lib.php';
+        include_once 'libraries/check_user_privileges.lib.php';
 
         // Logout for advanced authentication
         if ($cfg['Server']['auth_type'] != 'config') {
@@ -93,7 +93,7 @@ if ($server > 0
                 PMA_printListItem(
                     __('Change password'),
                     'li_change_password',
-                    './user_password.php?' . $common_url_query,
+                    'user_password.php?' . $common_url_query,
                     null,
                     null,
                     'change_password_anchor',
@@ -127,7 +127,7 @@ echo '  <ul>';
 // Displays language selection combo
 if (empty($cfg['Lang'])) {
     echo '<li id="li_select_lang">';
-    include_once './libraries/display_select_lang.lib.php';
+    include_once 'libraries/display_select_lang.lib.php';
     PMA_select_language();
     echo '</li>';
 }
@@ -152,7 +152,7 @@ if ($server > 0) {
     echo PMA_printListItem(
         __('More settings'),
         'li_user_preferences',
-        './prefs_manage.php?' . $common_url_query
+        'prefs_manage.php?' . $common_url_query
     );
     echo '</ul>';
 }
@@ -218,7 +218,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
     }
 
     if ($cfg['ShowPhpInfo']) {
-        PMA_printListItem(__('Show PHP information'), 'li_phpinfo', './phpinfo.php?' . $common_url_query);
+        PMA_printListItem(__('Show PHP information'), 'li_phpinfo', 'phpinfo.php?' . $common_url_query);
     }
     echo '  </ul>';
     echo ' </div>';
@@ -312,7 +312,7 @@ if (!empty($_SESSION['auto_blowfish_secret']) &&
  * Check for existence of config directory which should not exist in
  * production environment.
  */
-if (file_exists('./config')) {
+if (file_exists('config')) {
     trigger_error(__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'), E_USER_WARNING);
 }
 
@@ -398,8 +398,8 @@ if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning
  *
  * The data file is created while creating release by ./scripts/remove-incomplete-mo
  */
-if (file_exists('./libraries/language_stats.inc.php')) {
-    include './libraries/language_stats.inc.php';
+if (file_exists('libraries/language_stats.inc.php')) {
+    include 'libraries/language_stats.inc.php';
     /*
      * This message is intentionally not translated, because we're
      * handling incomplete translations here and focus on english
@@ -457,5 +457,5 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/navigation.php b/navigation.php
index 34b279f20d..9b809db697 100644
--- a/navigation.php
+++ b/navigation.php
@@ -9,7 +9,7 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * finish and cleanup navigation.php script execution, only to be used in navigation.php
@@ -22,8 +22,8 @@ function PMA_exitNavigationFrame()
     exit;
 }
 
-require_once './libraries/common.lib.php';
-require_once './libraries/RecentTable.class.php';
+require_once 'libraries/common.lib.php';
+require_once 'libraries/RecentTable.class.php';
 
 /**
  * Check if it is an ajax request to reload the recent tables list.
@@ -58,7 +58,7 @@ if (empty($_SESSION['debug'])) {
 /**
  * the output compression library
  */
-require_once './libraries/ob.lib.php';
+require_once 'libraries/ob.lib.php';
 
 PMA_outBufferPre();
 
@@ -80,7 +80,7 @@ $cfgRelation = PMA_getRelationsParam();
  * For re-usability, moved http-headers to a seperate file.
  * It can now be included by libraries/header.inc.php, querywindow.php.
  */
-require_once './libraries/header_http.inc.php';
+require_once 'libraries/header_http.inc.php';
 
 /*
  * Displays the frame
@@ -158,7 +158,7 @@ require_once './libraries/header_http.inc.php';
 
 <body id="body_leftFrame">
 <?php
-require './libraries/navigation_header.inc.php';
+require 'libraries/navigation_header.inc.php';
 
 // display recently used tables
 if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
@@ -405,8 +405,8 @@ function PMA_displayDbList($ext_dblist, $offset, $count)
                     title="<?php echo htmlspecialchars($db['comment']); ?>"
                     onclick="
                         if (! toggle('<?php echo $element_counter; ?>', true))
-                            window.parent.goTo('./navigation.php?<?php echo $common_url_query; ?>');
-                        window.parent.goTo('./<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
+                            window.parent.goTo('navigation.php?<?php echo $common_url_query; ?>');
+                        window.parent.goTo('<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
                             . '?' . $common_url_query; ?>', 'main');
                         return false;">
                     <?php
@@ -540,8 +540,8 @@ function PMA_displayTableList($tables, $visible = false,
                 target="_parent"
                 onclick="
                     if (! toggle('<?php echo $element_counter; ?>', true))
-                        window.parent.goTo('./navigation.php?<?php echo $common_url_query; ?>');
-                    window.parent.goTo('./<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
+                        window.parent.goTo('navigation.php?<?php echo $common_url_query; ?>');
+                    window.parent.goTo('<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
                         . '?' . $common_url_query; ?>', 'main');
                     return false;">
                 <?php
diff --git a/phpinfo.php b/phpinfo.php
index 2d47abf465..860081c04d 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -8,7 +8,7 @@
 /**
  * Gets core libraries and defines some variables
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 
 /**
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index 4fd7ce260c..7aa8aec9d7 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -12,8 +12,8 @@
 define('PMA_FRAME', (! empty($_REQUEST['js_frame']) && is_string($_REQUEST['js_frame'])) ? $_REQUEST['js_frame'] : 'right');
 
 define('PMA_MINIMUM_COMMON', true);
-require_once './libraries/common.inc.php';
-require_once './libraries/sqlparser.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/sqlparser.lib.php';
 
 // MSIE 6 (at least some unpatched versions) has problems loading CSS
 // when zlib_compression is on
diff --git a/pmd_display_field.php b/pmd_display_field.php
index 34c4d8717e..f673aaed6b 100644
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -7,7 +7,7 @@
 /**
  *
  */
-require_once './libraries/pmd_common.php';
+require_once 'libraries/pmd_common.php';
 
 
 $table = $T;
diff --git a/pmd_general.php b/pmd_general.php
index 7f62bf227c..8b0e7c0aa4 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -7,9 +7,9 @@
 /**
  *
  */
-require_once './libraries/pmd_common.php';
-require './libraries/db_common.inc.php';
-require './libraries/db_info.inc.php';
+require_once 'libraries/pmd_common.php';
+require 'libraries/db_common.inc.php';
+require 'libraries/db_info.inc.php';
 
 $tab_column       = get_tab_info();
 $script_tabs      = get_script_tabs();
@@ -22,7 +22,7 @@ $params = array('lang' => $GLOBALS['lang']);
 if (isset($GLOBALS['db'])) {
     $params['db'] = $GLOBALS['db'];
 }
-require_once './libraries/header_scripts.inc.php';
+require_once 'libraries/header_scripts.inc.php';
 ?>
     <script type="text/javascript">
     // <![CDATA[
diff --git a/pmd_pdf.php b/pmd_pdf.php
index 6a47bc2d2f..e1794f8c54 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -5,7 +5,7 @@
  * @package PhpMyAdmin-Designer
  */
 
-require_once './libraries/pmd_common.php';
+require_once 'libraries/pmd_common.php';
 
 /**
  * If called directly from the designer, first save the positions
@@ -58,7 +58,7 @@ if (isset($mode)) {
 }
 
 // no need to use pmd/styles
-require_once './libraries/header_meta_style.inc.php';
+require_once 'libraries/header_meta_style.inc.php';
 ?>
 </head>
 <body>
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index f0577ca4ea..42d128f0cf 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/pmd_common.php';
+require_once 'libraries/pmd_common.php';
 $die_save_pos = 0;
 require_once 'pmd_save_pos.php';
 extract($_POST, EXTR_SKIP);
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index 24ced45192..ca51555432 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/pmd_common.php';
+require_once 'libraries/pmd_common.php';
 extract($_POST, EXTR_SKIP);
 extract($_GET, EXTR_SKIP);
 $die_save_pos = 0;
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 10a6e8a640..1e81a55297 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/pmd_common.php';
+require_once 'libraries/pmd_common.php';
 
 $cfgRelation = PMA_getRelationsParam();
 
diff --git a/prefs_forms.php b/prefs_forms.php
index 1f6fb79c93..08f2ec6e79 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -9,14 +9,14 @@
 /**
  * Gets some core libraries and displays a top message if required
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/user_preferences.lib.php';
-require_once './libraries/config/config_functions.lib.php';
-require_once './libraries/config/messages.inc.php';
-require_once './libraries/config/ConfigFile.class.php';
-require_once './libraries/config/Form.class.php';
-require_once './libraries/config/FormDisplay.class.php';
-require './libraries/config/user_preferences.forms.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/user_preferences.lib.php';
+require_once 'libraries/config/config_functions.lib.php';
+require_once 'libraries/config/messages.inc.php';
+require_once 'libraries/config/ConfigFile.class.php';
+require_once 'libraries/config/Form.class.php';
+require_once 'libraries/config/FormDisplay.class.php';
+require 'libraries/config/user_preferences.forms.php';
 
 PMA_userprefs_pageinit();
 
@@ -66,8 +66,8 @@ if ($form_display->process(false) && !$form_display->hasErrors()) {
 
 // display forms
 $GLOBALS['js_include'][] = 'config.js';
-require './libraries/header.inc.php';
-require './libraries/user_preferences.inc.php';
+require 'libraries/header.inc.php';
+require 'libraries/user_preferences.inc.php';
 if ($error) {
     $error->display();
 }
@@ -85,5 +85,5 @@ $form_display->display(true, true);
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/prefs_manage.php b/prefs_manage.php
index c21aa55539..136aa5fad7 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -9,14 +9,14 @@
 /**
  * Gets some core libraries and displays a top message if required
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/user_preferences.lib.php';
-require_once './libraries/config/config_functions.lib.php';
-require_once './libraries/config/messages.inc.php';
-require_once './libraries/config/ConfigFile.class.php';
-require_once './libraries/config/Form.class.php';
-require_once './libraries/config/FormDisplay.class.php';
-require './libraries/config/user_preferences.forms.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/user_preferences.lib.php';
+require_once 'libraries/config/config_functions.lib.php';
+require_once 'libraries/config/messages.inc.php';
+require_once 'libraries/config/ConfigFile.class.php';
+require_once 'libraries/config/Form.class.php';
+require_once 'libraries/config/FormDisplay.class.php';
+require 'libraries/config/user_preferences.forms.php';
 
 PMA_userprefs_pageinit();
 
@@ -51,7 +51,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         // before opening it. The doc explains how to create the "./tmp"
         // directory
         if (!empty($open_basedir)) {
-            $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
+            $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
             if (is_writable($tmp_subdir)) {
                 $import_file_new = tempnam($tmp_subdir, 'prefs');
                 if (move_uploaded_file($import_file, $import_file_new)) {
@@ -105,8 +105,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
         }
         if (!$all_ok) {
             // mimic original form and post json in a hidden field
-            include './libraries/header.inc.php';
-            include './libraries/user_preferences.inc.php';
+            include 'libraries/header.inc.php';
+            include 'libraries/user_preferences.inc.php';
             $msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.'));
             $msg->display();
             echo '<div class="config-form">';
@@ -128,7 +128,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
                 <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
             </form>
             <?php
-            include './libraries/footer.inc.php';
+            include 'libraries/footer.inc.php';
             return;
         }
 
@@ -209,8 +209,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 }
 
 $GLOBALS['js_include'][] = 'config.js';
-require './libraries/header.inc.php';
-require './libraries/user_preferences.inc.php';
+require 'libraries/header.inc.php';
+require 'libraries/user_preferences.inc.php';
 if ($error) {
     if (!$error instanceof PMA_Message) {
         $error = PMA_Message::error($error);
@@ -264,7 +264,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
             </form>
         </div>
         <?php
-        if (file_exists('./setup/index.php')) {
+        if (file_exists('setup/index.php')) {
             // show only if setup script is available, allows to disable this message
             // by simply removing setup directory
         ?>
@@ -331,5 +331,5 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/querywindow.php b/querywindow.php
index c9ae98ca3b..22df73bbf7 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -10,19 +10,19 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $is_superuser = PMA_isSuperuser();
 
 /**
  * Gets a core script and starts output buffering work
  */
-require_once './libraries/sql_query_form.lib.php';
+require_once 'libraries/sql_query_form.lib.php';
 
 /**
  * starts output buffering if requested and supported
  */
-require_once './libraries/ob.lib.php';
+require_once 'libraries/ob.lib.php';
 PMA_outBufferPre();
 
 /**
@@ -33,7 +33,7 @@ $cfgRelation = PMA_getRelationsParam();
 /**
  * load bookmark support
  */
-require_once './libraries/bookmark.lib.php';
+require_once 'libraries/bookmark.lib.php';
 
 $querydisplay_tabs = array(
     'sql',
@@ -95,11 +95,11 @@ if ($no_js) {
     // ... we redirect to appropriate query sql page
     // works only full if $db and $table is also stored/grabbed from $_COOKIE
     if (strlen($table)) {
-        include './tbl_sql.php';
+        include 'tbl_sql.php';
     } elseif (strlen($db)) {
-        include './db_sql.php';
+        include 'db_sql.php';
     } else {
-        include './server_sql.php';
+        include 'server_sql.php';
     }
     exit;
 }
@@ -145,9 +145,9 @@ if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
 /**
  * start HTTP/HTML output
  */
-require_once './libraries/header_http.inc.php';
-require_once './libraries/header_meta_style.inc.php';
-require_once './libraries/header_scripts.inc.php';
+require_once 'libraries/header_http.inc.php';
+require_once 'libraries/header_meta_style.inc.php';
+require_once 'libraries/header_scripts.inc.php';
 ?>
 </head>
 
diff --git a/schema_edit.php b/schema_edit.php
index b0816480ba..fe1349285d 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -9,21 +9,21 @@
  * Gets some core libraries
  */
 
-require_once './libraries/common.inc.php';
-require_once './libraries/db_common.inc.php';
-require './libraries/StorageEngine.class.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/db_common.inc.php';
+require 'libraries/StorageEngine.class.php';
 
 $active_page = 'db_operations.php';
-require_once './libraries/db_common.inc.php';
+require_once 'libraries/db_common.inc.php';
 $url_query .= '&amp;goto=schema_edit.php';
-require_once './libraries/db_info.inc.php';
+require_once 'libraries/db_info.inc.php';
 
 /**
  * Includ settings for relation stuff
  * get all variables needed for exporting relational schema
  * in $cfgRelation
  */
-require_once './libraries/relation.lib.php';
+require_once 'libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**
@@ -37,24 +37,24 @@ $cfgRelation = PMA_getRelationsParam();
 if (! $cfgRelation['relwork']) {
     echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n"
          . PMA_showDocu('relation') . "\n";
-    include_once './libraries/footer.inc.php';
+    include_once 'libraries/footer.inc.php';
 }
 
 if (! $cfgRelation['displaywork']) {
     echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n"
          . PMA_showDocu('table_info') . "\n";
-    include_once './libraries/footer.inc.php';
+    include_once 'libraries/footer.inc.php';
 }
 
 if (! isset($cfgRelation['table_coords'])) {
     echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n"
          . PMA_showDocu('table_coords') . "\n";
-    include_once './libraries/footer.inc.php';
+    include_once 'libraries/footer.inc.php';
 }
 if (! isset($cfgRelation['pdf_pages'])) {
     echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '<br />' . "\n"
          . PMA_showDocu('pdf_pages') . "\n";
-    include_once './libraries/footer.inc.php';
+    include_once 'libraries/footer.inc.php';
 }
 
 if ($cfgRelation['pdfwork']) {
@@ -64,7 +64,7 @@ if ($cfgRelation['pdfwork']) {
     * so, user can interact with it and perform export of relations schema
     */
 
-    include_once './libraries/schema/User_Schema.class.php';
+    include_once 'libraries/schema/User_Schema.class.php';
     $user_schema = new PMA_User_Schema();
 
     /**
@@ -128,5 +128,5 @@ if ($cfgRelation['pdfwork']) {
  * Displays the footer
  */
 echo "\n";
-require_once './libraries/footer.inc.php';
+require_once 'libraries/footer.inc.php';
 ?>
diff --git a/schema_export.php b/schema_export.php
index 31a1264813..193eac1965 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -8,19 +8,19 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require './libraries/StorageEngine.class.php';
+require_once 'libraries/common.inc.php';
+require 'libraries/StorageEngine.class.php';
 
 /**
  * Include settings for relation stuff
  * get all variables needed for exporting relational schema
  * in $cfgRelation
  */
-require_once './libraries/relation.lib.php';
+require_once 'libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
-require_once './libraries/transformations.lib.php';
-require_once './libraries/Index.class.php';
+require_once 'libraries/transformations.lib.php';
+require_once 'libraries/Index.class.php';
 require_once "libraries/schema/Export_Relation_Schema.class.php";
 
 /**
@@ -35,7 +35,7 @@ if (!isset($export_type) || !preg_match('/^[a-zA-Z]+$/', $export_type)) {
 PMA_DBI_select_db($db);
 
 $path = PMA_securePath(ucfirst($export_type));
-if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) {
+if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) {
     PMA_Export_Relation_Schema::dieSchema($_POST['chpage'], $export_type, __('File doesn\'t exist'));
 }
 require "libraries/schema/".$path."_Relation_Schema.class.php";
diff --git a/server_binlog.php b/server_binlog.php
index 7d902a8fff..1cbe7bbf29 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -9,17 +9,17 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work, provides $binary_logs
  */
-require_once './libraries/server_common.inc.php';
+require_once 'libraries/server_common.inc.php';
 
 /**
  * Displays the links
  */
-require_once './libraries/server_links.inc.php';
+require_once 'libraries/server_links.inc.php';
 
 $url_params = array();
 
@@ -213,6 +213,6 @@ while ($value = PMA_DBI_fetch_assoc($result)) {
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_collations.php b/server_collations.php
index b229b5cc3a..8c6c8c906d 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -15,18 +15,18 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 
 /**
@@ -42,7 +42,7 @@ echo '<h2>' . "\n"
 /**
  * Includes the required charset library
  */
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 
 /**
@@ -95,6 +95,6 @@ unset($table_row_count);
 echo '</table>' . "\n"
    . '</div>' . "\n";
 
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_databases.php b/server_databases.php
index 4db42d9243..859c462286 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -8,16 +8,16 @@
 /**
  * Does the common work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 if (!PMA_DRIZZLE) {
-    include_once './libraries/replication.inc.php';
+    include_once 'libraries/replication.inc.php';
 } else {
     $replication_types = array();
     $replication_info = null;
 }
-require './libraries/build_html_for_db.lib.php';
+require 'libraries/build_html_for_db.lib.php';
 
 /**
  * Sets globals from $_POST
@@ -88,7 +88,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
         if (isset($_REQUEST['selected_dbs'])) {
             $selected_db = $_REQUEST['selected_dbs'];
         }
-        include './libraries/mult_submits.inc.php';
+        include 'libraries/mult_submits.inc.php';
         unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
         if (empty($message)) {
             $message = PMA_Message::success(__('%s databases have been dropped successfully.'));
@@ -105,7 +105,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 
 /**
@@ -123,7 +123,7 @@ echo '<h2>' . "\n"
  */
 if ($cfg['ShowCreateDb']) {
     echo '<ul><li id="li_create_database">' . "\n";
-    include './libraries/display_create_database.lib.php';
+    include 'libraries/display_create_database.lib.php';
     echo '    </li>' . "\n";
     echo '</ul>' . "\n";
 }
@@ -302,6 +302,6 @@ unset($databases_count);
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_engines.php b/server_engines.php
index b961ed5421..3e51819554 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -17,19 +17,19 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
-require './libraries/StorageEngine.class.php';
+require 'libraries/server_common.inc.php';
+require 'libraries/StorageEngine.class.php';
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 /**
  * Did the user request information about a certain storage engine?
@@ -141,6 +141,6 @@ if (empty($_REQUEST['engine'])
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_export.php b/server_export.php
index e80f2cdcf1..91c8841422 100644
--- a/server_export.php
+++ b/server_export.php
@@ -8,14 +8,14 @@
 /**
  * Does the common work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'export.js';
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 $export_page_title = __('View dump (schema) of databases') . "\n";
 $checkall_url = 'server_export.php?'
@@ -55,11 +55,11 @@ $multi_values .= "\n";
 $multi_values .= '</select></div>';
 
 $export_type = 'server';
-require_once './libraries/display_export.lib.php';
+require_once 'libraries/display_export.lib.php';
 
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/server_import.php b/server_import.php
index ddc49e8936..c1028cdf2f 100644
--- a/server_import.php
+++ b/server_import.php
@@ -8,26 +8,26 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'import.js';
 
 /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 $import_type = 'server';
-require './libraries/display_import.lib.php';
+require 'libraries/display_import.lib.php';
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
 
diff --git a/server_plugins.php b/server_plugins.php
index 7aa0516937..1a4ac02403 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -16,7 +16,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * JS includes
@@ -29,13 +29,13 @@ $GLOBALS['js_include'][] = 'server_plugins.js';
 /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 /**
  * Displays the sub-page heading
@@ -203,6 +203,6 @@ pma_theme_image = '<?php echo $GLOBALS['pmaThemeImage']; ?>';
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_privileges.php b/server_privileges.php
index f234c07e34..9798ce8035 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
@@ -20,7 +20,7 @@ $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
 $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 $_add_user_error = false;
 
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 if ($GLOBALS['cfg']['AjaxEnable']) {
     $conditional_class = 'ajax';
@@ -172,13 +172,13 @@ if (isset($dbname)) {
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    include './libraries/server_links.inc.php';
+    include 'libraries/server_links.inc.php';
     echo '<h2>' . "\n"
        . PMA_getIcon('b_usrlist.png')
        . __('Privileges') . "\n"
        . '</h2>' . "\n";
     PMA_Message::error(__('No Privileges'))->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 
 $random_n = mt_rand(0, 1000000); // a random number that will be appended to the id of the user forms
@@ -1611,10 +1611,10 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
 
     // Gets the database structure
     $sub_part = '_structure';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_info.inc.php';
     echo "\n";
 } else {
-    include './libraries/server_links.inc.php';
+    include 'libraries/server_links.inc.php';
 }
 
 
@@ -1985,7 +1985,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         if ($user_does_not_exists) {
             PMA_Message::error(__('The selected user was not found in the privilege table.'))->display();
             PMA_displayLoginInformationFields();
-            //require './libraries/footer.inc.php';
+            //require 'libraries/footer.inc.php';
         }
 
         echo '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n";
@@ -2302,7 +2302,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         }
 
         if (! isset($dbname) && ! $user_does_not_exists) {
-            include_once './libraries/display_change_password.lib.php';
+            include_once 'libraries/display_change_password.lib.php';
 
             echo '<form action="server_privileges.php" method="post" onsubmit="return checkPassword(this);">' . "\n"
                . PMA_generate_common_hidden_inputs('', '')
@@ -2540,6 +2540,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
  * Displays the footer
  */
 echo "\n\n";
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/server_replication.php b/server_replication.php
index dc209d232b..9866577b1c 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
@@ -16,22 +16,22 @@ require_once './libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'server_privileges.js';
 $GLOBALS['js_include'][] = 'replication.js';
 
-require './libraries/server_common.inc.php';
-require './libraries/replication.inc.php';
-require './libraries/replication_gui.lib.php';
-require_once './libraries/server_synchronize.lib.php';
+require 'libraries/server_common.inc.php';
+require 'libraries/replication.inc.php';
+require 'libraries/replication_gui.lib.php';
+require_once 'libraries/server_synchronize.lib.php';
 
 /**
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    include './libraries/server_links.inc.php';
+    include 'libraries/server_links.inc.php';
     echo '<h2>' . "\n"
         . PMA_getIcon('s_replication.png')
         . __('Replication') . "\n"
         . '</h2>' . "\n";
     PMA_Message::error(__('No Privileges'))->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 
 /**
@@ -184,7 +184,7 @@ if (isset($GLOBALS['sr_take_action'])) {
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 echo '<div id="replication">';
 echo ' <h2>';
@@ -264,7 +264,7 @@ if (isset($GLOBALS['mr_configure'])) {
     echo ' </form>';
     echo '</fieldset>';
 
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
     exit;
 }
 
@@ -396,5 +396,5 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
 if (isset($GLOBALS['sl_configure'])) {
     PMA_replication_gui_changemaster("slave_changemaster");
 }
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/server_sql.php b/server_sql.php
index 56aca7ac3d..bf5d7aa4db 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
@@ -19,14 +19,14 @@ $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
 $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 
-require_once './libraries/server_common.inc.php';
-require_once './libraries/sql_query_form.lib.php';
+require_once 'libraries/server_common.inc.php';
+require_once 'libraries/sql_query_form.lib.php';
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 
 /**
@@ -37,5 +37,5 @@ PMA_sqlQueryForm();
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/server_status.php b/server_status.php
index 24dcb9b08e..6cdd5c6228 100644
--- a/server_status.php
+++ b/server_status.php
@@ -19,7 +19,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
     $GLOBALS['is_header_sent'] = true;
 }
 
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Ajax request
@@ -409,8 +409,8 @@ if (PMA_DRIZZLE) {
     $server_master_status = false;
     $server_slave_status = false;
 } else {
-    include_once './libraries/replication.inc.php';
-    include_once './libraries/replication_gui.lib.php';
+    include_once 'libraries/replication.inc.php';
+    include_once 'libraries/replication_gui.lib.php';
 }
 
 /**
@@ -757,14 +757,14 @@ PMA_AddJSVar(
  /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 
 
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 ?>
 <div id="serverstatus">
@@ -1801,5 +1801,5 @@ function cleanDeprecated(&$server_status)
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/server_synchronize.php b/server_synchronize.php
index d5a4abf99c..029202e494 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -9,18 +9,18 @@
 /**
 *
 */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Does the common work
  */
 $GLOBALS['js_include'][] = 'server_synchronize.js';
-require_once './libraries/server_common.inc.php';
+require_once 'libraries/server_common.inc.php';
 
 /**
 * Contains all the functions specific to synchronization
 */
-require './libraries/server_synchronize.lib.php';
+require 'libraries/server_synchronize.lib.php';
 
 /**
  * Increases the time limit up to the configured maximum
@@ -30,7 +30,7 @@ require './libraries/server_synchronize.lib.php';
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 /**
 * Enables warnings on the page
@@ -1398,5 +1398,5 @@ if (! isset($_REQUEST['submit_connect'])
  /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/server_variables.php b/server_variables.php
index 1e7d7076f4..fb5e3b5679 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -12,7 +12,7 @@
 if (! defined('PMA_NO_VARIABLES_IMPORT')) {
     define('PMA_NO_VARIABLES_IMPORT', true);
 }
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'server_variables.js';
 
@@ -24,12 +24,12 @@ PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false);
 /**
  * Does the common work
  */
-require './libraries/server_common.inc.php';
+require 'libraries/server_common.inc.php';
 
 /**
  * Required to display documentation links
  */
-require './libraries/server_variables_doc.php';
+require 'libraries/server_variables_doc.php';
 
 /**
  * Ajax request
@@ -88,7 +88,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
 /**
  * Displays the links
  */
-require './libraries/server_links.inc.php';
+require 'libraries/server_links.inc.php';
 
 
 /**
@@ -177,6 +177,6 @@ function formatVariable($name, $value)
 /**
  * Sends the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 ?>
diff --git a/show_config_errors.php b/show_config_errors.php
index d3f9dbee71..f130416265 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -10,7 +10,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
 PMA_no_cache_header();
 header('Content-Type: text/html; charset=utf-8');
 
-require './libraries/vendor_config.php';
+require 'libraries/vendor_config.php';
 
 error_reporting(E_ALL);
 /**
diff --git a/sql.php b/sql.php
index 7bc9a4656c..95b28b0067 100644
--- a/sql.php
+++ b/sql.php
@@ -9,10 +9,10 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/Table.class.php';
-require_once './libraries/check_user_privileges.lib.php';
-require_once './libraries/bookmark.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/Table.class.php';
+require_once 'libraries/check_user_privileges.lib.php';
+require_once 'libraries/bookmark.lib.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
@@ -74,7 +74,7 @@ if (isset($_SESSION['profiling'])) {
 // Security checkings
 if (! empty($goto)) {
     $is_gotofile     = preg_replace('@^([^?]+).*$@s', '\\1', $goto);
-    if (! @file_exists('./' . $is_gotofile)) {
+    if (! @file_exists('' . $is_gotofile)) {
         unset($goto);
     } else {
         $is_gotofile = ($is_gotofile == $goto);
@@ -237,7 +237,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
 // Default to browse if no query set and we have table
 // (needed for browsing from DefaultTabTable)
 if (empty($sql_query) && strlen($table) && strlen($db)) {
-    include_once './libraries/bookmark.lib.php';
+    include_once 'libraries/bookmark.lib.php';
     $book_sql_query = PMA_Bookmark_get(
         $db,
         '\'' . PMA_sqlAddSlashes($table) . '\'',
@@ -281,11 +281,11 @@ if (! defined('PMA_CHK_DROP')
     && $is_drop_database
     && ! $is_superuser
 ) {
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     PMA_mysqlDie(__('"DROP DATABASE" statements are disabled.'), '', '', $err_url);
 } // end if
 
-require_once './libraries/display_tbl.lib.php';
+require_once 'libraries/display_tbl.lib.php';
 PMA_displayTable_checkConfigParams();
 
 /**
@@ -309,7 +309,7 @@ if (isset($store_bkm)) {
 /**
  * Parse and analyze the query
  */
-require_once './libraries/parse_analyze.lib.php';
+require_once 'libraries/parse_analyze.lib.php';
 
 /**
  * Sets or modifies the $goto variable if required
@@ -334,7 +334,7 @@ if (isset($btnDrop) && $btnDrop == __('No')) {
             $table = '';
         }
         $active_page = $goto;
-        include './' . PMA_securePath($goto);
+        include '' . PMA_securePath($goto);
     } else {
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&amp;', '&', $goto));
     }
@@ -366,7 +366,7 @@ if (! $cfg['Confirm']
 
 if ($do_confirm) {
     $stripped_sql_query = $sql_query;
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     if ($is_drop_database) {
         echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>';
     }
@@ -397,7 +397,7 @@ if ($do_confirm) {
     /**
      * Displays the footer and exit
      */
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 } // end if $do_confirm
 
 
@@ -560,7 +560,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
             /**
              * Go to target path.
              */
-            include './' . PMA_securePath($goto);
+            include '' . PMA_securePath($goto);
         } else {
             $full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
                           ? $err_url . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query)
@@ -697,7 +697,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
         /**
          * Cleanup relations.
          */
-        include_once './libraries/relation_cleanup.lib.php';
+        include_once 'libraries/relation_cleanup.lib.php';
 
         if (strlen($table) && strlen($db)) {
             PMA_relationsCleanupTable($db, $table);
@@ -710,7 +710,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
 
     // If a column gets dropped, do relation magic.
     if (isset($dropped_column) && strlen($db) && strlen($table) && ! empty($dropped_column)) {
-        include_once './libraries/relation_cleanup.lib.php';
+        include_once 'libraries/relation_cleanup.lib.php';
         PMA_relationsCleanupColumn($db, $table, $dropped_column);
         // to refresh the list of indexes (Ajax mode)
         $extra_data['indexes_list'] = PMA_Index::getView($table, $db);
@@ -805,10 +805,10 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         }
         // Loads to target script
         if ($goto != 'main.php') {
-            include_once './libraries/header.inc.php';
+            include_once 'libraries/header.inc.php';
         }
         $active_page = $goto;
-        include './' . $goto;
+        include '' . $goto;
     } else {
         // avoid a redirect loop when last record was deleted
         if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {
@@ -862,7 +862,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         unset($show_query);
     }
     if (isset($printview) && $printview == '1') {
-        include_once './libraries/header_printview.inc.php';
+        include_once 'libraries/header_printview.inc.php';
     } else {
 
         $GLOBALS['js_include'][] = 'functions.js';
@@ -873,19 +873,19 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
 
         if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
             if (strlen($table)) {
-                include './libraries/tbl_common.php';
+                include 'libraries/tbl_common.php';
                 $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
-                include './libraries/tbl_info.inc.php';
-                include './libraries/tbl_links.inc.php';
+                include 'libraries/tbl_info.inc.php';
+                include 'libraries/tbl_links.inc.php';
             } elseif (strlen($db)) {
-                include './libraries/db_common.inc.php';
-                include './libraries/db_info.inc.php';
+                include 'libraries/db_common.inc.php';
+                include 'libraries/db_info.inc.php';
             } else {
-                include './libraries/server_common.inc.php';
-                include './libraries/server_links.inc.php';
+                include 'libraries/server_common.inc.php';
+                include 'libraries/server_links.inc.php';
             }
         } else {
-            include_once './libraries/header.inc.php';
+            include_once 'libraries/header.inc.php';
             //we don't need to buffer the output in PMA_showMessage here.
             //set a global variable and check against it in the function
             $GLOBALS['buffer_message'] = false;
@@ -943,7 +943,7 @@ $(document).ready(makeProfilingChart);
 
         echo '</table>' . "\n";
         echo '</div>';
-        //require_once './libraries/chart.lib.php';
+        //require_once 'libraries/chart.lib.php';
         echo '<div id="profilingchart" style="display:none;">';
         //PMA_chart_profiling($profiling_results);
         echo json_encode($chart_json);
@@ -1041,6 +1041,6 @@ $(document).ready(makeProfilingChart);
  * Displays the footer
  */
 if (! isset($_REQUEST['table_maintenance'])) {
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 ?>
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 55a980c95d..e706f789a4 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -8,9 +8,9 @@
 /**
  * Get some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -163,7 +163,7 @@ if (isset($_REQUEST['do_save_data'])) {
 
     if ($result === true) {
         // If comments were sent, enable relation stuff
-        include_once './libraries/transformations.lib.php';
+        include_once 'libraries/transformations.lib.php';
 
         // Update comment table for mime types [MIME]
         if (isset($_REQUEST['field_mimetype'])
@@ -191,7 +191,7 @@ if (isset($_REQUEST['do_save_data'])) {
         }
 
         $active_page = 'tbl_structure.php';
-        include './tbl_structure.php';
+        include 'tbl_structure.php';
     } else {
         PMA_mysqlDie('', '', '', $err_url, false);
         // An error happened while inserting/updating a table definition.
@@ -215,23 +215,23 @@ if ($abort == false) {
     /**
      * Gets tables informations
      */
-    include_once './libraries/tbl_common.php';
-    include_once './libraries/tbl_info.inc.php';
+    include_once 'libraries/tbl_common.php';
+    include_once 'libraries/tbl_info.inc.php';
     /**
      * Displays top menu links
      */
     $active_page = 'tbl_structure.php';
     if ($GLOBALS['is_ajax_request'] != true) {
-        include_once './libraries/tbl_links.inc.php';
+        include_once 'libraries/tbl_links.inc.php';
     }
     /**
      * Display the form
      */
     $action = 'tbl_addfield.php';
-    include_once './libraries/tbl_properties.inc.php';
+    include_once 'libraries/tbl_properties.inc.php';
 
     // Diplays the footer
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 
 ?>
diff --git a/tbl_alter.php b/tbl_alter.php
index c9262ea036..8d219825bf 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -12,9 +12,9 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 
 if (isset($_REQUEST['field'])) {
     $GLOBALS['field'] = $_REQUEST['field'];
@@ -26,8 +26,8 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Gets tables informations
  */
-require_once './libraries/tbl_common.php';
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_common.php';
+require_once 'libraries/tbl_info.inc.php';
 
 $active_page = 'tbl_structure.php';
 
@@ -107,7 +107,7 @@ if (isset($_REQUEST['do_save_data'])) {
         /**
          * If comments were sent, enable relation stuff
          */
-        include_once './libraries/transformations.lib.php';
+        include_once 'libraries/transformations.lib.php';
 
         // updaet field names in relation
         if (isset($_REQUEST['field_orig']) && is_array($_REQUEST['field_orig'])) {
@@ -140,7 +140,7 @@ if (isset($_REQUEST['do_save_data'])) {
         }
 
         $active_page = 'tbl_structure.php';
-        include './tbl_structure.php';
+        include 'tbl_structure.php';
     } else {
         PMA_mysqlDie('', '', '', $err_url, false);
         // An error happened while inserting/updating a table definition.
@@ -161,7 +161,7 @@ if (isset($_REQUEST['do_save_data'])) {
  */
 if ($abort == false) {
     if ($_REQUEST['ajax_request'] != true) {
-        include_once './libraries/tbl_links.inc.php';
+        include_once 'libraries/tbl_links.inc.php';
     }
 
     if (! isset($selected)) {
@@ -201,12 +201,12 @@ if ($abort == false) {
     /**
      * Form for changing properties.
      */
-    include './libraries/tbl_properties.inc.php';
+    include 'libraries/tbl_properties.inc.php';
 }
 
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_change.php b/tbl_change.php
index 017f1f66f5..7a244ff307 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -11,19 +11,19 @@
 /**
  * Gets the variables sent or posted to this script and displays the header
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/common.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/common.lib.php';
 
 /**
  * Ensures db and table are valid, else moves to the "parent" script
  */
-require_once './libraries/db_table_exists.lib.php';
+require_once 'libraries/db_table_exists.lib.php';
 
 // load additional configuration variables
 if (PMA_DRIZZLE) {
-    include_once './libraries/data_drizzle.inc.php';
+    include_once 'libraries/data_drizzle.inc.php';
 } else {
-    include_once './libraries/data_mysql.inc.php';
+    include_once 'libraries/data_mysql.inc.php';
 }
 
 /**
@@ -58,7 +58,7 @@ if (isset($_REQUEST['default_action'])) {
 /**
  * file listing
  */
-require_once './libraries/file_listing.php';
+require_once 'libraries/file_listing.php';
 
 
 /**
@@ -100,7 +100,7 @@ $url_query = PMA_generate_common_url($url_params, 'html', '');
  * get table information
  * @todo should be done by a Table object
  */
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 
 /**
  * Get comments for table fileds/columns
@@ -127,7 +127,7 @@ $GLOBALS['js_include'][] = 'gis_data_editor.js';
 /**
  * HTTP and HTML headers
  */
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 
 /**
  * Displays the query submitted and its result
@@ -144,7 +144,7 @@ if (! empty($disp_message)) {
 /**
  * Displays top menu links
  */
-require_once './libraries/tbl_links.inc.php';
+require_once 'libraries/tbl_links.inc.php';
 
 
 /**
@@ -189,7 +189,7 @@ if (isset($where_clause)) {
             unset($rows[$key_id], $where_clause_array[$key_id]);
             PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query);
             echo "\n";
-            include './libraries/footer.inc.php';
+            include 'libraries/footer.inc.php';
         } else { // end if (no row returned)
             $meta = PMA_DBI_get_fields_meta($result[$key_id]);
             list($unique_condition, $tmp_clause_is_unique)
@@ -1146,5 +1146,5 @@ if ($insert_mode) {
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_chart.php b/tbl_chart.php
index 56fce06287..b4a290b8d1 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -17,7 +17,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'tbl_chart.js';
 $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
@@ -35,19 +35,19 @@ $GLOBALS['js_include'][] = 'canvg/canvg.js';
 if (strlen($GLOBALS['table'])) {
     $url_params['goto'] = $cfg['DefaultTabTable'];
     $url_params['back'] = 'tbl_sql.php';
-    include './libraries/tbl_common.php';
-    include './libraries/tbl_info.inc.php';
-    include './libraries/tbl_links.inc.php';
+    include 'libraries/tbl_common.php';
+    include 'libraries/tbl_info.inc.php';
+    include 'libraries/tbl_links.inc.php';
 } elseif (strlen($GLOBALS['db'])) {
     $url_params['goto'] = $cfg['DefaultTabDatabase'];
     $url_params['back'] = 'sql.php';
-    include './libraries/db_common.inc.php';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_common.inc.php';
+    include 'libraries/db_info.inc.php';
 } else {
     $url_params['goto'] = $cfg['DefaultTabServer'];
     $url_params['back'] = 'sql.php';
-    include './libraries/server_common.inc.php';
-    include './libraries/server_links.inc.php';
+    include 'libraries/server_common.inc.php';
+    include 'libraries/server_links.inc.php';
 }
 
 /*
@@ -168,6 +168,6 @@ unset($sanitized_data);
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require_once 'libraries/footer.inc.php';
 
 ?>
diff --git a/tbl_create.php b/tbl_create.php
index 63cd26a1da..39bbea75f7 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -7,11 +7,11 @@
 /**
  * Get some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $action = 'tbl_create.php';
 
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 $titles = PMA_buildActionTitles();
 
 // Check parameters
@@ -206,7 +206,7 @@ if (isset($_REQUEST['do_save_data'])) {
     if ($result) {
 
         // If comments were sent, enable relation stuff
-        include_once './libraries/transformations.lib.php';
+        include_once 'libraries/transformations.lib.php';
 
         // Update comment table for mime types [MIME]
         if (isset($_REQUEST['field_mimetype'])
@@ -327,13 +327,13 @@ if (isset($_REQUEST['do_save_data'])) {
         // read table info on this newly created table, in case
         // the next page is Structure
         $reread_info = true;
-        include './libraries/tbl_info.inc.php';
+        include 'libraries/tbl_info.inc.php';
 
         // do not switch to sql.php - as there is no row to be displayed on a new table
         if ($cfg['DefaultTabTable'] === 'sql.php') {
-            include './tbl_structure.php';
+            include 'tbl_structure.php';
         } else {
-            include './' . $cfg['DefaultTabTable'];
+            include '' . $cfg['DefaultTabTable'];
         }
         exit;
     } else {
@@ -359,9 +359,9 @@ if ($GLOBALS['is_ajax_request'] != true) {
     echo('<div id="create_table_div">');
 }
 
-require './libraries/tbl_properties.inc.php';
+require 'libraries/tbl_properties.inc.php';
 // Displays the footer
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 if ($GLOBALS['is_ajax_request'] != true) {
     echo('</div>');
diff --git a/tbl_export.php b/tbl_export.php
index 312cfb8aba..0df3f4f825 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -8,16 +8,16 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'export.js';
 
 /**
  * Gets tables informations and displays top links
  */
-require_once './libraries/tbl_common.php';
+require_once 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_export.php&amp;back=tbl_export.php';
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 
 // Dump of a table
 
@@ -81,14 +81,14 @@ if (! empty($sql_query)) {
 /**
  * Displays top menu links
  */
-require './libraries/tbl_links.inc.php';
+require 'libraries/tbl_links.inc.php';
 
 $export_type = 'table';
-require_once './libraries/display_export.lib.php';
+require_once 'libraries/display_export.lib.php';
 
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_get_field.php b/tbl_get_field.php
index 5c7d0171c8..962738cc38 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -8,8 +8,8 @@
 /**
  * Common functions.
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mime.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mime.lib.php';
 
 /* Check parameters */
 PMA_checkParameters(array('db', 'table', 'where_clause', 'transform_key'));
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 16cc379d11..8a37a84e71 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -13,7 +13,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
     define('PMA_NO_VARIABLES_IMPORT', true);
 }
 
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'openlayers/OpenLayers.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
@@ -26,12 +26,12 @@ $GLOBALS['js_include'][] = 'OpenStreetMap.js';
 ob_start();
 
 // Runs common work
-require_once './libraries/db_common.inc.php';
+require_once 'libraries/db_common.inc.php';
 $url_params['goto'] = $cfg['DefaultTabDatabase'];
 $url_params['back'] = 'sql.php';
 
 // Import visualization functions
-require_once './libraries/gis_visualization.lib.php';
+require_once 'libraries/gis_visualization.lib.php';
 
 // Execute the query and return the result
 $result = PMA_DBI_try_query($sql_query);
@@ -200,6 +200,6 @@ $visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $fo
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
-?>
\ No newline at end of file
+?>
diff --git a/tbl_import.php b/tbl_import.php
index e5449b9c5b..290e2459cf 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -8,28 +8,28 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'import.js';
 
 /**
  * Gets tables informations and displays top links
  */
-require_once './libraries/tbl_common.php';
+require_once 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
 
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 /**
  * Displays top menu links
  */
-require_once './libraries/tbl_links.inc.php';
+require_once 'libraries/tbl_links.inc.php';
 
 $import_type = 'table';
-require_once './libraries/display_import.lib.php';
+require_once 'libraries/display_import.lib.php';
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
 
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 14b5785255..1bdfde81c8 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -9,9 +9,9 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/Index.class.php';
-require_once './libraries/tbl_common.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/Index.class.php';
+require_once 'libraries/tbl_common.php';
 
 // Get fields and stores their name/type
 $fields = array();
@@ -105,7 +105,7 @@ if (isset($_REQUEST['do_save_data'])) {
         }
 
         $active_page = 'tbl_structure.php';
-        include './tbl_structure.php';
+        include 'tbl_structure.php';
         exit;
     } else {
         if ( $GLOBALS['is_ajax_request'] == true) {
@@ -123,9 +123,9 @@ if (isset($_REQUEST['do_save_data'])) {
 
 // Displays headers (if needed)
 $GLOBALS['js_include'][] = 'indexes.js';
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 if ($GLOBALS['is_ajax_request'] != true) {
-    include_once './libraries/tbl_links.inc.php';
+    include_once 'libraries/tbl_links.inc.php';
 }
 
 if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
@@ -304,5 +304,5 @@ echo '<input type="submit" name="add_fields" value="' . __('Go') . '" />' . "\n"
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index 00a8a3981d..687294f289 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -8,7 +8,7 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 // Check parameters
 
diff --git a/tbl_operations.php b/tbl_operations.php
index da2291e75c..61e25c4298 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -8,14 +8,14 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
 
 /**
  * Runs common work
  */
-require './libraries/tbl_common.php';
+require 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_operations.php&amp;back=tbl_operations.php';
 $url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
 
@@ -27,8 +27,8 @@ $cfgRelation = PMA_getRelationsParam();
 /**
  * Gets available MySQL charsets and storage engines
  */
-require_once './libraries/mysql_charsets.lib.php';
-require_once './libraries/StorageEngine.class.php';
+require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/StorageEngine.class.php';
 
 // add a javascript file for jQuery functions to handle Ajax actions
 // also add jQueryUI
@@ -37,7 +37,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 /**
  * Class for partition management
  */
-require_once './libraries/Partition.class.php';
+require_once 'libraries/Partition.class.php';
 
 // reselect current db (needed in some cases probably due to
 // the calling of relation.lib.php)
@@ -47,7 +47,7 @@ PMA_DBI_select_db($GLOBALS['db']);
  * Gets tables informations
  */
 
-require './libraries/tbl_info.inc.php';
+require 'libraries/tbl_info.inc.php';
 
 // define some globals here, for improved syntax in the conditionals
 $is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false;
@@ -72,13 +72,13 @@ $table_alters = array();
  */
 if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
     $_message = '';
-    include_once './tbl_move_copy.php';
+    include_once 'tbl_move_copy.php';
 }
 /**
  * If the table has to be maintained
  */
 if (isset($_REQUEST['table_maintenance'])) {
-    include_once './sql.php';
+    include_once 'sql.php';
     unset($result);
 }
 /**
@@ -211,7 +211,7 @@ if ($reread_info) {
     // a change, clear the cache
     PMA_Table::$cache = array();
     $page_checksum = $checksum = $delay_key_write = 0;
-    include './libraries/tbl_info.inc.php';
+    include 'libraries/tbl_info.inc.php';
 }
 unset($reread_info);
 
@@ -219,7 +219,7 @@ unset($reread_info);
  * Displays top menu links in non ajax requests
  */
 if (!isset($_REQUEST['ajax_request'])) {
-    include_once './libraries/tbl_links.inc.php';
+    include_once 'libraries/tbl_links.inc.php';
 }
 if (isset($result) && empty($message_to_show)) {
     // set to success by default, because result set could be empty
@@ -856,7 +856,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 
 
 function PMA_set_global_variables_for_engine($tbl_type)
diff --git a/tbl_printview.php b/tbl_printview.php
index 554608aaef..03c5c75f8e 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -8,16 +8,16 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
-require './libraries/tbl_common.php';
+require 'libraries/tbl_common.php';
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
 $print_view = true;
 if (! isset($selected_tbl)) {
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
 }
 
 // Check parameters
@@ -29,8 +29,8 @@ if (! isset($the_tables) || ! is_array($the_tables)) {
 /**
  * Gets the relations settings
  */
-require_once './libraries/transformations.lib.php';
-require_once './libraries/Index.class.php';
+require_once 'libraries/transformations.lib.php';
+require_once 'libraries/Index.class.php';
 
 $cfgRelation = PMA_getRelationsParam();
 
@@ -62,7 +62,7 @@ $multi_tables     = (count($the_tables) > 1);
 
 if ($multi_tables) {
     if (empty($GLOBALS['is_header_sent'])) {
-        include_once './libraries/header.inc.php';
+        include_once 'libraries/header.inc.php';
     }
     $tbl_list     = '';
     foreach ($the_tables as $key => $table) {
@@ -443,5 +443,5 @@ PMA_printButton();
 
 echo "<div id='PMA_disable_floating_menubar'></div>\n";
 
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_relation.php b/tbl_relation.php
index a5f6f17a14..8d90d1879f 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -16,17 +16,17 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'tbl_relation.js';
 
-require_once './libraries/tbl_common.php';
+require_once 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_sql.php';
 
 
 /**
  * Gets tables informations
  */
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 
 // Note: in libraries/tbl_links.inc.php we get and display the table comment.
 // For InnoDB, this comment contains the REFER information but any update
@@ -36,7 +36,7 @@ $avoid_show_comment = true;
 /**
  * Displays top menu links
  */
-require_once './libraries/tbl_links.inc.php';
+require_once 'libraries/tbl_links.inc.php';
 
 $options_array = array(
     'CASCADE'   => 'CASCADE',
@@ -565,5 +565,5 @@ if (count($columns) > 0) {
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_replace.php b/tbl_replace.php
index 28e7fbe38b..f0d8bced45 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -25,7 +25,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 // Check parameters
 PMA_checkParameters(array('db', 'table', 'goto'));
@@ -47,8 +47,8 @@ if (isset($_REQUEST['insert_rows'])
 ) {
     $cfg['InsertRows'] = $_REQUEST['insert_rows'];
     $GLOBALS['js_include'][] = 'tbl_change.js';
-    include_once './libraries/header.inc.php';
-    include './tbl_change.php';
+    include_once 'libraries/header.inc.php';
+    include 'tbl_change.php';
     exit;
 }
 
@@ -247,7 +247,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
 
         // Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key]
 
-        include './libraries/tbl_replace_fields.inc.php';
+        include 'libraries/tbl_replace_fields.inc.php';
 
         if (empty($me_funcs[$key])) {
             $cur_value = $val;
@@ -341,9 +341,9 @@ if ($is_insert && count($value_sets) > 0) {
     $message = PMA_Message::success(__('No change'));
     $active_page = $goto_include;
     if (! $GLOBALS['is_ajax_request'] == true) {
-        include_once './libraries/header.inc.php';
+        include_once 'libraries/header.inc.php';
     }
-    include './' . PMA_securePath($goto_include);
+    include '' . PMA_securePath($goto_include);
     exit;
 }
 unset($me_fields, $is_insertignore);
@@ -441,7 +441,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
 
     if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
         //handle relations work here for updated row.
-        include_once './libraries/relation.lib.php';
+        include_once 'libraries/relation.lib.php';
 
         $map = PMA_getForeigners($db, $table, '', 'both');
 
@@ -507,7 +507,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
     }
 
     if (isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) {
-        include_once './libraries/transformations.lib.php';
+        include_once 'libraries/transformations.lib.php';
         //if some posted fields need to be transformed, generate them here.
         $mime_map = PMA_getMIME($db, $table);
 
@@ -533,10 +533,10 @@ if ($GLOBALS['is_ajax_request'] == true) {
                         'transform_key' => $column_name,
                     );
 
-                    if (file_exists('./libraries/transformations/' . $include_file)) {
+                    if (file_exists('libraries/transformations/' . $include_file)) {
                         $transformfunction_name = str_replace('.inc.php', '', $transformation['transformation']);
 
-                        include_once './libraries/transformations/' . $include_file;
+                        include_once 'libraries/transformations/' . $include_file;
 
                         if (function_exists('PMA_transformation_' . $transformfunction_name)) {
                             $transform_function = 'PMA_transformation_' . $transformfunction_name;
@@ -584,10 +584,10 @@ if (isset($_REQUEST['after_insert']) && 'new_insert' == $_REQUEST['after_insert'
 /**
  * Load header.
  */
-require_once './libraries/header.inc.php';
+require_once 'libraries/header.inc.php';
 /**
  * Load target page.
  */
-require './' . PMA_securePath($goto_include);
+require '' . PMA_securePath($goto_include);
 exit;
 ?>
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 537e4f25d4..d669648d36 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -17,8 +17,8 @@ define('PMA_NO_VARIABLES_IMPORT', true);
 /**
  *
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 /**
  * No rows were selected => show again the query and tell that user.
@@ -27,8 +27,8 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array')
  && ! isset($_REQUEST['mult_btn'])) {
     $disp_message = __('No rows selected');
     $disp_query = '';
-    include './sql.php';
-    include './libraries/footer.inc.php';
+    include 'sql.php';
+    include 'libraries/footer.inc.php';
 }
 
 if (isset($_REQUEST['submit_mult'])) {
@@ -82,7 +82,7 @@ if (!empty($submit_mult)) {
             }
 
             $active_page = 'tbl_change.php';
-            include './tbl_change.php';
+            include 'tbl_change.php';
             break;
 
         case 'row_export':
@@ -99,7 +99,7 @@ if (!empty($submit_mult)) {
             }
 
             $active_page = 'tbl_export.php';
-            include './tbl_export.php';
+            include 'tbl_export.php';
             break;
 
         case 'row_delete':
@@ -112,7 +112,7 @@ if (!empty($submit_mult)) {
                     $original_url_query = $url_query;
                 }
             }
-            include './libraries/mult_submits.inc.php';
+            include 'libraries/mult_submits.inc.php';
             $_url_params = $GLOBALS['url_params'];
             $_url_params['goto'] = 'tbl_sql.php';
             $url_query = PMA_generate_common_url($_url_params);
@@ -140,12 +140,12 @@ if (!empty($submit_mult)) {
             unset($submit_mult, $_REQUEST['mult_btn']);
 
             $active_page = 'sql.php';
-            include './sql.php';
+            include 'sql.php';
 
             /**
              * Displays the footer
              */
-            include './libraries/footer.inc.php';
+            include 'libraries/footer.inc.php';
             break;
     }
 }
diff --git a/tbl_select.php b/tbl_select.php
index b6c0088f3f..64c92733d7 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -13,9 +13,9 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mysql_charsets.lib.php';
-require_once './libraries/tbl_select.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/tbl_select.lib.php';
 
 $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
@@ -58,19 +58,19 @@ foreach ($post_params as $one_post_param) {
  */
 if (! isset($param) || $param[0] == '') {
     // Gets some core libraries
-    include_once './libraries/tbl_common.php';
+    include_once 'libraries/tbl_common.php';
     //$err_url   = 'tbl_select.php' . $err_url;
     $url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
 
     /**
      * Gets tables informations
      */
-    include_once './libraries/tbl_info.inc.php';
+    include_once 'libraries/tbl_info.inc.php';
 
     /**
      * Displays top menu links
      */
-    include_once './libraries/tbl_links.inc.php';
+    include_once 'libraries/tbl_links.inc.php';
 
     if (! isset($goto)) {
         $goto = $GLOBALS['cfg']['DefaultTabTable'];
@@ -262,7 +262,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
 </form>
 <div id="sqlqueryresults"></div>
     <?php
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 ?>
 
 </fieldset>
@@ -320,7 +320,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
     if ($orderField != '--nil--') {
         $sql_query .= ' ORDER BY ' . PMA_backquote($orderField) . ' ' . $order;
     } // end if
-    include './sql.php';
+    include 'sql.php';
 }
 
 ?>
diff --git a/tbl_sql.php b/tbl_sql.php
index 2e4cde6540..d8a8fb6695 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 /**
  * Runs common work
@@ -19,10 +19,10 @@ $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
 $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
 
-require './libraries/tbl_common.php';
+require 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
 
-require_once './libraries/sql_query_form.lib.php';
+require_once 'libraries/sql_query_form.lib.php';
 
 $err_url   = 'tbl_sql.php' . $err_url;
 // After a syntax error, we return to this script
@@ -33,12 +33,12 @@ $back = 'tbl_sql.php';
 /**
  * Get table information
  */
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 
 /**
  * Displays top menu links
  */
-require_once './libraries/tbl_links.inc.php';
+require_once 'libraries/tbl_links.inc.php';
 
 /**
  * Query box, bookmark, insert data from textfile
@@ -48,5 +48,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/tbl_structure.php b/tbl_structure.php
index 6d8d961d66..f0c6bde2d7 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -9,8 +9,8 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'tbl_structure.js';
@@ -62,15 +62,15 @@ if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
         // what is this htmlspecialchars() for??
         //$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
         $sql_query .= ' FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
-        include './sql.php';
+        include 'sql.php';
         exit;
     } else {
         // handle multiple field commands
         // handle confirmation of deleting multiple fields/columns
         $action = 'tbl_structure.php';
-        include './libraries/mult_submits.inc.php';
-        //require_once './libraries/header.inc.php';
-        //require_once './libraries/tbl_links.inc.php';
+        include 'libraries/mult_submits.inc.php';
+        //require_once 'libraries/header.inc.php';
+        //require_once 'libraries/tbl_links.inc.php';
 
         if (empty($message)) {
             $message = PMA_Message::success();
@@ -86,7 +86,7 @@ $cfgRelation = PMA_getRelationsParam();
 /**
  * Runs common work
  */
-require_once './libraries/tbl_common.php';
+require_once 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_structure.php&amp;back=tbl_structure.php';
 $url_params['goto'] = 'tbl_structure.php';
 $url_params['back'] = 'tbl_structure.php';
@@ -99,13 +99,13 @@ $url_params['back'] = 'tbl_structure.php';
 /**
  * Gets tables informations
  */
-require_once './libraries/tbl_info.inc.php';
+require_once 'libraries/tbl_info.inc.php';
 
 /**
  * Displays top menu links
  */
-require_once './libraries/tbl_links.inc.php';
-require_once './libraries/Index.class.php';
+require_once 'libraries/tbl_links.inc.php';
+require_once 'libraries/Index.class.php';
 
 // 2. Gets table keys and retains them
 // @todo should be: $server->db($db)->table($table)->primary()
@@ -224,7 +224,7 @@ $comments_map = array();
 $mime_map = array();
 
 if ($GLOBALS['cfg']['ShowPropertyComments']) {
-    include_once './libraries/transformations.lib.php';
+    include_once 'libraries/transformations.lib.php';
 
     //$cfgRelation = PMA_getRelationsParam();
 
@@ -682,7 +682,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
  * links again
  */
 if (count($fields) > 20) {
-    include './libraries/tbl_links.inc.php';
+    include 'libraries/tbl_links.inc.php';
 } // end if (count($fields) > 20)
 
 /**
@@ -948,5 +948,5 @@ echo '<div class="clearfloat"></div>' . "\n";
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>

From bc893a9f181feb6e6b43ff25747eab7a8ab2a74c Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 17 Mar 2012 18:26:04 +0100
Subject: [PATCH 24/36] Open link transformation grid-editing goto_link in new
 tab

---
 js/makegrid.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index e13ec7eece..21db44f7a6 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -722,7 +722,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     var gotoLink = document.createElement('div');
                     gotoLink.className = 'goto_link';
                     $(gotoLink).append(g.gotoLinkText + ': ')
-                        .append($td.find('a').clone());
+                        .append($td.find('a').clone().click(
+                            function (event) {
+                                event.preventDefault();
+                                window.open(this.href);
+                            }));
                     $editArea.append(gotoLink);
                 }
 

From 642829ceb1d9bc0cf51f4def1236806171a2bc51 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 17 Mar 2012 19:09:03 +0100
Subject: [PATCH 25/36] Added EVENT and ROUTINE to CodeMirror keywords

---
 js/codemirror/mode/mysql/mysql.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js
index 755e3ec85d..94b89a5e27 100644
--- a/js/codemirror/mode/mysql/mysql.js
+++ b/js/codemirror/mode/mysql/mysql.js
@@ -151,7 +151,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) {
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
-  var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill";
+  var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped event exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike routine schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill";
 
   var cVerbs = "alter analyze begin binlog call change check checksum commit create deallocate describe do drop execute flush grant handler install kill load lock optimize cache partition prepare purge release rename repair replace reset resignal revoke rollback savepoint select set signal show start truncate uninstall unlock update use xa";
 
@@ -172,4 +172,4 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) {
     types: keywords(cTypes),
     attributes: keywords(cAttributes)
   });
-}());
\ No newline at end of file
+}());

From 8dc4e35cee3be6a50feaadce00c7d8d1bd02434c Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 17 Mar 2012 22:32:55 +0100
Subject: [PATCH 26/36] Open links from changelog in new tab

---
 changelog.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog.php b/changelog.php
index d5bea88cd1..960b0ef961 100644
--- a/changelog.php
+++ b/changelog.php
@@ -115,5 +115,11 @@ echo '<pre>';
 echo preg_replace(array_keys($replaces), $replaces, $changelog);
 echo '</pre>';
 ?>
+<script type="text/javascript">
+var links = document.getElementsByTagName("a");
+for(var i = 0; i < links.length; i++) {
+    links[i].target = "_blank";
+}
+</script>
 </body>
 </html>

From d45e74c53821b1175e6305aaa50d2d0823beb23a Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 17 Mar 2012 22:33:12 +0100
Subject: [PATCH 27/36] rfe #3488640 Expand table-group in non-light navigation
 frame if only one

---
 ChangeLog        | 1 +
 js/navigation.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4580beedaf..a8f2eacfb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 + Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
 + Patch #3498201 Contest-6: Export all privileges
 + Patch #3502814 for rfe #3187077 Change password buttons should match
++ rfe #3488640 Expand table-group in non-light navigation frame if only one
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/js/navigation.js b/js/navigation.js
index 21e05b8e21..a886d0cf1c 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -34,6 +34,12 @@ function toggle(id, only_open)
             img.src = newimg.attr('src');
             img.alt = '-';
         }
+        // if only one sub-list, open as well
+        var submenus = $(el).find("> li > ul:hidden");
+        var sublinks = $(el).find("> li > a.item, > li > a.tableicon");
+        if (submenus.length == 1 && sublinks.length == 0) {
+            toggle(submenus.prop("id").split("subel").join(""), true);
+        }
     } else {
         el.style.display = 'none';
         if (img) {

From fce4f9784421399770f103452b6fcad8f4b484f3 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 13:13:18 +0100
Subject: [PATCH 28/36] Use $ prefix for jQuery-wrapped DOM objects, don't
 check if sub-lists are really hidden (ref. rfe #3488640)

---
 js/navigation.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/navigation.js b/js/navigation.js
index a886d0cf1c..8e9b5aca91 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -35,10 +35,10 @@ function toggle(id, only_open)
             img.alt = '-';
         }
         // if only one sub-list, open as well
-        var submenus = $(el).find("> li > ul:hidden");
-        var sublinks = $(el).find("> li > a.item, > li > a.tableicon");
-        if (submenus.length == 1 && sublinks.length == 0) {
-            toggle(submenus.prop("id").split("subel").join(""), true);
+        var $submenus = $(el).find("> li > ul");
+        var $sublinks = $(el).find("> li > a.item, > li > a.tableicon");
+        if ($submenus.length == 1 && $sublinks.length == 0) {
+            toggle($submenus.prop("id").split("subel").join(""), true);
         }
     } else {
         el.style.display = 'none';

From da3c14f048445bf0039c045ee8ad06fb7b761642 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 14:29:03 +0100
Subject: [PATCH 29/36] Changed obsolete a[name=querybox] attribute to
 a#querybox for HTML5 validity (updated fieldset to #queryboxf for uniqueness,
 there are no CSS refs)

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

diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index ded404d1f0..c1d0751d31 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -238,9 +238,9 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         $sqlquerycontainer_id = 'sqlquerycontainerfull';
     }
 
-    echo '<a name="querybox"></a>' . "\n"
+    echo '<a id="querybox"></a>' . "\n"
         .'<div id="queryboxcontainer">' . "\n"
-        .'<fieldset id="querybox">' . "\n";
+        .'<fieldset id="queryboxf">' . "\n";
     echo '<legend>' . $legend . '</legend>' . "\n";
     echo '<div id="queryfieldscontainer">' . "\n";
     echo '<div id="' . $sqlquerycontainer_id . '">' . "\n"

From 1b23bfa33d81eb9782b0915490ec3b71a877a8bc Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 14:35:15 +0100
Subject: [PATCH 30/36] Removed meta[name=OBGZip] tag in head for HTML5
 validity

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

diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 5d6c1f0c3a..9298986e81 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -57,9 +57,8 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
         include_once './libraries/header_http.inc.php';
         include_once './libraries/header_meta_style.inc.php';
         include_once './libraries/header_scripts.inc.php';
-        ?>
-        <meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" />
-        <?php /* remove vertical scroll bar bug in ie */ ?>
+        
+        /* remove vertical scroll bar bug in ie */ ?>
         <!--[if IE 6]>
         <style type="text/css">
         /* <![CDATA[ */

From 653f08681552586b9d427b7787d83af1b32e85c0 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 14:46:59 +0100
Subject: [PATCH 31/36] Replaced xml:lang attributes by lang for HTML5

---
 Documentation.html                    | 3 +--
 browse_foreigners.php                 | 5 +----
 changelog.php                         | 2 +-
 db_datadict.php                       | 2 +-
 examples/openid.php                   | 2 +-
 examples/signon.php                   | 2 +-
 libraries/List_Database.class.php     | 4 ++--
 libraries/Theme_Manager.class.php     | 2 +-
 libraries/auth/cookie.auth.lib.php    | 2 +-
 libraries/display_select_lang.lib.php | 6 +++---
 libraries/error.inc.php               | 2 +-
 libraries/header_meta_style.inc.php   | 2 +-
 libraries/header_printview.inc.php    | 2 +-
 libraries/mysql_charsets.lib.php      | 2 +-
 main.php                              | 2 +-
 navigation.php                        | 5 +----
 scripts/decode_bug.php                | 6 +++---
 setup/frames/index.inc.php            | 4 ++--
 tbl_structure.php                     | 2 +-
 19 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 5071b1c85d..a784b21437 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2,8 +2,7 @@
 <!-- 
 vim: expandtab ts=4 sw=4 sts=4 tw=78 
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
-    version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
+<html lang="en-US" dir="ltr">
 <head>
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
diff --git a/browse_foreigners.php b/browse_foreigners.php
index d8016857b7..9579edcb44 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -73,10 +73,7 @@ if (is_array($foreignData['disp_row'])) {
 }
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xml:lang="<?php echo $available_languages[$lang][1]; ?>"
-    lang="<?php echo $available_languages[$lang][1]; ?>"
-    dir="<?php echo $text_dir; ?>">
+<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
 
 <head>
     <title>phpMyAdmin</title>
diff --git a/changelog.php b/changelog.php
index 960b0ef961..1467ee0576 100644
--- a/changelog.php
+++ b/changelog.php
@@ -101,7 +101,7 @@ $replaces = array(
 header('Content-type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html lang="en" dir="ltr">
 <head>
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
diff --git a/db_datadict.php b/db_datadict.php
index 9b4562d9d1..e57206f960 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -228,7 +228,7 @@ foreach ($tables as $table) {
         }
         ?>
     </td>
-    <td<?php echo $type_nowrap; ?> xml:lang="en" dir="ltr"><?php echo $type; ?></td>
+    <td<?php echo $type_nowrap; ?> lang="en" dir="ltr"><?php echo $type; ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $attribute; ?></td>*/ ?>
     <td><?php echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); ?></td>
     <td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
diff --git a/examples/openid.php b/examples/openid.php
index 8033a149d1..6d1f4390a8 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -37,7 +37,7 @@ function show_page($contents)
     echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html lang="en" dir="ltr">
 <head>
     <link rel="icon" href="../favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
diff --git a/examples/signon.php b/examples/signon.php
index 01e1331db9..d4acccb95f 100644
--- a/examples/signon.php
+++ b/examples/signon.php
@@ -38,7 +38,7 @@ if (isset($_POST['user'])) {
     echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html lang="en" dir="ltr">
 <head>
     <link rel="icon" href="../favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index e5283205fc..c031fea85d 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -317,7 +317,7 @@ require_once './libraries/List.class.php';
             $selected = $this->getDefault();
         }
 
-        $return = '<ul id="databaseList" xml:lang="en" dir="ltr">' . "\n";
+        $return = '<ul id="databaseList" lang="en" dir="ltr">' . "\n";
         foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
             if (count($dbs) > 1) {
                 $return .= '<li class="group"><span>' . htmlspecialchars($group) . '</span><ul>' . "\n";
@@ -373,7 +373,7 @@ require_once './libraries/List.class.php';
             $selected = $this->getDefault();
         }
 
-        $return = '<select name="db" id="lightm_db" xml:lang="en" dir="ltr"'
+        $return = '<select name="db" id="lightm_db" lang="en" dir="ltr"'
             . ' onchange="if (this.value != \'\') window.parent.openDb(this.value);">' . "\n"
             . '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
             . '(' . __('Databases') . ') ...</option>' . "\n";
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 68468e131d..df891b7cfe 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -295,7 +295,7 @@ class PMA_Theme_Manager
         $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
         $select_box .=  $theme_preview_href . __('Theme') . '</a>:' . "\n";
 
-        $select_box .=  '<select name="set_theme" xml:lang="en" dir="ltr" class="autosubmit">';
+        $select_box .=  '<select name="set_theme" lang="en" dir="ltr" class="autosubmit">';
         foreach ($this->themes as $each_theme_id => $each_theme) {
             $select_box .=  '<option value="' . $each_theme_id . '"';
             if ($this->active_theme === $each_theme_id) {
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 5e74f48a93..b9f7536963 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -172,7 +172,7 @@ if (top != self) {
     <?php
     echo sprintf(
         __('Welcome to %s'),
-        '<bdo dir="ltr" xml:lang="en">' . $page_title . '</bdo>'
+        '<bdo dir="ltr" lang="en">' . $page_title . '</bdo>'
     );
     ?>
 </h1>
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index bf551f6ee6..3cbc0fca9a 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -50,13 +50,13 @@ function PMA_select_language($use_fieldset = false, $show_doc = true)
         $language_title .= PMA_showDocu('faq7_2');
     }
     if ($use_fieldset) {
-        echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
+        echo '<fieldset><legend lang="en" dir="ltr">' . $language_title . '</legend>';
     } else {
-        echo '<bdo xml:lang="en" dir="ltr">' . $language_title . ':</bdo>';
+        echo '<bdo lang="en" dir="ltr">' . $language_title . ':</bdo>';
     }
     ?>
 
-    <select name="lang" class="autosubmit" xml:lang="en" dir="ltr">
+    <select name="lang" class="autosubmit" lang="en" dir="ltr">
     <?php
 
     uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
diff --git a/libraries/error.inc.php b/libraries/error.inc.php
index 550a1bb222..669e92016b 100644
--- a/libraries/error.inc.php
+++ b/libraries/error.inc.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
 header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
+<html lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
 <head>
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index ad26071f76..c2e59c8316 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -32,7 +32,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
+<html lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
     <meta charset="utf-8" />
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index ff2c100f95..21735f5151 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -39,7 +39,7 @@ if ($text_dir == 'ltr') {
 }
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
+<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
 
 <head>
 <meta charset="utf-8" />
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 5af1bf7d50..6c47d2231b 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -104,7 +104,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
         }
     }
 
-    $return_str  = '<select xml:lang="en" dir="ltr" name="'
+    $return_str  = '<select lang="en" dir="ltr" name="'
         . htmlspecialchars($name) . '"'
         . (empty($id) ? '' : ' id="' . htmlspecialchars($id) . '"')
         . ($submitOnChange ? ' class="autosubmit"' : '') . '>' . "\n";
diff --git a/main.php b/main.php
index a77d8d997e..9e949fff3a 100644
--- a/main.php
+++ b/main.php
@@ -182,7 +182,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
 
     echo '    <li id="li_select_mysql_charset">';
     echo '        ' . __('Server charset') . ': '
-       . '        <span xml:lang="en" dir="ltr">'
+       . '        <span lang="en" dir="ltr">'
        . '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
        . '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
        . '        </span>' . "\n"
diff --git a/navigation.php b/navigation.php
index 9b809db697..dcc5ac573b 100644
--- a/navigation.php
+++ b/navigation.php
@@ -89,10 +89,7 @@ require_once 'libraries/header_http.inc.php';
 /* echo '<?xml version="1.0" encoding="utf-8"?>'; */
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xml:lang="<?php echo $available_languages[$lang][1]; ?>"
-    lang="<?php echo $available_languages[$lang][1]; ?>"
-    dir="<?php echo $GLOBALS['text_dir']; ?>">
+<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
 
 <head>
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index e4ea6f70fc..5e7d2b57d3 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -16,11 +16,11 @@
  */
 ?>
 <!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" dir="ltr">
 
 <head>
-    <link rel="icon" href="./favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
     <meta charset="iso-8859-1" />
     <title>phpMyAdmin - Parser bug report decoder</title>
     <style type="text/css">
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 7578a56a86..52e23c86e3 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -68,10 +68,10 @@ if (!$is_https) {
 
 <form id="select_lang" method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?>">
     <?php echo PMA_generate_common_hidden_inputs() ?>
-    <bdo xml:lang="en" dir="ltr"><label for="lang">
+    <bdo lang="en" dir="ltr"><label for="lang">
     <?php echo __('Language') . (__('Language') != 'Language' ? ' - Language' : '') ?>
     </label></bdo><br />
-    <select id="lang" name="lang" class="autosubmit" xml:lang="en" dir="ltr">
+    <select id="lang" name="lang" class="autosubmit" lang="en" dir="ltr">
     <?php
     // create language list
     $lang_list = array();
diff --git a/tbl_structure.php b/tbl_structure.php
index f0c6bde2d7..fb01b8bbb3 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -343,7 +343,7 @@ foreach ($fields as $row) {
         <?php echo $rownum; ?>
     </td>
     <th nowrap="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
-    <td<?php echo $type_nowrap; ?>><bdo dir="ltr" xml:lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
+    <td<?php echo $type_nowrap; ?>><bdo dir="ltr" lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
     <td><?php echo (empty($field_charset) ? '' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>'); ?></td>
     <td nowrap="nowrap" class="column_attribute"><?php echo $attribute; ?></td>
     <td><?php echo (($row['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>

From 49b6e4930c31012b4e4a10a92b356f9db3de44a1 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 17:26:46 +0100
Subject: [PATCH 32/36] Don't rely on grab_globals in tbl_zoom_select

---
 tbl_zoom_select.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 1dfd2ef348..49e38b3e8c 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -29,6 +29,26 @@ $GLOBALS['js_include'][] = 'canvg/canvg.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 
+/**
+ * Sets globals from $_POST
+ */
+$post_params = array(
+    'collations',
+    'dataLabel',
+    'fields',
+    'fields_null',
+    'inputs',
+    'max_number_of_fields',
+    'maxPlotLimit',
+    'types',
+    'zoom_submit',
+    'zoomFunc'
+);
+foreach ($post_params as $one_post_param) {
+    if (isset($_POST[$one_post_param])) {
+        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
+    }
+}
 
 /**
  * Handle AJAX request for data row on point select
@@ -171,6 +191,7 @@ $fields_cnt = count($fields_list);
 $foreigners = PMA_getForeigners($db, $table);
 $flag = 1;
 $tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array();
+
 if (! isset($zoom_submit) && ! isset($inputs)) {
     $dataLabel = PMA_getDisplayField($db, $table);
 }

From 03eeeb3ccd3272c8a68232c6bc03116434840801 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 17:46:22 +0100
Subject: [PATCH 33/36] Removed: table[border] attribute (default is 0
 anyways), a[rel] for non-standard values for HTML5 validity

---
 db_qbe.php                             |  4 +-
 js/functions.js                        |  2 +-
 js/server_status.js                    |  2 +-
 js/server_status_monitor.js            |  2 +-
 libraries/auth/config.auth.lib.php     |  2 +-
 libraries/display_tbl.lib.php          |  2 +-
 libraries/schema/User_Schema.class.php |  2 +-
 pmd_general.php                        | 66 +++++++++++++-------------
 server_binlog.php                      |  2 +-
 server_status.php                      |  6 +--
 tbl_change.php                         |  2 +-
 tbl_printview.php                      |  2 +-
 themes.php                             |  2 +-
 transformation_overview.php            |  2 +-
 14 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index 8d559f3d5c..c228aba978 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -451,7 +451,7 @@ for ($y = 0; $y <= $row; $y++) {
 <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
     <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
         <!-- Row controls -->
-        <table border="0" cellpadding="0" cellspacing="0">
+        <table cellpadding="0" cellspacing="0">
         <tr>
             <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
                 <small><?php echo __('Ins'); ?>:</small>
@@ -600,7 +600,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
 ?>
 </fieldset>
 <fieldset class="tblFooters">
-<table border="0" cellpadding="2" cellspacing="1">
+<table cellpadding="2" cellspacing="1">
 <tr>
     <td nowrap="nowrap">
         <?php echo __('Add/Delete criteria rows'); ?>:
diff --git a/js/functions.js b/js/functions.js
index 9d104caedb..2dc0eb5201 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3630,5 +3630,5 @@ function toggleRowColors($start)
  * This way, we don't break HTML validity
  */
 $(function () {
-    $("a[rel=_blank]").prop("target", "_blank");
+    $("a._blank").prop("target", "_blank");
 });
diff --git a/js/server_status.js b/js/server_status.js
index 86da8ea8b8..2a043eb6e6 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -76,7 +76,7 @@ $(function() {
     });
 
     // Popup behaviour
-    $('a[rel="popupLink"]').click( function() {
+    $('a.popupLink').click( function() {
         var $link = $(this);
 
         $('.' + $link.attr('href').substr(1))
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 84e82c993e..15af4d1a27 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1615,7 +1615,7 @@ $(function() {
     function buildLogTable(data) {
         var rows = data.rows;
         var cols = new Array();
-        var $table = $('<table border="0" class="sortable"></table>');
+        var $table = $('<table class="sortable"></table>');
         var $tBody, $tRow, $tCell;
 
         $('#logTable').html($table);
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index b27bdbe155..dcf9a15bb1 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -86,7 +86,7 @@ function PMA_auth_fails()
     <h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
 </center>
 <br />
-<table border="0" cellpadding="0" cellspacing="3" align="center" width="80%">
+<table cellpadding="0" cellspacing="3" align="center" width="80%">
     <tr>
         <td>
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8eb35e9a32..73fbc1a373 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -297,7 +297,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
     ?>
 
 <!-- Navigation bar -->
-<table border="0" cellpadding="0" cellspacing="0" class="navigation">
+<table cellpadding="0" cellspacing="0" class="navigation">
 <tr>
     <td class="navigation_separator"></td>
     <?php
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 867635020f..ba78ac6c1a 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -267,7 +267,7 @@ class PMA_User_Schema
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->chosenPage); ?>" />
             <input type="hidden" name="do" value="edcoord" />
-            <table border="0">
+            <table>
             <tr>
                 <th><?php echo __('Table'); ?></th>
                 <th><?php echo __('Delete'); ?></th>
diff --git a/pmd_general.php b/pmd_general.php
index 8b0e7c0aa4..b606a732de 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -330,7 +330,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <div id='layer_action' style="display:none;">Load...</div>
 
 <table id="layer_new_relation" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -340,7 +340,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
             <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
@@ -397,7 +397,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="layer_upd_relation" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -407,7 +407,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="100%" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="100%" align="center" cellpadding="2" cellspacing="0">
         <tr>
             <td colspan="3" align="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
         </tr>
@@ -432,7 +432,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="pmd_optionse" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -442,7 +442,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
             <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td>
@@ -454,11 +454,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
             <td width="102"><select name="rel_opt" id="rel_opt">
                     <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -513,11 +513,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
             <td width="102"><select name="h_rel_opt" id="h_rel_opt">
                     <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -554,7 +554,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_rename_to" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -564,7 +564,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
         <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
@@ -602,7 +602,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_having" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
     <tr>
         <td class="frams1" width="10px"></td>
@@ -612,7 +612,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
           <td colspan="2" align="center" nowrap="nowrap"><strong>HAVING</strong></td>
@@ -636,11 +636,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
             <td width="102"><select name="hrel_opt" id="hrel_opt">
                 <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -678,7 +678,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_Aggregate" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -688,7 +688,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
         <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
@@ -732,7 +732,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_where" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
     <tr>
         <td class="frams1" width="10px"></td>
@@ -742,7 +742,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
           <td colspan="2" align="center" nowrap="nowrap"><strong>WHERE</strong></td>
@@ -754,10 +754,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             <td width="102"><select name="erel_opt" id="erel_opt">
                 <option value="--" selected="selected"> -- </option>
                     <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
diff --git a/server_binlog.php b/server_binlog.php
index 1cbe7bbf29..7a2262044c 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -117,7 +117,7 @@ PMA_showMessage(PMA_Message::success());
  * Displays the page
  */
 ?>
-<table border="0" cellpadding="2" cellspacing="1">
+<table cellpadding="2" cellspacing="1">
 <thead>
 <tr>
     <td colspan="6" align="center">
diff --git a/server_status.php b/server_status.php
index 6cdd5c6228..1acd120c8f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -830,13 +830,13 @@ echo __('Runtime Information');
         </div>
         <div id="statustabs_allvars" class="clearfloat">
             <fieldset id="tableFilter" class="jsfeature">
+                <legend><?php echo __('Filters'); ?></legend>
                 <div class="buttonlinks">
                     <a class="tabRefresh" href="<?php echo $PMA_PHP_SELF . '?show=variables_table&amp;' . PMA_generate_common_url(); ?>" >
                         <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
                         <?php echo __('Refresh'); ?>
                     </a>
                 </div>
-                <legend><?php echo __('Filters'); ?></legend>
                 <div class="formelement">
                     <label for="filterText"><?php echo __('Containing the word:'); ?></label>
                     <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" />
@@ -1550,7 +1550,7 @@ function printMonitor()
             <?php echo PMA_getImage('play.png'); ?>
             <?php echo __('Start Monitor'); ?>
         </a>
-        <a href="#settingsPopup" rel="popupLink" style="display:none;">
+        <a href="#settingsPopup" class="popupLink" style="display:none;">
             <?php echo PMA_getImage('s_cog.png'); ?>
             <?php echo __('Settings'); ?>
         </a>
@@ -1735,7 +1735,7 @@ function printMonitor()
     </div>
     <?php } ?>
 
-    <table border="0" class="clearfloat" id="chartGrid">
+    <table class="clearfloat" id="chartGrid">
 
     </table>
     <div id="logTable">
diff --git a/tbl_change.php b/tbl_change.php
index 7a244ff307..d5059a7e78 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -1047,7 +1047,7 @@ foreach ($rows as $row_id => $vrow) {
     <div id="gis_editor"></div><div id="popup_background"></div>
     <br />
     <fieldset id="actions_panel">
-    <table border="0" cellpadding="5" cellspacing="0">
+    <table cellpadding="5" cellspacing="0">
     <tr>
         <td valign="middle" nowrap="nowrap">
             <select name="submit_type" class="control_at_footer" tabindex="<?php echo ($tabindex + $tabindex_for_value + 1); ?>">
diff --git a/tbl_printview.php b/tbl_printview.php
index 03c5c75f8e..79dd3d3173 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -261,7 +261,7 @@ foreach ($the_tables as $key => $table) {
                 ?>
     <br /><br />
 
-    <table border="0" cellspacing="0" cellpadding="0" class="noborder">
+    <table cellspacing="0" cellpadding="0">
     <tr>
 
         <!-- Space usage -->
diff --git a/themes.php b/themes.php
index f343987291..9c6d6731f2 100644
--- a/themes.php
+++ b/themes.php
@@ -25,7 +25,7 @@ require './libraries/header_scripts.inc.php';
 
 <body id="bodythemes">
 <h1>phpMyAdmin - <?php echo __('Theme'); ?></h1>
-<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" rel="_blank"><?php echo __('Get more themes!'); ?></a></p>
+<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" class="_blank"><?php echo __('Get more themes!'); ?></a></p>
 <?php
 $_SESSION['PMA_Theme_Manager']->printPreviews();
 ?>
diff --git a/transformation_overview.php b/transformation_overview.php
index 12db462345..ae80a506e8 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -40,7 +40,7 @@ foreach ($types['mimetype'] as $key => $mimetype) {
 <br />
 <br />
 <h2><?php echo __('Available transformations'); ?></h2>
-<table border="0" width="90%">
+<table width="90%">
 <thead>
 <tr>
     <th><?php echo __('Browser transformation'); ?></th>

From 82031adf7530d2b700ea051d362827be9b1fb06f Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 17:54:40 +0100
Subject: [PATCH 34/36] Documentation: Use <strong>, <em> semantics instead of
 <b>, <i>

---
 Documentation.html | 246 ++++++++++++++++++++++-----------------------
 1 file changed, 123 insertions(+), 123 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index a784b21437..9c870ac9ba 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -56,7 +56,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <!-- REQUIREMENTS -->
 <h2 id="require">Requirements</h2>
 
-<ul><li><b>PHP</b>
+<ul><li><strong>PHP</strong>
         <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
                 (<a href="#faq1_31">see
             <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
@@ -73,7 +73,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
             <li>When using the &quot;cookie&quot;
                 <a href="#authentication_modes">authentication method</a>, the
                 <a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> extension
-                is strongly suggested for most users and is <b>required</b> for
+                is strongly suggested for most users and is <strong>required</strong> for
                 64&#8211;bit machines. Not using mcrypt will cause phpMyAdmin to
                 load pages significantly slower.
                 </li>
@@ -84,8 +84,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
                 <a href="http://www.php.net/libxml"><tt>libxml</tt></a> extension.</li>
         </ul>
     </li>
-    <li><b>MySQL</b> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
-    <li><b>Web browser</b> with cookies enabled.</li>
+    <li><strong>MySQL</strong> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
+    <li><strong>Web browser</strong> with cookies enabled.</li>
 </ul>
 
 <!-- INTRODUCTION -->
@@ -271,7 +271,7 @@ chmod o+w config/config.inc.php     # give it world writable permissions
                 Next, open <tt><a href="setup/">setup/</a>
                 </tt>in your browser. Note that <strong>changes are not saved to
                 disk until explicitly choose <tt>Save</tt></strong> from the
-                <i>Configuration</i> area of the screen. Normally the script saves
+                <em>Configuration</em> area of the screen. Normally the script saves
                 the new config.inc.php to the <tt>config/</tt> directory, but if
                 the webserver does not have the proper permissions you may see the
                 error "Cannot load or save configuration." Ensure that the <tt>
@@ -296,7 +296,7 @@ rm -rf config                      # remove not needed directory
         config does not require a user to
         enter a password to access the phpMyAdmin installation. Use of an alternate
         authentication method is recommended, for example with
-        HTTP&#8211;AUTH in a <a href="#glossary"><i>.htaccess</i></a> file or switch to using
+        HTTP&#8211;AUTH in a <a href="#glossary"><em>.htaccess</em></a> file or switch to using
         <tt>auth_type</tt> cookie or http. See the
         <a href="#faqmultiuser"> multi&#8211;user sub&#8211;section</a> of this
         <abbr title="Frequently Asked Questions">FAQ</abbr> for additional
@@ -309,7 +309,7 @@ rm -rf config                      # remove not needed directory
         authentication mode.</li>
     <li>You should deny access to the <tt>./libraries</tt> and
         <tt>./setup/lib</tt> subfolders in your webserver configuration. For
-        Apache you can use supplied <a href="#glossary"><i>.htaccess</i></a> file in that folder, for other
+        Apache you can use supplied <a href="#glossary"><em>.htaccess</em></a> file in that folder, for other
         webservers, you should configure this yourself.  Such configuration
         prevents from possible path exposure and cross side scripting
         vulnerabilities that might happen to be found in that code.</li>
@@ -334,21 +334,21 @@ rm -rf config                      # remove not needed directory
     controluser, so no other user should have rights to it).</p>
 
 <p> Please look at your <tt>./examples/</tt> directory, where you should find a
-    file called <i>create_tables.sql</i>. (If you are using a Windows server, pay
+    file called <em>create_tables.sql</em>. (If you are using a Windows server, pay
     special attention to <a href="#faq1_23">
     <abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
 
 <p> If you already had this infrastructure and upgraded to MySQL 4.1.2
-    or newer, please use <i>./examples/upgrade_tables_mysql_4_1_2+.sql</i>
-    and then create new tables by importing <i>./examples/create_tables.sql</i>.</p>
+    or newer, please use <em>./examples/upgrade_tables_mysql_4_1_2+.sql</em>
+    and then create new tables by importing <em>./examples/create_tables.sql</em>.</p>
 
 <p> You can use your phpMyAdmin to create the tables for you. Please be aware
     that you may need special (administrator) privileges to create the database
     and tables, and that the script may need some tuning, depending on the
     database name.</p>
 
-<p> After having imported the <i>./examples/create_tables.sql</i> file, you
-    should specify the table names in your <i>./config.inc.php</i> file. The
+<p> After having imported the <em>./examples/create_tables.sql</em> file, you
+    should specify the table names in your <em>./config.inc.php</em> file. The
     directives used for that can be found in the <a href="#config">Configuration
     section</a>. You will also need to have a controluser with the proper rights
     to those tables (see section <a href="#authentication_modes">Using
@@ -356,7 +356,7 @@ rm -rf config                      # remove not needed directory
 
 <h3 id="upgrading">Upgrading from an older version</h3>
 
-<p> Simply copy <i>./config.inc.php</i> from your previous installation into the newly
+<p> Simply copy <em>./config.inc.php</em> from your previous installation into the newly
     unpacked one. Configuration files from old versions may
     require some tweaking as some options have been changed or removed; in
     particular, the definition of <tt>$cfg['AttributeTypes']</tt> has changed
@@ -376,12 +376,12 @@ rm -rf config                      # remove not needed directory
 <h3 id="authentication_modes">Using authentication modes</h3>
 
 <ul><li><abbr title="HyperText Transfer Protocol">HTTP</abbr> and cookie
-        authentication modes are recommended in a <b>multi-user environment</b>
+        authentication modes are recommended in a <strong>multi-user environment</strong>
         where you want to give users access to their own database and don't want
         them to play around with others.<br />
         Nevertheless be aware that MS Internet Explorer seems to be really buggy
         about cookies, at least till version 6.<br />
-        Even in a <b>single-user environment</b>, you might prefer to use
+        Even in a <strong>single-user environment</strong>, you might prefer to use
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie mode so
         that your user/password pair are not in clear in the configuration file.
         </li>
@@ -399,11 +399,11 @@ rm -rf config                      # remove not needed directory
         your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
 
         For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
-        modes, phpMyAdmin needs a controluser that has <b>only</b> the
-        <tt>SELECT</tt> privilege on the <i>`mysql`.`user` (all columns except
-        `Password`)</i>, <i>`mysql`.`db` (all columns)</i>, <i>`mysql`.`host`
-        (all columns)</i> and <i>`mysql`.`tables_priv` (all columns except
-        `Grantor` and `Timestamp`)</i> tables.<br /> You must specify the details
+        modes, phpMyAdmin needs a controluser that has <strong>only</strong> the
+        <tt>SELECT</tt> privilege on the <em>`mysql`.`user` (all columns except
+        `Password`)</em>, <em>`mysql`.`db` (all columns)</em>, <em>`mysql`.`host`
+        (all columns)</em> and <em>`mysql`.`tables_priv` (all columns except
+        `Grantor` and `Timestamp`)</em> tables.<br /> You must specify the details
         for the <a href="#controluser">controluser</a> in the <tt>config.inc.php</tt>
         file under the
         <tt><a href="#cfg_Servers_controluser" class="configrule">
@@ -411,8 +411,8 @@ rm -rf config                      # remove not needed directory
         <tt><a href="#cfg_Servers_controlpass" class="configrule">
             $cfg['Servers'][$i]['controlpass']</a></tt> settings.<br />
         The following example assumes you want to use <tt>pma</tt> as the
-        controluser and <tt>pmapass</tt> as the controlpass, but <b>this is
-        only an example: use something else in your file!</b> Input these
+        controluser and <tt>pmapass</tt> as the controlpass, but <strong>this is
+        only an example: use something else in your file!</strong> Input these
         statements from the phpMyAdmin <abbr title="structured query language">SQL
         </abbr> Query window or mysql command&#8211;line client.<br />
         Of course you have to replace <tt>localhost</tt> with the webserver's host
@@ -442,12 +442,12 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
         configuration storage</a> be set up).  
     <br /></li>
 
-    <li>Then each of the <i>true</i> users should be granted a set of privileges
+    <li>Then each of the <em>true</em> users should be granted a set of privileges
         on a set of particular databases. Normally you shouldn't give global
         privileges to an ordinary user, unless you understand the impact of those
         privileges (for example, you are creating a superuser).<br />
-        For example, to grant the user <i>real_user</i> with all privileges on
-        the database <i>user_base</i>:<br />
+        For example, to grant the user <em>real_user</em> with all privileges on
+        the database <em>user_base</em>:<br />
 
         <pre>
 GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password';
@@ -476,7 +476,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
         1.35</a>.</li>
     <li>See also <a href="#faq4_4">
         <abbr title="Frequently Asked Questions">FAQ</abbr> 4.4</a> about not
-        using the <a href="#glossary"><i>.htaccess</i></a> mechanism along with
+        using the <a href="#glossary"><em>.htaccess</em></a> mechanism along with
         '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication
         mode.</li>
 </ul>
@@ -534,7 +534,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
     <li>Unlike cookie and http, does not require a user to log in when first
         loading the phpMyAdmin site. This is by design but could allow any
         user to access your installation. Use of some restriction method is
-        suggested, perhaps a <a href="#glossary"><i>.htaccess</i></a> file with the
+        suggested, perhaps a <a href="#glossary"><em>.htaccess</em></a> file with the
         HTTP-AUTH directive or disallowing incoming HTTP requests at
         one&#8217;s router or firewall will suffice (both of which
         are beyond the scope of this manual but easily searchable with Google).</li>
@@ -581,7 +581,7 @@ since this link provides funding for phpMyAdmin.
 
 <p> The parameters which relate to design (like colors) are placed in
     <tt>themes/themename/layout.inc.php</tt>. You might also want to create
-    <i>config.footer.inc.php</i> and <i>config.header.inc.php</i> files to add
+    <em>config.footer.inc.php</em> and <em>config.header.inc.php</em> files to add
     your site specific code to be included on start and end of each page.</p>
 
 <dl><dt id="cfg_PmaAbsoluteUri">$cfg['PmaAbsoluteUri'] string</dt>
@@ -697,10 +697,10 @@ since this link provides funding for phpMyAdmin.
     <dd>What php MySQL extension to use for the connection. Valid options are:
         <br /><br />
 
-        <tt><i>mysql</i></tt> :
+        <tt><em>mysql</em></tt> :
         The classic MySQL extension.<br /><br />
 
-        <tt><i>mysqli</i></tt> :
+        <tt><em>mysqli</em></tt> :
         The improved MySQL extension. This extension became available
         with PHP 5.0.0 and is the recommended way to connect to a server
         running MySQL 4.1.x or newer.</dd>
@@ -731,9 +731,9 @@ since this link provides funding for phpMyAdmin.
         cookie authentication modes (or 'config'
         authentication mode since phpMyAdmin 2.2.1), you need to supply the
         details of a MySQL account that has <tt>SELECT</tt> privilege on the
-        <i>mysql.user (all columns except &quot;Password&quot;)</i>,
-        <i>mysql.db (all columns)</i> and <i>mysql.tables_priv (all columns
-        except &quot;Grantor&quot; and &quot;Timestamp&quot;) </i>tables.
+        <em>mysql.user (all columns except &quot;Password&quot;)</em>,
+        <em>mysql.db (all columns)</em> and <em>mysql.tables_priv (all columns
+        except &quot;Grantor&quot; and &quot;Timestamp&quot;) </em>tables.
         This account is used to check what databases the user will see at
         login.<br />
         Please see the <a href="#setup">install section</a> on
@@ -749,7 +749,7 @@ since this link provides funding for phpMyAdmin.
         should be used for this server.
         <ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>)
                 is the plain old way: username and password are stored in
-                <i>config.inc.php</i>.</li>
+                <em>config.inc.php</em>.</li>
             <li>'cookie' authentication mode
                 (<tt>$auth_type&nbsp;=&nbsp;'cookie'</tt>) as introduced in
                 2.2.3 allows you to log in as any valid MySQL user with the
@@ -1030,7 +1030,7 @@ ALTER TABLE `pma_column_comments`
     ADD `transformation_options` VARCHAR( 255 ) NOT NULL;
 </pre>
 
-                and remember that the Variable in <i>config.inc.php</i> has been
+                and remember that the Variable in <em>config.inc.php</em> has been
                 renamed from<br />
                 <tt>$cfg['Servers'][$i]['column_comments']</tt> to
                 <tt>$cfg['Servers'][$i]['column_info']</tt></li>
@@ -1280,9 +1280,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 
         If your rule order is set to 'explicit', authorization is
         performed in a similar fashion to rule order 'deny,allow', with the
-        added restriction that your host/username combination <b>must</b> be
-        listed in the <i>allow</i> rules, and not listed in the <i>deny</i>
-        rules. This is the <b>most</b> secure means of using Allow/Deny rules,
+        added restriction that your host/username combination <strong>must</strong> be
+        listed in the <em>allow</em> rules, and not listed in the <em>deny</em>
+        rules. This is the <strong>most</strong> secure means of using Allow/Deny rules,
         and was available in Apache by specifying allow and deny rules without
         setting any order.<br /><br />
 
@@ -1300,8 +1300,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 </pre>
 
         If you wish to match all users, it is possible to use a <tt>'%'</tt> as
-        a wildcard in the <i>username</i> field.<br />
-        There are a few shortcuts you can use in the <i>ipmask</i> field as
+        a wildcard in the <em>username</em> field.<br />
+        There are a few shortcuts you can use in the <em>ipmask</em> field as
         well (please note that those containing SERVER_ADDRESS might not be
         available on all webservers):
         <pre>
@@ -1514,7 +1514,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and permits to specify servers of your choice in the Synchronize dialog.
         <br /><br />
 
-        <b>NOTE:</b> Please use this carefully, as this may allow users access to
+        <strong>NOTE:</strong> Please use this carefully, as this may allow users access to
         MySQL servers behind the firewall where your
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
     </dd>
@@ -1641,7 +1641,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         does not check MySQL commands entered directly.<br /><br />
 
         Please note that to block the usage of phpinfo() in scripts, you
-        have to put this in your <i>php.ini</i>:
+        have to put this in your <em>php.ini</em>:
 
         <pre>disable_functions = phpinfo()</pre>
 
@@ -1733,7 +1733,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>For the foreign key drop-down fields, there are several methods of
         display, offering both the key and value data. The contents of the
         array should be one or both of the following strings:
-        <i>'content-id'</i>, <i>'id-content'</i>.</dd>
+        <em>'content-id'</em>, <em>'id-content'</em>.</dd>
 
     <dt><span id="cfg_ZipDump">$cfg['ZipDump'] </span>boolean<br />
         <span id="cfg_GZipDump">$cfg['GZipDump'] </span>boolean<br />
@@ -1807,7 +1807,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Defines the default language to use, if not browser-defined or
         user-defined.<br />
         The corresponding language file needs to be in
-        locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo.
+        locale/<em>code</em>/LC_MESSAGES/phpmyadmin.mo.
         </dd>
 
     <dt id="cfg_DefaultConnectionCollation">$cfg['DefaultConnectionCollation'] string</dt>
@@ -1820,7 +1820,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dt id="cfg_Lang">$cfg['Lang'] string</dt>
     <dd>Force language to use.<br />
         The corresponding language file needs to be in
-        locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo.
+        locale/<em>code</em>/LC_MESSAGES/phpmyadmin.mo.
         </dd>
 
     <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] string</dt>
@@ -2341,36 +2341,36 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dt id="cfg_SQP_fmtColor">$cfg['SQP']['fmtColor'] array of string tuples</dt>
     <dd>This array is used to define the colours for each type of element of
         the pretty-printed <abbr title="structured query language">SQL</abbr> queries. The tuple format is<br />
-        <i>class</i> =&gt; [<i>HTML colour code</i> | <i>empty string</i>]<br />
+        <em>class</em> =&gt; [<em>HTML colour code</em> | <em>empty string</em>]<br />
         If you specify an empty string for the color of a class, it is ignored
         in creating the stylesheet.
         You should not alter the class names, only the colour strings.<br />
-        <b>Class name key:</b>
-        <ul><li><b>comment</b> Applies to all comment sub-classes</li>
-            <li><b>comment_mysql</b> Comments as <tt>"#...\n"</tt></li>
-            <li><b>comment_ansi</b> Comments as <tt>"-- ...\n"</tt></li>
-            <li><b>comment_c</b> Comments as <tt>"/*...*/"</tt></li>
-            <li><b>digit</b> Applies to all digit sub-classes</li>
-            <li><b>digit_hex</b> Hexadecimal numbers</li>
-            <li><b>digit_integer</b> Integer numbers</li>
-            <li><b>digit_float</b> Floating point numbers</li>
-            <li><b>punct</b> Applies to all punctuation sub-classes</li>
-            <li><b>punct_bracket_open_round</b> Opening brackets<tt>"("</tt></li>
-            <li><b>punct_bracket_close_round</b> Closing brackets <tt>")"</tt></li>
-            <li><b>punct_listsep</b> List item Separator <tt>","</tt></li>
-            <li><b>punct_qualifier</b> Table/Column Qualifier <tt>"."</tt> </li>
-            <li><b>punct_queryend</b> End of query marker <tt>";"</tt></li>
-            <li><b>alpha</b> Applies to all alphabetic classes</li>
-            <li><b>alpha_columnType</b> Identifiers matching a column type</li>
-            <li><b>alpha_columnAttrib</b> Identifiers matching a database/table/column attribute</li>
-            <li><b>alpha_functionName</b> Identifiers matching a MySQL function name</li>
-            <li><b>alpha_reservedWord</b> Identifiers matching any other reserved word</li>
-            <li><b>alpha_variable</b> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <tt>"@foo"</tt></li>
-            <li><b>alpha_identifier</b> All other identifiers</li>
-            <li><b>quote</b> Applies to all quotation mark classes</li>
-            <li><b>quote_double</b> Double quotes <tt>"</tt></li>
-            <li><b>quote_single</b> Single quotes <tt>'</tt></li>
-            <li><b>quote_backtick</b> Backtick quotes <tt>`</tt></li>
+        <strong>Class name key:</strong>
+        <ul><li><strong>comment</strong> Applies to all comment sub-classes</li>
+            <li><strong>comment_mysql</strong> Comments as <tt>"#...\n"</tt></li>
+            <li><strong>comment_ansi</strong> Comments as <tt>"-- ...\n"</tt></li>
+            <li><strong>comment_c</strong> Comments as <tt>"/*...*/"</tt></li>
+            <li><strong>digit</strong> Applies to all digit sub-classes</li>
+            <li><strong>digit_hex</strong> Hexadecimal numbers</li>
+            <li><strong>digit_integer</strong> Integer numbers</li>
+            <li><strong>digit_float</strong> Floating point numbers</li>
+            <li><strong>punct</strong> Applies to all punctuation sub-classes</li>
+            <li><strong>punct_bracket_open_round</strong> Opening brackets<tt>"("</tt></li>
+            <li><strong>punct_bracket_close_round</strong> Closing brackets <tt>")"</tt></li>
+            <li><strong>punct_listsep</strong> List item Separator <tt>","</tt></li>
+            <li><strong>punct_qualifier</strong> Table/Column Qualifier <tt>"."</tt> </li>
+            <li><strong>punct_queryend</strong> End of query marker <tt>";"</tt></li>
+            <li><strong>alpha</strong> Applies to all alphabetic classes</li>
+            <li><strong>alpha_columnType</strong> Identifiers matching a column type</li>
+            <li><strong>alpha_columnAttrib</strong> Identifiers matching a database/table/column attribute</li>
+            <li><strong>alpha_functionName</strong> Identifiers matching a MySQL function name</li>
+            <li><strong>alpha_reservedWord</strong> Identifiers matching any other reserved word</li>
+            <li><strong>alpha_variable</strong> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <tt>"@foo"</tt></li>
+            <li><strong>alpha_identifier</strong> All other identifiers</li>
+            <li><strong>quote</strong> Applies to all quotation mark classes</li>
+            <li><strong>quote_double</strong> Double quotes <tt>"</tt></li>
+            <li><strong>quote_single</strong> Single quotes <tt>'</tt></li>
+            <li><strong>quote_backtick</strong> Backtick quotes <tt>`</tt></li>
         </ul>
     </dd>
 
@@ -2394,10 +2394,10 @@ setfacl -d -m "g:www-data:rwx" tmp
     </dd>
 
     <dt id="cfg_DBG">$cfg['DBG']</dt>
-    <dd><b>DEVELOPERS ONLY!</b></dd>
+    <dd><strong>DEVELOPERS ONLY!</strong></dd>
 
     <dt id="cfg_DBG_sql">$cfg['DBG']['sql'] boolean</dt>
-    <dd><b>DEVELOPERS ONLY!</b><br />
+    <dd><strong>DEVELOPERS ONLY!</strong><br />
         Enable logging queries and execution times to be displayed in the bottom
         of main page (right frame).</dd>
 
@@ -2458,7 +2458,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <p> For a general overview of all available transformations and their options,
     you can consult your
-    <i>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/transformation_overview.php</i>
+    <em>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/transformation_overview.php</em>
     installation.</p>
 
 <p> For a tutorial on how to effectively use transformations, see our
@@ -2467,7 +2467,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <h3 id="transformationshowto">2. Usage</h3>
 
-<p> Go to your <i>tbl_structure.php</i> page (i.e. reached through
+<p> Go to your <em>tbl_structure.php</em> page (i.e. reached through
     clicking on the 'Structure' link for a table). There click on
     &quot;Change&quot; (or change icon) and there you will see three new
     fields at
@@ -2528,7 +2528,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     for, but pay attention to option usage as well as what the transformation does to your
     column.</p>
 
-<p> There is a basic file called '<i>global.inc.php</i>'. This function can be included by
+<p> There is a basic file called '<em>global.inc.php</em>'. This function can be included by
     any other transform function and provides some basic functions.</p>
 
 <p> There are 5 possible file names:</p>
@@ -2545,7 +2545,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         The transform function will the be called
         '<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>'.<br /><br />
 
-        <b>Example:</b><br /><br />
+        <strong>Example:</strong><br /><br />
 
         <tt>text_html__formatted.inc.php</tt><br />
         <tt>PMA_transform_text_html__formatted()</tt></li>
@@ -2562,7 +2562,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         The transform function will the be called
         '<tt>PMA_transform_[mimetype]__[transform]()</tt>'.<br /><br />
 
-        <b>Example:</b><br /><br />
+        <strong>Example:</strong><br /><br />
 
         <tt>text__formatted.inc.php</tt><br />
         <tt>PMA_transform_text__formatted()</tt></li>
@@ -2577,7 +2577,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         No transformation function is defined in the file itself.<br /><br />
 
-        <b>Example:</b><br /><br />
+        <strong>Example:</strong><br /><br />
 
         <tt>text_plain.inc.php</tt><br />
         (No function)</li>
@@ -2592,7 +2592,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         No transformation function is defined in the file itself.<br /><br />
 
-        <b>Example:</b><br /><br />
+        <strong>Example:</strong><br /><br />
 
         <tt>text.inc.php</tt><br />
         (No function)</li>
@@ -2604,7 +2604,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         The transform function will the be called
         '<tt>PMA_transform_global__[transform]()</tt>'.<br /><br />
 
-        <b>Example:</b><br /><br />
+        <strong>Example:</strong><br /><br />
 
         <tt>global__formatted</tt><br />
         <tt>PMA_transform_global__formatted()</tt></li>
@@ -2627,11 +2627,11 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <p> A transform function always gets passed three variables:</p>
 
-<ol><li><b>$buffer</b> - Contains the text inside of the column. This is the text,
+<ol><li><strong>$buffer</strong> - Contains the text inside of the column. This is the text,
         you want to transform.</li>
-    <li><b>$options</b> - Contains any user-passed options to a transform function
+    <li><strong>$options</strong> - Contains any user-passed options to a transform function
         as an array.</li>
-    <li><b>$meta</b> - Contains an object with information about your column.
+    <li><strong>$meta</strong> - Contains an object with information about your column.
         The data is drawn from the output of the
         <a href="http://www.php.net/mysql_fetch_field">mysql_fetch_field()</a>
         function. This means, all object properties described on the
@@ -2681,7 +2681,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     cryptic characters to my browser, what can I do?</a></h4>
 
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a>
-    directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the
+    directive to <tt>FALSE</tt> in your <em>config.inc.php</em> file and the
     <tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php
     configuration file.<br /></p>
 
@@ -2706,7 +2706,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="HyperText Transfer Protocol">HTTP</abbr> headers ...&quot;.</a>
 </h4>
 
-<p> You just forgot to read the <i>install.txt</i> file from the PHP distribution.
+<p> You just forgot to read the <em>install.txt</em> file from the PHP distribution.
     Have a look at the last message in this
     <a href="http://bugs.php.net/bug.php?id=12061">bug report</a> from the
     official PHP bug database.</p>
@@ -2727,9 +2727,9 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <p> This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
     time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
-    declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>,
-    <i>libraries/header_printview.inc.php</i>, <i>index.php</i>,
-    <i>navigation.php</i> and <i>libraries/common.lib.php</i>.</p>
+    declarations (2 lines) from the scripts <em>libraries/header.inc.php</em>,
+    <em>libraries/header_printview.inc.php</em>, <em>index.php</em>,
+    <em>navigation.php</em> and <em>libraries/common.lib.php</em>.</p>
 
 <h4 id="faq1_7">
     <a href="#faq1_7">1.7 How can I GZip or Bzip a dump or a
@@ -2746,8 +2746,8 @@ setfacl -d -m "g:www-data:rwx" tmp
     an error about safe mode being in effect.</a></h4>
 
 <p> Your uploaded file is saved by PHP in the &quot;upload dir&quot;, as
-    defined in <i>php.ini</i> by the variable <tt>upload_tmp_dir</tt> (usually
-    the system default is <i>/tmp</i>).<br />
+    defined in <em>php.ini</em> by the variable <tt>upload_tmp_dir</tt> (usually
+    the system default is <em>/tmp</em>).<br />
     We recommend the following setup for Apache servers running in safe mode,
     to enable uploads of files while being reasonably secure:</p>
 
@@ -2755,7 +2755,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <li>give ownership to the Apache server's user.group:
         <tt>chown apache.apache /tmp/php</tt></li>
     <li>give proper permission: <tt>chmod 600 /tmp/php</tt></li>
-    <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <i>php.ini</i></li>
+    <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <em>php.ini</em></li>
     <li>restart Apache</li>
 </ul>
 
@@ -2768,7 +2768,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     I'm using the Apache server.</a></h4>
 
 <p> As suggested by &quot;Rob M&quot; in the phpWizard forum, add this line to
-    your <i>httpd.conf</i>:</p>
+    your <em>httpd.conf</em>:</p>
 
     <pre>SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown</pre>
 
@@ -2798,7 +2798,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
-    <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column names.</a>
+    <a href="#faq1_15">1.15 I have problems with <em>mysql.user</em> column names.</a>
 </h4>
 
 <p> In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns 
@@ -2816,7 +2816,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <p> The first things to check (or ask your host provider to check) are the
     values of <tt>upload_max_filesize</tt>, <tt>memory_limit</tt> and
-    <tt>post_max_size</tt> in the <i>php.ini</i> configuration file.
+    <tt>post_max_size</tt> in the <em>php.ini</em> configuration file.
     All of these three settings limit the maximum size of data that can be
     submitted and handled by PHP. One user also said that
     <tt>post_max_size</tt>
@@ -2837,7 +2837,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         with it.</li>
     <li>If you have shell (command line) access, use MySQL to import the files
         directly. You can do this by issuing the &quot;source&quot; command from
-        within MySQL: <tt>source <i>filename.sql</i></tt>.</li>
+        within MySQL: <tt>source <em>filename.sql</em></tt>.</li>
 </ul>
 
 <h4 id="faq1_17">
@@ -2900,7 +2900,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 <p> To connect to a MySQL server, PHP needs a set of MySQL functions called
     &quot;MySQL extension&quot;. This extension may be part of the PHP
     distribution (compiled-in), otherwise it needs to be loaded dynamically. Its
-    name is probably <i>mysql.so</i> or <i>php_mysql.dll</i>. phpMyAdmin tried
+    name is probably <em>mysql.so</em> or <em>php_mysql.dll</em>. phpMyAdmin tried
     to load the extension but failed.<br /><br />
 
     Usually, the problem is solved by installing a software package called
@@ -2911,13 +2911,13 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="Common Gateway Interface">CGI</abbr> version of PHP under Unix,
     and I cannot log in using cookie auth.</a></h4>
 
-<p> In <i>php.ini</i>, set <tt>mysql.max_links</tt> higher than 1.</p>
+<p> In <em>php.ini</em>, set <tt>mysql.max_links</tt> higher than 1.</p>
 
 <h4 id="faq1_22">
     <a href="#faq1_22">1.22 I don't see the &quot;Location of text file&quot; field,
     so I cannot upload.</a></h4>
 
-<p> This is most likely because in <i>php.ini</i>, your <tt>file_uploads</tt>
+<p> This is most likely because in <em>php.ini</em>, your <tt>file_uploads</tt>
     parameter is not set to &quot;on&quot;.</p>
 
 <h4 id="faq1_23">
@@ -2974,7 +2974,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 <p> This is a <a href="http://bugs.php.net/21079">PHP bug</a> that occur when
     GZIP output buffering is enabled. If you turn off it (by
     <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip'] = false</a>
-    in <i>config.inc.php</i>), it should work. This bug will be fixed in
+    in <em>config.inc.php</em>), it should work. This bug will be fixed in
     PHP&nbsp;5.0.0.</p>
 
 <h4 id="faq1_28">
@@ -3065,7 +3065,7 @@ the order of the server paragraph in <tt>config.inc.php</tt>.
     <code>Options FollowSymLinks</code> and <code>AllowOverride
     FileInfo</code> enabled for directory where phpMyAdmin is installed and
     you need mod_rewrite to be enabled. Then you just need to create following
-    <a href="#glossary"><i>.htaccess</i></a> file in root folder of phpMyAdmin installation
+    <a href="#glossary"><em>.htaccess</em></a> file in root folder of phpMyAdmin installation
     (don't forget to change directory name inside of it):</p>
 
 <pre>
@@ -3190,7 +3190,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
 <h4 id="faq1_42">
     <a href="#faq1_42">1.42 How can I prevent robots from accessing phpMyAdmin?</a></h4>
 
-<p>You can add various rules to <a href="#glossary"><i>.htaccess</i></a> to filter access
+<p>You can add various rules to <a href="#glossary"><em>.htaccess</em></a> to filter access
 based on user agent field. This is quite easy to circumvent, but could prevent at least
 some robots accessing your installation.</p>
 
@@ -3223,7 +3223,7 @@ RewriteRule .* - [F]
     <a href="#faq2_1">2.1 The error message &quot;Warning: Cannot add header information -
     headers already sent by ...&quot; is displayed, what's the problem?</a></h4>
 
-<p> Edit your <i>config.inc.php</i> file and ensure there is nothing
+<p> Edit your <em>config.inc.php</em> file and ensure there is nothing
     (I.E. no blank lines, no spaces, no characters...) neither before the
     <tt>&lt;?php</tt> tag at the beginning, neither after the <tt>?&gt;</tt>
     tag at the end. We also got a report from a user under
@@ -3247,8 +3247,8 @@ RewriteRule .* - [F]
 
 <p> For RedHat users, Harald Legner suggests this on the mailing list:</p>
 
-<p> On my RedHat-Box the socket of MySQL is <i>/var/lib/mysql/mysql.sock</i>.
-    In your <i>php.ini</i> you will find a line</p>
+<p> On my RedHat-Box the socket of MySQL is <em>/var/lib/mysql/mysql.sock</em>.
+    In your <em>php.ini</em> you will find a line</p>
 
 <pre>mysql.default_socket = /tmp/mysql.sock</pre>
 
@@ -3262,13 +3262,13 @@ RewriteRule .* - [F]
 
 <ul><li>First, you need to determine what socket is being used by MySQL.<br />
         To do this, telnet to your server and go to the MySQL bin directory. In
-        this directory there should be a file named <i>mysqladmin</i>. Type
+        this directory there should be a file named <em>mysqladmin</em>. Type
         <tt>./mysqladmin variables</tt>, and this should give you a bunch of
         info about your MySQL server, including the socket
-        (<i>/tmp/mysql.sock</i>, for example).</li>
+        (<em>/tmp/mysql.sock</em>, for example).</li>
     <li>Then, you need to tell PHP to use this socket.<br /> To do this in
         phpMyAdmin, you need to complete the  socket information in the
-        <i>config.inc.php</i>.<br />
+        <em>config.inc.php</em>.<br />
         For example:
         <a href="#cfg_Servers_socket" class="configrule">
         $cfg['Servers'][$i]['socket']&nbsp;=&nbsp;'/tmp/mysql.sock';</a>
@@ -3622,7 +3622,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
     This depends on your system.<br />
     If you're running a server which cannot be accessed by other people, it's
     sufficient to use the directory protection bundled with your webserver
-    (with Apache you can use <a href="#glossary"><i>.htaccess</i></a> files, for example).<br />
+    (with Apache you can use <a href="#glossary"><em>.htaccess</em></a> files, for example).<br />
     If other people have telnet access to your server, you should use
     phpMyAdmin's <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie authentication features.
     <br /><br />
@@ -3630,7 +3630,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 </p>
 <ul>
     <li>
-        Your <i>config.inc.php</i> file should be <tt>chmod 660</tt>.
+        Your <em>config.inc.php</em> file should be <tt>chmod 660</tt>.
     </li>
     <li>
         All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
@@ -3644,10 +3644,10 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 
 <h4 id="faq4_3">
     <a href="#faq4_3">4.3 I get errors about not being able to include a file in
-    <i>/lang</i> or in <i>/libraries</i>.
+    <em>/lang</em> or in <em>/libraries</em>.
 </a></h4>
 <p>
-    Check <i>php.ini</i>, or ask your sysadmin to check it. The
+    Check <em>php.ini</em>, or ask your sysadmin to check it. The
     <tt>include_path</tt> must contain &quot;.&quot; somewhere in it, and
     <tt>open_basedir</tt>, if used, must contain &quot;.&quot; and
     &quot;./lang&quot; to allow normal operation of phpMyAdmin.
@@ -3666,7 +3666,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
         are wrong.</li>
     <li>The username/password you specify in the login dialog are invalid.</li>
     <li>You have already setup a security mechanism for the
-        phpMyAdmin-directory, eg. a <a href="#glossary"><i>.htaccess</i></a> file. This would interfere with
+        phpMyAdmin-directory, eg. a <a href="#glossary"><em>.htaccess</em></a> file. This would interfere with
         phpMyAdmin's authentication, so remove it.</li>
 </ul>
 
@@ -3682,7 +3682,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <h4 id="faq4_6">
     <a href="#faq4_6">4.6 How can I use the Host-based authentication additions?</a></h4>
 
-<p> If you have existing rules from an old <a href="#glossary"><i>.htaccess</i></a> file, you can take them
+<p> If you have existing rules from an old <a href="#glossary"><em>.htaccess</em></a> file, you can take them
     and add a username between the <tt>'deny'</tt>/<tt>'allow'</tt> and
     <tt>'from'</tt> strings. Using the username wildcard of <tt>'%'</tt> would
     be a major benefit here if your installation is suited to using it. Then
@@ -4114,7 +4114,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
 <h4 id="faqexport">
     <a href="#faqexport">6.12 I want to understand some Export options.</a></h4>
 
-<p><b>Structure:</b></p>
+<p><strong>Structure:</strong></p>
 
 <ul><li>&quot;Add DROP TABLE&quot; will add a line telling MySQL to
         <a href="http://dev.mysql.com/doc/mysql/en/drop-table.html">drop the table</a>,
@@ -4129,11 +4129,11 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
         column and table names formed with special characters are protected.</li>
     <li>&quot;Add into comments&quot; includes column comments, relations, and MIME
         types set in the pmadb in the dump as
-        <abbr title="structured query language">SQL</abbr> comments (<i>/* xxx */</i>).
+        <abbr title="structured query language">SQL</abbr> comments (<em>/* xxx */</em>).
        </li>
 </ul>
 
-<p><b>Data:</b></p>
+<p><strong>Data:</strong></p>
 
 <ul><li>&quot;Complete inserts&quot; adds the column names on every INSERT
         command, for better documentation (but resulting file is bigger).</li>
@@ -4234,12 +4234,12 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
     box appears on for that database.<br /><br />
 
     Since phpMyAdmin 2.5.0 you are also able to store variables for the bookmarks.
-    Just use the string <b>/*[VARIABLE]*/</b> anywhere in your query. Everything
-    which is put into the <i>value</i> input box on the query box page will
+    Just use the string <strong>/*[VARIABLE]*/</strong> anywhere in your query. Everything
+    which is put into the <em>value</em> input box on the query box page will
     replace the string &quot;/*[VARIABLE]*/&quot; in your stored query. Just be
     aware of that you HAVE to create a valid query, otherwise your query won't be
     even able to be stored in the database.<br />
-    Also remember, that everything else inside the <b>/*[VARIABLE]*/</b> string
+    Also remember, that everything else inside the <strong>/*[VARIABLE]*/</strong> string
     for your query will remain the way it is, but will be stripped of the /**/
     chars. So you can use:<br /><br />
 
@@ -4262,8 +4262,8 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
     <code>SELECT Name, Address FROM addresses WHERE 1 AND Name LIKE '%phpMyAdmin%'</code>
     <br /><br />
 
-    You can use multiple occurrences of <b>/*[VARIABLE]*/</b> in a single query (that is, multiple occurrences of the <i>same</i> variable).<br />
-    <b>NOTE THE ABSENCE OF SPACES</b> inside the &quot;/**/&quot; construct. Any
+    You can use multiple occurrences of <strong>/*[VARIABLE]*/</strong> in a single query (that is, multiple occurrences of the <em>same</em> variable).<br />
+    <strong>NOTE THE ABSENCE OF SPACES</strong> inside the &quot;/**/&quot; construct. Any
     spaces inserted there
     will be later also inserted as spaces in your query and may lead to unexpected
     results especially when

From 9842f01444204b33f85f803b5a81265ddaaa96cd Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 18:04:50 +0100
Subject: [PATCH 35/36] Replaced HTML5-obsolete <tt> tags with <code>

---
 Documentation.html             | 582 ++++++++++++++++-----------------
 libraries/common.inc.php       |   2 +-
 libraries/mult_submits.inc.php |   2 +-
 libraries/tcpdf/tcpdf.php      |   2 +-
 po/af.po                       |   4 +-
 po/ar.po                       |   4 +-
 po/az.po                       |   4 +-
 po/be.po                       |   4 +-
 po/be@latin.po                 |   2 +-
 po/bg.po                       |   4 +-
 po/bn.po                       |   4 +-
 po/br.po                       |   4 +-
 po/bs.po                       |   4 +-
 po/ca.po                       |   4 +-
 po/cs.po                       |   4 +-
 po/cy.po                       |   2 +-
 po/da.po                       |   4 +-
 po/de.po                       |  14 +-
 po/el.po                       |   4 +-
 po/en_GB.po                    |   4 +-
 po/es.po                       |   8 +-
 po/et.po                       |   4 +-
 po/eu.po                       |   4 +-
 po/fa.po                       |   2 +-
 po/fi.po                       |   4 +-
 po/fr.po                       |   4 +-
 po/gl.po                       |   4 +-
 po/he.po                       |   2 +-
 po/hi.po                       |   4 +-
 po/hr.po                       |   4 +-
 po/hu.po                       |   4 +-
 po/id.po                       |   4 +-
 po/it.po                       |   4 +-
 po/ja.po                       |   4 +-
 po/ka.po                       |   4 +-
 po/ko.po                       |   4 +-
 po/lt.po                       |   4 +-
 po/lv.po                       |   4 +-
 po/mk.po                       |   4 +-
 po/ml.po                       |   2 +-
 po/mn.po                       |   4 +-
 po/ms.po                       |   4 +-
 po/nb.po                       |   4 +-
 po/nl.po                       |   8 +-
 po/phpmyadmin.pot              |   2 +-
 po/pl.po                       |   4 +-
 po/pt.po                       |   4 +-
 po/pt_BR.po                    |   4 +-
 po/ro.po                       |   4 +-
 po/ru.po                       |   4 +-
 po/si.po                       |   4 +-
 po/sk.po                       |   4 +-
 po/sl.po                       |   4 +-
 po/sq.po                       |   4 +-
 po/sr.po                       |   4 +-
 po/sr@latin.po                 |   4 +-
 po/sv.po                       |   4 +-
 po/ta.po                       |   2 +-
 po/te.po                       |   2 +-
 po/th.po                       |   8 +-
 po/tk.po                       |   2 +-
 po/tr.po                       |   4 +-
 po/tt.po                       |   4 +-
 po/ug.po                       |   4 +-
 po/uk.po                       |   4 +-
 po/ur.po                       |   4 +-
 po/uz.po                       |   4 +-
 po/uz@latin.po                 |   4 +-
 po/zh_CN.po                    |   4 +-
 po/zh_TW.po                    |   4 +-
 server_privileges.php          |  48 +--
 sql.php                        |   2 +-
 test/theme.php                 |   2 +-
 73 files changed, 454 insertions(+), 454 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 9c870ac9ba..976944b72c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -57,12 +57,12 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <h2 id="require">Requirements</h2>
 
 <ul><li><strong>PHP</strong>
-        <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
+        <ul><li>You need PHP 5.2.0 or newer, with <code>session</code> support
                 (<a href="#faq1_31">see
             <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
         , the Standard PHP Library (SPL) extension and JSON support.
                 </li>
-        <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
+        <li>To support uploading of ZIP files, you need the PHP <code>zip</code> extension.</li>
         <li>For proper support of multibyte strings (eg. UTF-8, which is
             currently the default), you should install the mbstring and ctype
             extensions.
@@ -72,7 +72,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
                 original aspect ratio.</li>
             <li>When using the &quot;cookie&quot;
                 <a href="#authentication_modes">authentication method</a>, the
-                <a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> extension
+                <a href="http://www.php.net/mcrypt"><code>mcrypt</code></a> extension
                 is strongly suggested for most users and is <strong>required</strong> for
                 64&#8211;bit machines. Not using mcrypt will cause phpMyAdmin to
                 load pages significantly slower.
@@ -81,7 +81,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
                     <abbr title="Frequently Asked Questions">FAQ</abbr> 2.9</a>.</li>
                 <li>To support XML and Open Document Spreadsheet importing,
                 you need PHP 5.2.17 or newer and the 
-                <a href="http://www.php.net/libxml"><tt>libxml</tt></a> extension.</li>
+                <a href="http://www.php.net/libxml"><code>libxml</code></a> extension.</li>
         </ul>
     </li>
     <li><strong>MySQL</strong> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
@@ -158,9 +158,9 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <p class="footnote" id="footnote_1">
     <sup>1)</sup> phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 formats)
     dumps and <abbr title="comma separated values">CSV</abbr> exports if you use
-    PHP with Zlib support (<tt>--with-zlib</tt>) and/or Bzip2 support
-    (<tt>--with-bz2</tt>). Proper support may also need changes in
-    <tt>php.ini</tt>.</p>
+    PHP with Zlib support (<code>--with-zlib</code>) and/or Bzip2 support
+    (<code>--with-bz2</code>). Proper support may also need changes in
+    <code>php.ini</code>.</p>
 
 <!-- INSTALLATION -->
 <h2 id="setup">Installation</h2>
@@ -188,7 +188,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     So you'll have to resave as in BBEdit to Unix style ALL phpMyAdmin scripts
     before uploading them to your server, as PHP seems not to like
     <acronym title="Apple Macintosh">Mac</acronym>-style end of lines character
-    (&quot;<tt>\r</tt>&quot;).</p>
+    (&quot;<code>\r</code>&quot;).</p>
 
 <h3 id="quick_install">Quick Install</h3>
 <ol><li>Choose an appropriate distribution kit from the phpmyadmin.net
@@ -196,10 +196,10 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     others contain all languages in UTF-8 format (this should be fine
     in most situations), others contain all
     languages and all character sets. We'll assume you chose a kit whose
-    name looks like <tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>.
+    name looks like <code>phpMyAdmin-x.x.x-all-languages.tar.gz</code>.
     </li>
     <li>Untar or unzip the distribution (be sure to unzip the subdirectories):
-        <tt>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</tt> in your webserver's
+        <code>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</code> in your webserver's
         document root. If you don't have direct access to your document root,
         put the files in a directory on your local machine, and, after step 4,
         transfer the directory on your web server using, for example, ftp.</li>
@@ -212,18 +212,18 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
         1.26</a> for suggestions.</li>
     <li>Now you must configure your installation. There are two methods that
         can be used. Traditionally, users have hand-edited a copy of
-    <tt>config.inc.php</tt>, but now a wizard-style setup script is
+    <code>config.inc.php</code>, but now a wizard-style setup script is
     provided for those who prefer a graphical installation. Creating a
-    <tt>config.inc.php</tt> is still a quick way to get started and needed for some advanced features.
+    <code>config.inc.php</code> is still a quick way to get started and needed for some advanced features.
         <ul><li>To manually create the file, simply use your text editor to
-                create the file <tt>config.inc.php</tt> (you can copy
-                <tt>config.sample.inc.php</tt> to get minimal configuration
+                create the file <code>config.inc.php</code> (you can copy
+                <code>config.sample.inc.php</code> to get minimal configuration
                 file) in the main (top-level) phpMyAdmin directory (the one
-                that contains <tt>index.php</tt>).  phpMyAdmin first loads
-                <tt>libraries/config.default.php</tt> and then overrides those
-                values with anything found in <tt>config.inc.php</tt>. If the
+                that contains <code>index.php</code>).  phpMyAdmin first loads
+                <code>libraries/config.default.php</code> and then overrides those
+                values with anything found in <code>config.inc.php</code>. If the
                 default value is okay for a particular setting, there is no
-                need to include it in <tt>config.inc.php</tt>.  You'll need a
+                need to include it in <code>config.inc.php</code>.  You'll need a
                 few directives to get going, a simple configuration may look
                 like this:
 <pre>
@@ -249,9 +249,9 @@ $cfg['Servers'][$i]['auth_type']     = 'config';
                 For a full explanation of possible configuration values, see the
                 <a href="#config">Configuration Section</a> of this document.</li>
             <li id="setup_script">Instead of manually editing
-                <tt>config.inc.php</tt>, you can use the
+                <code>config.inc.php</code>, you can use the
                 <a href="setup/">Setup Script</a>. First you must
-                manually create a folder <tt>config</tt> in the phpMyAdmin
+                manually create a folder <code>config</code> in the phpMyAdmin
                 directory. This is a security measure. On a Linux/Unix system you
                 can use the following commands:
 <pre>
@@ -268,19 +268,19 @@ chmod o+w config/config.inc.php     # give it world writable permissions
                 web server has read and write access to it. <a href="#faq1_26">FAQ
                 1.26</a> can help with this.<br /><br />
 
-                Next, open <tt><a href="setup/">setup/</a>
-                </tt>in your browser. Note that <strong>changes are not saved to
-                disk until explicitly choose <tt>Save</tt></strong> from the
+                Next, open <code><a href="setup/">setup/</a>
+                </code>in your browser. Note that <strong>changes are not saved to
+                disk until explicitly choose <code>Save</code></strong> from the
                 <em>Configuration</em> area of the screen. Normally the script saves
-                the new config.inc.php to the <tt>config/</tt> directory, but if
+                the new config.inc.php to the <code>config/</code> directory, but if
                 the webserver does not have the proper permissions you may see the
-                error "Cannot load or save configuration." Ensure that the <tt>
-                config/</tt> directory exists and has the proper permissions -
-                or use the <tt>Download</tt> link to save the config file locally
+                error "Cannot load or save configuration." Ensure that the <code>
+                config/</code> directory exists and has the proper permissions -
+                or use the <code>Download</code> link to save the config file locally
                 and upload (via FTP or some similar means) to the proper location.<br /><br />
 
-                Once the file has been saved, it must be moved out of the <tt>
-                config/</tt> directory and the permissions must be reset, again
+                Once the file has been saved, it must be moved out of the <code>
+                config/</code> directory and the permissions must be reset, again
                 as a security measure:
 <pre>
 mv config/config.inc.php .         # move file to current directory
@@ -291,13 +291,13 @@ rm -rf config                      # remove not needed directory
                 the file with your favorite editor, if you prefer to set some
                 advanced options which the setup script does not provide.</li></ul></li>
     <li>If you are using the
-        <tt>auth_type</tt> &quot;config&quot;, it is suggested that you
+        <code>auth_type</code> &quot;config&quot;, it is suggested that you
         protect the phpMyAdmin installation directory because using
         config does not require a user to
         enter a password to access the phpMyAdmin installation. Use of an alternate
         authentication method is recommended, for example with
         HTTP&#8211;AUTH in a <a href="#glossary"><em>.htaccess</em></a> file or switch to using
-        <tt>auth_type</tt> cookie or http. See the
+        <code>auth_type</code> cookie or http. See the
         <a href="#faqmultiuser"> multi&#8211;user sub&#8211;section</a> of this
         <abbr title="Frequently Asked Questions">FAQ</abbr> for additional
         information, especially <a href="#faq4_4">
@@ -307,8 +307,8 @@ rm -rf config                      # remove not needed directory
         and your databases, or a login dialog if using
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode.</li>
-    <li>You should deny access to the <tt>./libraries</tt> and
-        <tt>./setup/lib</tt> subfolders in your webserver configuration. For
+    <li>You should deny access to the <code>./libraries</code> and
+        <code>./setup/lib</code> subfolders in your webserver configuration. For
         Apache you can use supplied <a href="#glossary"><em>.htaccess</em></a> file in that folder, for other
         webservers, you should configure this yourself.  Such configuration
         prevents from possible path exposure and cross side scripting
@@ -333,7 +333,7 @@ rm -rf config                      # remove not needed directory
     multi-user installation (this database would then be accessed by the
     controluser, so no other user should have rights to it).</p>
 
-<p> Please look at your <tt>./examples/</tt> directory, where you should find a
+<p> Please look at your <code>./examples/</code> directory, where you should find a
     file called <em>create_tables.sql</em>. (If you are using a Windows server, pay
     special attention to <a href="#faq1_23">
     <abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
@@ -359,19 +359,19 @@ rm -rf config                      # remove not needed directory
 <p> Simply copy <em>./config.inc.php</em> from your previous installation into the newly
     unpacked one. Configuration files from old versions may
     require some tweaking as some options have been changed or removed; in
-    particular, the definition of <tt>$cfg['AttributeTypes']</tt> has changed
+    particular, the definition of <code>$cfg['AttributeTypes']</code> has changed
     so you better remove it from your file and just use the default one.
-    For compatibility with PHP 6, remove a <tt>set_magic_quotes_runtime(0);</tt>
+    For compatibility with PHP 6, remove a <code>set_magic_quotes_runtime(0);</code>
     statement that you might find near the end of your configuration file.</p>
 
-<p> You should <strong>not</strong> copy <tt>libraries/config.default.php</tt>
-    over <tt>config.inc.php</tt> because the default configuration file
+<p> You should <strong>not</strong> copy <code>libraries/config.default.php</code>
+    over <code>config.inc.php</code> because the default configuration file
     is version-specific.</p>
 
 <p> If you have upgraded your MySQL server from a version previous to 4.1.2 to
     version 5.x or newer and if you use the phpMyAdmin configuration storage,
     you should run the <abbr title="structured query language">SQL</abbr> script
-    found in <tt>examples/upgrade_tables_mysql_4_1_2+.sql</tt>.</p>
+    found in <code>examples/upgrade_tables_mysql_4_1_2+.sql</code>.</p>
 
 <h3 id="authentication_modes">Using authentication modes</h3>
 
@@ -396,26 +396,26 @@ rm -rf config                      # remove not needed directory
         algorithm, in a temporary cookie.</li>
 
     <li id="pmausr">Note: this section is only applicable if
-        your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
+        your MySQL server is running with <code>--skip-show-database</code>.<br /><br />
 
         For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
         modes, phpMyAdmin needs a controluser that has <strong>only</strong> the
-        <tt>SELECT</tt> privilege on the <em>`mysql`.`user` (all columns except
+        <code>SELECT</code> privilege on the <em>`mysql`.`user` (all columns except
         `Password`)</em>, <em>`mysql`.`db` (all columns)</em>, <em>`mysql`.`host`
         (all columns)</em> and <em>`mysql`.`tables_priv` (all columns except
         `Grantor` and `Timestamp`)</em> tables.<br /> You must specify the details
-        for the <a href="#controluser">controluser</a> in the <tt>config.inc.php</tt>
+        for the <a href="#controluser">controluser</a> in the <code>config.inc.php</code>
         file under the
-        <tt><a href="#cfg_Servers_controluser" class="configrule">
-            $cfg['Servers'][$i]['controluser']</a></tt> and
-        <tt><a href="#cfg_Servers_controlpass" class="configrule">
-            $cfg['Servers'][$i]['controlpass']</a></tt> settings.<br />
-        The following example assumes you want to use <tt>pma</tt> as the
-        controluser and <tt>pmapass</tt> as the controlpass, but <strong>this is
+        <code><a href="#cfg_Servers_controluser" class="configrule">
+            $cfg['Servers'][$i]['controluser']</a></code> and
+        <code><a href="#cfg_Servers_controlpass" class="configrule">
+            $cfg['Servers'][$i]['controlpass']</a></code> settings.<br />
+        The following example assumes you want to use <code>pma</code> as the
+        controluser and <code>pmapass</code> as the controlpass, but <strong>this is
         only an example: use something else in your file!</strong> Input these
         statements from the phpMyAdmin <abbr title="structured query language">SQL
         </abbr> Query window or mysql command&#8211;line client.<br />
-        Of course you have to replace <tt>localhost</tt> with the webserver's host
+        Of course you have to replace <code>localhost</code> with the webserver's host
         if it's not the same as the MySQL server's one.
 
         <pre>
@@ -495,7 +495,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
         <a href="#AllowArbitraryServer" class="configrule">
         $cfg['AllowArbitraryServer']</a> directive.</li>
     <li>As mentioned in the <a href="#require">requirements</a> section, having
-        the <tt>mcrypt</tt> extension will speed up access considerably, but is
+        the <code>mcrypt</code> extension will speed up access considerably, but is
         not required.</li>
 </ul>
 
@@ -547,16 +547,16 @@ When Swekey authentication is activated, phpMyAdmin requires the
 users's Swekey to be plugged before entering the login page (currently
 supported for cookie authentication mode only). Swekey Authentication is 
 disabled by default.<br /><br />
-To enable it, add the following line to <tt>config.inc.php</tt>:
+To enable it, add the following line to <code>config.inc.php</code>:
 </p>
 <pre>
 $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey.conf';
 </pre>
 <p>
-You then have to create the <tt>swekey.conf</tt> file that will associate
+You then have to create the <code>swekey.conf</code> file that will associate
 each user with their Swekey Id. It is important to place this file outside
-of your web server's document root (in the example, it is located in <tt>/etc</tt>). A self documented sample file is provided 
-in the <tt>examples</tt> directory. Feel free to use it with your own 
+of your web server's document root (in the example, it is located in <code>/etc</code>). A self documented sample file is provided 
+in the <code>examples</code> directory. Feel free to use it with your own 
 users' information.<br /><br />
 If you want to purchase a Swekey please visit
 <a href="http://phpmyadmin.net/auth_key">http://phpmyadmin.net/auth_key</a>
@@ -568,26 +568,26 @@ since this link provides funding for phpMyAdmin.
 <p> <span class="important">Warning for <acronym title="Apple Macintosh">Mac</acronym>
     users:</span> PHP does not seem to like
     <acronym title="Apple Macintosh">Mac</acronym> end of lines character
-    (&quot;<tt>\r</tt>&quot;). So ensure you choose the option that allows to use
-    the *nix end of line character (&quot;<tt>\n</tt>&quot;) in your text editor
+    (&quot;<code>\r</code>&quot;). So ensure you choose the option that allows to use
+    the *nix end of line character (&quot;<code>\n</code>&quot;) in your text editor
     before saving a script you have modified.</p>
 
 <p> <span class="important">Configuration note:</span>
-    Almost all configurable data is placed in <tt>config.inc.php</tt>. If this file
+    Almost all configurable data is placed in <code>config.inc.php</code>. If this file
     does not exist, please refer to the <a href="#setup">Quick install</a>
     section to create one. This file only needs to contain the parameters you want to
     change from their corresponding default value in
-    <tt>libraries/config.default.php</tt>.</p>
+    <code>libraries/config.default.php</code>.</p>
 
 <p> The parameters which relate to design (like colors) are placed in
-    <tt>themes/themename/layout.inc.php</tt>. You might also want to create
+    <code>themes/themename/layout.inc.php</code>. You might also want to create
     <em>config.footer.inc.php</em> and <em>config.header.inc.php</em> files to add
     your site specific code to be included on start and end of each page.</p>
 
 <dl><dt id="cfg_PmaAbsoluteUri">$cfg['PmaAbsoluteUri'] string</dt>
     <dd>Sets here the complete <abbr title="Uniform Resource Locator">URL</abbr>
         (with full path) to your phpMyAdmin installation's directory.
-        E.g. <tt>http://www.your_web.net/path_to_your_phpMyAdmin_directory/</tt>.
+        E.g. <code>http://www.your_web.net/path_to_your_phpMyAdmin_directory/</code>.
         Note also that the <abbr title="Uniform Resource Locator">URL</abbr> on
         some web servers are case&#8211;sensitive.
         Don&#8217;t forget the trailing slash at the end.<br /><br />
@@ -612,24 +612,24 @@ since this link provides funding for phpMyAdmin.
         use it. You will find a link that will analyze why those features have
         been disabled.<br />
         If you do not want to use those features set this variable to
-        <tt>TRUE</tt> to stop this message from appearing.</dd>
+        <code>TRUE</code> to stop this message from appearing.</dd>
 
     <dt id="cfg_SuhosinDisableWarning">$cfg['SuhosinDisableWarning'] boolean</dt>
     <dd>A warning is displayed on the main page if Suhosin is detected.
-    You can set this parameter to <tt>TRUE</tt> to stop this message 
+    You can set this parameter to <code>TRUE</code> to stop this message 
     from appearing.</dd>
 
     <dt id="cfg_McryptDisableWarning">$cfg['McryptDisableWarning'] boolean</dt>
     <dd>Disable the default warning that is displayed if mcrypt is missing for
     cookie authentication.
-    You can set this parameter to <tt>TRUE</tt> to stop this message 
+    You can set this parameter to <code>TRUE</code> to stop this message 
     from appearing.</dd>
 
     <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt>
     <dd>Show warning about incomplete translations on certain threshold.</dd>
 
     <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt>
-    <dd>Setting this to <tt>true</tt> allows a page located on a different
+    <dd>Setting this to <code>true</code> allows a page located on a different
     domain to call phpMyAdmin inside a frame, and is a potential security
     hole allowing cross-frame scripting attacks.</dd>
 
@@ -656,9 +656,9 @@ since this link provides funding for phpMyAdmin.
         contains the hostname of the first server, the second
         <a href="#cfg_Servers_host" class="configrule">$cfg['Servers'][$i]['host']</a>
         the hostname of the second server, etc. In
-        <tt>./libraries/config.default.php</tt>, there is only one section for
+        <code>./libraries/config.default.php</code>, there is only one section for
         server definition, however you can put as many as you need in
-        <tt>./config.inc.php</tt>, copy that block or needed parts (you don't
+        <code>./config.inc.php</code>, copy that block or needed parts (you don't
         have to define all settings, just those you need to change).</dd>
 
     <dt id="cfg_Servers_host">$cfg['Servers'][$i]['host'] string</dt>
@@ -677,7 +677,7 @@ since this link provides funding for phpMyAdmin.
     <dt id="cfg_Servers_socket">$cfg['Servers'][$i]['socket'] string</dt>
     <dd>The path to the socket to use. Leave blank for default.<br />
         To determine the correct socket, check your MySQL configuration or, using the
-        <tt>mysql</tt> command&#8211;line client, issue the <tt>status</tt> command.
+        <code>mysql</code> command&#8211;line client, issue the <code>status</code> command.
         Among the resulting information displayed will be the socket used.</dd>
 
     <dt id="cfg_Servers_ssl">$cfg['Servers'][$i]['ssl'] boolean</dt>
@@ -686,7 +686,7 @@ since this link provides funding for phpMyAdmin.
 
     <dt id="cfg_Servers_connect_type">$cfg['Servers'][$i]['connect_type'] string</dt>
     <dd>What type connection to use with the MySQL server. Your options are
-        <tt>'socket'</tt> and <tt>'tcp'</tt>. It defaults to 'tcp' as that
+        <code>'socket'</code> and <code>'tcp'</code>. It defaults to 'tcp' as that
         is nearly guaranteed to be available on all MySQL servers, while
         sockets are not supported on some platforms.<br /><br />
 
@@ -697,10 +697,10 @@ since this link provides funding for phpMyAdmin.
     <dd>What php MySQL extension to use for the connection. Valid options are:
         <br /><br />
 
-        <tt><em>mysql</em></tt> :
+        <code><em>mysql</em></code> :
         The classic MySQL extension.<br /><br />
 
-        <tt><em>mysqli</em></tt> :
+        <code><em>mysqli</em></code> :
         The improved MySQL extension. This extension became available
         with PHP 5.0.0 and is the recommended way to connect to a server
         running MySQL 4.1.x or newer.</dd>
@@ -723,14 +723,14 @@ since this link provides funding for phpMyAdmin.
         all relational features (see
         <a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
         and, for a MySQL server running with
-        <tt>--skip-show-database</tt>, to enable a multi-user installation
+        <code>--skip-show-database</code>, to enable a multi-user installation
         (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode).<br /><br />
 
         When using <abbr title="HyperText Transfer Protocol">HTTP</abbr> or
         cookie authentication modes (or 'config'
         authentication mode since phpMyAdmin 2.2.1), you need to supply the
-        details of a MySQL account that has <tt>SELECT</tt> privilege on the
+        details of a MySQL account that has <code>SELECT</code> privilege on the
         <em>mysql.user (all columns except &quot;Password&quot;)</em>,
         <em>mysql.db (all columns)</em> and <em>mysql.tables_priv (all columns
         except &quot;Grantor&quot; and &quot;Timestamp&quot;) </em>tables.
@@ -743,26 +743,26 @@ since this link provides funding for phpMyAdmin.
         &quot;stduser/stdpass&quot;.</dd>
 
     <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string
-        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt>
+        <code>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</code></dt>
     <dd>Whether config or cookie or
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> or signon authentication
         should be used for this server.
-        <ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>)
+        <ul><li>'config' authentication (<code>$auth_type&nbsp;=&nbsp;'config'</code>)
                 is the plain old way: username and password are stored in
                 <em>config.inc.php</em>.</li>
             <li>'cookie' authentication mode
-                (<tt>$auth_type&nbsp;=&nbsp;'cookie'</tt>) as introduced in
+                (<code>$auth_type&nbsp;=&nbsp;'cookie'</code>) as introduced in
                 2.2.3 allows you to log in as any valid MySQL user with the
                 help of cookies. Username and password are stored in
                 cookies during the session and password is deleted when it
                 ends. This can also allow you to log in in arbitrary server if
-                <tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled.
+                <code><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></code> enabled.
             </li>
             <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in previous versions and can be written also as 'http')
-                (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
+                (<code>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</code>) as introduced in 1.3.0
                 allows you to log in as any valid MySQL user via HTTP-Auth.</li>
             <li>'signon' authentication mode
-                (<tt>$auth_type&nbsp;=&nbsp;'signon'</tt>)
+                (<code>$auth_type&nbsp;=&nbsp;'signon'</code>)
                 as introduced in 2.10.0 allows you to log in from prepared PHP
                 session data or using supplied PHP script. This is useful for implementing single signon
                 from another application.
@@ -828,8 +828,8 @@ since this link provides funding for phpMyAdmin.
         will be shown to the user. Since phpMyAdmin 2.2.1, this/these
         database(s) name(s) may contain MySQL wildcards characters
         (&quot;_&quot; and &quot;%&quot;): if you want to use literal instances
-        of these characters, escape them (I.E. use <tt>'my\_db'</tt> and not
-        <tt>'my_db'</tt>).<br />
+        of these characters, escape them (I.E. use <code>'my\_db'</code> and not
+        <code>'my_db'</code>).<br />
         This setting is an efficient way to lower the server load since the
         latter does not need to send MySQL requests to build the available
         database list. But <span class="important">it does not replace the
@@ -839,14 +839,14 @@ since this link provides funding for phpMyAdmin.
         <br /><br />
 
         An example of using more that one database:
-        <tt>$cfg['Servers'][$i]['only_db'] = array('db1', 'db2');</tt>
+        <code>$cfg['Servers'][$i]['only_db'] = array('db1', 'db2');</code>
         <br /><br />
 
         As of phpMyAdmin 2.5.5 the order inside the array is used for sorting the
         databases in the left frame, so that you can individually arrange your databases.<br />
         If you want to have certain databases at the top, but don't care about the others, you do not
         need to specify all other databases. Use:
-        <tt>$cfg['Servers'][$i]['only_db'] = array('db3', 'db4', '*');</tt>
+        <code>$cfg['Servers'][$i]['only_db'] = array('db3', 'db4', '*');</code>
         instead to tell phpMyAdmin that it should display db3 and db4 on top, and the rest in alphabetic
         order.</dd>
 
@@ -887,7 +887,7 @@ since this link provides funding for phpMyAdmin.
         If you are the only user of this phpMyAdmin installation, you can
         use your current database to store those special tables; in this
         case, just put your current database name in
-        <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation,
+        <code>$cfg['Servers'][$i]['pmadb']</code>. For a multi-user installation,
         set this parameter to the name of your central database containing
         the phpMyAdmin configuration storage.</dd>
 
@@ -900,7 +900,7 @@ since this link provides funding for phpMyAdmin.
         To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>enter the table name in
-                <tt>$cfg['Servers'][$i]['bookmarktable']</tt></li>
+                <code>$cfg['Servers'][$i]['bookmarktable']</code></li>
         </ul>
     </dd>
 
@@ -937,7 +937,7 @@ since this link provides funding for phpMyAdmin.
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin 
                 configuration storage</li>
             <li>put the relation table name in
-                <tt>$cfg['Servers'][$i]['relation']</tt></li>
+                <code>$cfg['Servers'][$i]['relation']</code></li>
             <li>now as normal user open phpMyAdmin and for each one of your
                 tables where you want to use this feature, click
                 &quot;Structure/Relation view/&quot; and choose foreign
@@ -945,8 +945,8 @@ since this link provides funding for phpMyAdmin.
                 </li>
         </ul>
 
-        Please note that in the current version, <tt>master_db</tt>
-        must be the same as <tt>foreign_db</tt>. Those columns have been put in
+        Please note that in the current version, <code>master_db</code>
+        must be the same as <code>foreign_db</code>. Those columns have been put in
         future development of the cross-db relations.
     </dd>
 
@@ -961,7 +961,7 @@ since this link provides funding for phpMyAdmin.
         table. To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the table name in
-                <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
+                <code>$cfg['Servers'][$i]['table_info']</code> (e.g.
                 'pma_table_info')</li>
             <li>then for each table where you want to use this feature,
                 click &quot;Structure/Relation view/Choose column to display&quot;
@@ -988,8 +988,8 @@ since this link provides funding for phpMyAdmin.
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the correct table names in
-                <tt>$cfg['Servers'][$i]['table_coords']</tt> and
-                <tt>$cfg['Servers'][$i]['pdf_pages']</tt></li>
+                <code>$cfg['Servers'][$i]['table_coords']</code> and
+                <code>$cfg['Servers'][$i]['pdf_pages']</code></li>
         </ul>
 
         Usage tips: <a href="#faqpdf"><abbr title="Portable Document Format">PDF</abbr> output</a>.
@@ -1019,7 +1019,7 @@ since this link provides funding for phpMyAdmin.
         To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the table name in
-                <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
+                <code>$cfg['Servers'][$i]['column_info']</code> (e.g.
                 'pma_column_info')</li>
             <li>to update your PRE-2.5.0 Column_comments Table use this:
 
@@ -1032,8 +1032,8 @@ ALTER TABLE `pma_column_comments`
 
                 and remember that the Variable in <em>config.inc.php</em> has been
                 renamed from<br />
-                <tt>$cfg['Servers'][$i]['column_comments']</tt> to
-                <tt>$cfg['Servers'][$i]['column_info']</tt></li>
+                <code>$cfg['Servers'][$i]['column_comments']</code> to
+                <code>$cfg['Servers'][$i]['column_info']</code></li>
         </ul>
     </dd>
 
@@ -1058,7 +1058,7 @@ ALTER TABLE `pma_column_comments`
         To allow the usage of this functionality:
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
+            <li>put the table name in <code>$cfg['Servers'][$i]['history']</code>
             (e.g. 'pma_history')
                 </li>
         </ul>
@@ -1083,7 +1083,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. 'pma_recent')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['recent']</code> (e.g. 'pma_recent')</li>
         </ul>
     </dd>
 
@@ -1102,7 +1102,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. 'pma_table_uiprefs')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['table_uiprefs']</code> (e.g. 'pma_table_uiprefs')</li>
         </ul>
     </dd>
 
@@ -1132,7 +1132,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['tracking']</code> (e.g. 'pma_tracking')</li>
         </ul>
     </dd>
 
@@ -1210,7 +1210,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin
             configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['userconfig']</code></li>
         </ul>
     </dd>
 
@@ -1224,7 +1224,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         To allow the usage of this functionality:
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
+            <li>put the table name in <code>$cfg['Servers'][$i]['designer_coords']</code> (e.g. 'pma_designer_coords')
                 </li>
         </ul>
     </dd>
@@ -1242,7 +1242,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     </dt>
     <dd>Because release 2.5.0 introduced the new MIME-transformation support, the
         column_info table got enhanced with three new columns. If the above variable
-        is set to <tt>TRUE</tt> (default) phpMyAdmin will check if you have the
+        is set to <code>TRUE</code> (default) phpMyAdmin will check if you have the
         latest table structure available. If not, it will emit a warning to the
         superuser.<br /><br />
 
@@ -1258,7 +1258,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dt><span id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span>
         boolean</dt>
     <dd>Whether to allow logins without a password. The default
-    value of <tt>false</tt> for this parameter prevents unintended access 
+    value of <code>false</code> for this parameter prevents unintended access 
     to a MySQL server with was left with an empty password for root or
     on which an anonymous (blank) user is defined.
     </dd>
@@ -1268,12 +1268,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr>
         authorization is disabled.<br /><br />
 
-        If your rule order is set to <tt>'deny,allow'</tt> then the system applies
+        If your rule order is set to <code>'deny,allow'</code> then the system applies
         all deny rules followed by allow rules. Access is allowed by default. Any
         client which does not match a Deny command or does match an Allow command
         will be allowed access to the server. <br /><br />
 
-        If your rule order is set to <tt>'allow,deny'</tt> then the system
+        If your rule order is set to <code>'allow,deny'</code> then the system
         applies all allow rules followed by deny rules. Access is denied by
         default.  Any client which does not match an Allow directive or does
         match a Deny directive will be denied access to the server.<br /><br />
@@ -1299,7 +1299,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 &lt;'allow' | 'deny'&gt; &lt;username&gt; [from] &lt;ipmask&gt;
 </pre>
 
-        If you wish to match all users, it is possible to use a <tt>'%'</tt> as
+        If you wish to match all users, it is possible to use a <code>'%'</code> as
         a wildcard in the <em>username</em> field.<br />
         There are a few shortcuts you can use in the <em>ipmask</em> field as
         well (please note that those containing SERVER_ADDRESS might not be
@@ -1313,28 +1313,28 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 </pre>
 
         Having an empty rule list is equivalent to either using
-        <tt>'allow % from all'</tt> if your rule order is set to
-        <tt>'deny,allow'</tt> or <tt>'deny % from all'</tt> if your rule order
-        is set to <tt>'allow,deny'</tt> or <tt>'explicit'</tt>.<br /><br />
+        <code>'allow % from all'</code> if your rule order is set to
+        <code>'deny,allow'</code> or <code>'deny % from all'</code> if your rule order
+        is set to <code>'allow,deny'</code> or <code>'explicit'</code>.<br /><br />
 
         For the <abbr title="Internet Protocol">IP</abbr> matching system, the
         following work:<br />
-        <tt>xxx.xxx.xxx.xxx</tt>        (an exact <abbr title="Internet Protocol">IP</abbr> address)<br />
-        <tt>xxx.xxx.xxx.[yyy-zzz]</tt>  (an <abbr title="Internet Protocol">IP</abbr> address range)<br />
-        <tt>xxx.xxx.xxx.xxx/nn</tt>     (CIDR, Classless Inter-Domain Routing type <abbr title="Internet Protocol">IP</abbr> addresses)<br />
+        <code>xxx.xxx.xxx.xxx</code>        (an exact <abbr title="Internet Protocol">IP</abbr> address)<br />
+        <code>xxx.xxx.xxx.[yyy-zzz]</code>  (an <abbr title="Internet Protocol">IP</abbr> address range)<br />
+        <code>xxx.xxx.xxx.xxx/nn</code>     (CIDR, Classless Inter-Domain Routing type <abbr title="Internet Protocol">IP</abbr> addresses)<br />
         But the following does not work:<br />
-        <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial
+        <code>xxx.xxx.xxx.xx[yyy-zzz]</code> (partial
         <abbr title="Internet Protocol">IP</abbr> address range)<br />
         Also IPv6 addresses are not supported.
     </dd>
     <dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span> boolean</dt>
-    <dd>Disable using <tt>INFORMATION_SCHEMA</tt> to retrieve information (use <tt>SHOW</tt> commands instead), because of speed issues when many databases are present. Currently used in some parts of the code, more to come.
+    <dd>Disable using <code>INFORMATION_SCHEMA</code> to retrieve information (use <code>SHOW</code> commands instead), because of speed issues when many databases are present. Currently used in some parts of the code, more to come.
     </dd>
     <dt><span id="cfg_Servers_ShowDatabasesCommand">$cfg['Servers'][$i]['ShowDatabasesCommand']</span> string</dt>
-    <dd>On a server with a huge number of databases, the default <tt>SHOW
-        DATABASES</tt> command used to fetch the name of available databases will
+    <dd>On a server with a huge number of databases, the default <code>SHOW
+        DATABASES</code> command used to fetch the name of available databases will
     probably be too slow, so it can be replaced by faster commands (see
-    <tt>libraries/config.default.php</tt> for examples).
+    <code>libraries/config.default.php</code> for examples).
     </dd>
     <dt><span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span> boolean</dt>
     <dd>Whether to count the number of tables for each database when preparing the list of databases for the navigation frame.
@@ -1367,10 +1367,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 
     <dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt>
     <dd>If you have more than one server configured, you can set
-        <tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to
+        <code>$cfg['ServerDefault']</code> to any one of them to autoconnect to
         that server when phpMyAdmin is started, or set it to 0 to be given a
         list of servers without logging in.<br />
-        If you have only one server configured, <tt>$cfg['ServerDefault']</tt>
+        If you have only one server configured, <code>$cfg['ServerDefault']</code>
         MUST be set to that server.</dd>
 
     <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] boolean</dt>
@@ -1476,7 +1476,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         authentication mode.<br /><br />
 
         This is automatically disabled if you do not have configured 
-        <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>.
+        <code><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></code>.
         </dd>
 
     <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] integer [number of seconds]</dt>
@@ -1508,7 +1508,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Define whether phpMyAdmin will output the results of each query of a
         multi-query statement embedded into the
         <abbr title="structured query language">SQL</abbr> output as inline
-        comments. Defaults to <tt>TRUE</tt>.</dd>
+        comments. Defaults to <code>TRUE</code>.</dd>
     <dt id="AllowArbitraryServer">
         <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> boolean</dt>
     <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and permits to specify servers of your choice in the Synchronize dialog.
@@ -1583,22 +1583,22 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 
     <dt id="cfg_LeftDisplayLogo">$cfg['LeftDisplayLogo'] boolean</dt>
     <dd>Defines whether or not to display the phpMyAdmin logo at the top of the left frame.
-        Defaults to <tt>TRUE</tt>.</dd>
+        Defaults to <code>TRUE</code>.</dd>
     <dt id="cfg_LeftLogoLink">$cfg['LeftLogoLink'] string</dt>
     <dd>Enter <abbr title="Uniform Resource Locator">URL</abbr> where logo in the navigation frame will point to.
     For use especially with self made theme which changes this.
-    The default value for this is <tt>main.php</tt>.</dd>
+    The default value for this is <code>main.php</code>.</dd>
 
     <dt id="cfg_LeftLogoLinkWindow">$cfg['LeftLogoLinkWindow'] string</dt>
-    <dd>Whether to open the linked page in the main window (<tt>main</tt>)
-    or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are
-    linking to <tt>phpmyadmin.net</tt>.</dd>
+    <dd>Whether to open the linked page in the main window (<code>main</code>)
+    or in a new one (<code>new</code>). Note: use <code>new</code> if you are
+    linking to <code>phpmyadmin.net</code>.</dd>
 
     <dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum']
     integer</dt>
     <dd>Defines the minimum number of tables to display a JavaScript filter box above the
     list of tables in the left frame.
-    Defaults to <tt>30</tt>. To disable the filter completely some high number
+    Defaults to <code>30</code>. To disable the filter completely some high number
     can he used (e.g. 9999)</dd>
 
     <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
@@ -1628,7 +1628,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dt><span id="cfg_ShowServerInfo">$cfg['ShowServerInfo'] </span>boolean</dt>
     <dd>Defines whether to display detailed server information on main page.
         You can additionally hide more information by using
-        <tt><a href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></tt>.
+        <code><a href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></code>.
         </dd>
 
     <dt><span id="cfg_ShowPhpInfo">$cfg['ShowPhpInfo'] </span>boolean<br />
@@ -1670,10 +1670,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Number of rows displayed when browsing a result set and no LIMIT
     clause is used. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.</dd>
 
-    <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt>
-    <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order,
-        in descending (<tt>DESC</tt>) order or in a &quot;smart&quot;
-        (<tt>SMART</tt>) order - I.E. descending order for columns of type TIME,
+    <dt id="cfg_Order">$cfg['Order'] string [<code>DESC</code>|<code>ASC</code>|<code>SMART</code>]</dt>
+    <dd>Defines whether columns are displayed in ascending (<code>ASC</code>) order,
+        in descending (<code>DESC</code>) order or in a &quot;smart&quot;
+        (<code>SMART</code>) order - I.E. descending order for columns of type TIME,
         DATE, DATETIME and TIMESTAMP, ascending order else- by default.</dd>
 
     <dt id="cfg_DisplayBinaryAsHex">$cfg['DisplayBinaryAsHex'] boolean </dt>
@@ -1681,12 +1681,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     option is ticked by default.</dd>
 
     <dt id="cfg_ProtectBinary">$cfg['ProtectBinary'] boolean or string</dt>
-    <dd>Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> columns are protected
+    <dd>Defines whether <code>BLOB</code> or <code>BINARY</code> columns are protected
         from editing when browsing a table's content. Valid values are:
-        <ul><li><tt>FALSE</tt> to allow editing of all columns;</li>
-            <li><tt>'blob'</tt> to allow editing of all columns except <tt>BLOBS</tt>;</li>
-            <li><tt>'all'</tt> to disallow editing of all <tt>BINARY</tt> or
-                <tt>BLOB</tt> columns.</li>
+        <ul><li><code>FALSE</code> to allow editing of all columns;</li>
+            <li><code>'blob'</code> to allow editing of all columns except <code>BLOBS</code>;</li>
+            <li><code>'all'</code> to disallow editing of all <code>BINARY</code> or
+                <code>BLOB</code> columns.</li>
         </ul>
     </dd>
 
@@ -1751,14 +1751,14 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         normal programs handle this correctly.</dd>
 
     <dt id="cfg_LightTabs">$cfg['LightTabs'] boolean</dt>
-    <dd>If set to <tt>TRUE</tt>, use less graphically intense tabs on the top of the
+    <dd>If set to <code>TRUE</code>, use less graphically intense tabs on the top of the
         mainframe.</dd>
 
     <dt id="cfg_PropertiesIconic">$cfg['PropertiesIconic'] string</dt>
-    <dd>If set to <tt>TRUE</tt>, will display icons instead of text for db and table
+    <dd>If set to <code>TRUE</code>, will display icons instead of text for db and table
         properties links (like 'Browse', 'Select', 'Insert', ...).<br /> Can be
-        set to <tt>'both'</tt> if you want icons AND text.<br />
-        When set to <tt>FALSE</tt>, will only show text.</dd>
+        set to <code>'both'</code> if you want icons AND text.<br />
+        When set to <code>FALSE</code>, will only show text.</dd>
 
     <dt id="cfg_PropertiesNumColumns">$cfg['PropertiesNumColumns'] integer</dt>
     <dd>How many columns will be utilized to display the tables on the
@@ -1842,7 +1842,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         Enabled charset conversion activates a pull-down menu
         in the Export and Import pages, to choose the character set when 
         exporting a file. The default value in this menu comes from 
-        <tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
+        <code>$cfg['Export']['charset']</code> and <code>$cfg['Import']['charset']</code>.
         </dd>
 
     <dt id="cfg_IconvExtraParams">$cfg['IconvExtraParams'] string</dt>
@@ -1864,7 +1864,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         want to use rules for IP addresses behind proxy.<br /><br />
 
         The following example specifies that phpMyAdmin should trust a
-        HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy 1.2.3.4:
+        HTTP_X_FORWARDED_FOR (<code>X-Forwarded-For</code>) header coming from the proxy 1.2.3.4:
 <pre>
 $cfg['TrustedProxies'] =
      array('1.2.3.4' =&gt; 'HTTP_X_FORWARDED_FOR');
@@ -1890,7 +1890,7 @@ $cfg['TrustedProxies'] =
     it's not world writable. However, phpMyAdmin could be installed on
     a NTFS filesystem mounted on a non-Windows server, in which case the
     permissions seems wrong but in fact cannot be detected. In this case
-    a sysadmin would set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>.
+    a sysadmin would set this parameter to <code>FALSE</code>. Default is <code>TRUE</code>.
     </dd>
 
     <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] integer</dt>
@@ -1912,39 +1912,39 @@ $cfg['TrustedProxies'] =
     </dd>
 
     <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt>
-    <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>Navi frame width in pixels. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS color for background]<br />
         <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS color for background]
     </dt>
     <dd>The background styles used for both the frames.
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br />
         <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS color]</dt>
     <dd>The style used for the pointer in the navi frame.
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt>
-    <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight
-        is <tt>FALSE</tt>).</dd>
+    <dd>A value of <code>TRUE</code> activates the navi pointer (when LeftFrameLight
+        is <code>FALSE</code>).</dd>
 
     <dt id="cfg_Border">$cfg['Border'] integer</dt>
-    <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The size of a table's border. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br />
         <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt>
     <dd>The style used for table headers. See
-        <tt>themes/themename/layout.inc.php</tt>.</dd>
+        <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt>
-    <dd>The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The color (HTML) #1 for table rows. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt>
-    <dd>The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The color (HTML) #2 for table rows. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] </span>string [CSS color]<br />
@@ -1957,18 +1957,18 @@ $cfg['TrustedProxies'] =
         and the latter lets you visually mark/unmark rows by clicking on
         them. Highlighting / marking a column is done by hovering over /
         clicking the column's header (outside of the text).<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
 
     <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt>
     <dd>You put here a valid CSS font family value, for example
-    <tt>arial, sans-serif</tt>.<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+    <code>arial, sans-serif</code>.<br />
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] string</dt>
     <dd>You put here a valid CSS font family value, for example
-    <tt>monospace</tt>. This one is used in textarea.<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+    <code>monospace</code>. This one is used in textarea.<br />
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_BrowsePointerEnable">$cfg['BrowsePointerEnable'] boolean</dt>
     <dd>Whether to activate the browse pointer or not.</dd>
@@ -2034,7 +2034,7 @@ $cfg['TrustedProxies'] =
     <dt id="cfg_ShowBrowseComments">$cfg['ShowBrowseComments'] boolean<br />
         <span id="cfg_ShowPropertyComments">$cfg['ShowPropertyComments'] </span>boolean
     </dt>
-    <dd>By setting the corresponding variable to <tt>TRUE</tt> you can enable the
+    <dd>By setting the corresponding variable to <code>TRUE</code> you can enable the
         display of column comments in Browse or Property display. In browse
         mode, the comments are shown inside the header. In property mode,
         comments are displayed using a CSS-formatted dashed-line below the
@@ -2052,7 +2052,7 @@ $cfg['TrustedProxies'] =
 
     <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
     <dd>Whether to display a link to validate a query in any SQL Query box.
-        See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
+        See also <code><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></code>.</dd>
 
     <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
     <dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
@@ -2107,18 +2107,18 @@ $cfg['TrustedProxies'] =
 
         This is needed for importing ESRI Shapefiles, see
         <a href="#faq6_30"><abbr title="Frequently Asked Questions">FAQ</abbr>
-        6.30</a> and to work around limitations of <tt>open_basedir</tt> for uploaded
+        6.30</a> and to work around limitations of <code>open_basedir</code> for uploaded
         files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
         1.11</a>.
         <br /><br />
 
     If the directory where phpMyAdmin is installed is subject to an
-    <tt>open_basedir</tt> restriction, you need to create a
+    <code>open_basedir</code> restriction, you need to create a
         temporary directory in some directory accessible by the web
         server. However for security reasons, this directory should be outside
         the tree published by webserver. If you cannot avoid having this
         directory published by webserver, place at least an empty
-        <tt>index.html</tt> file there, so that directory listing is not
+        <code>index.html</code> file there, so that directory listing is not
         possible.
         <br /><br />
 
@@ -2158,9 +2158,9 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
         <ul>
-        <li><tt>quick</tt> to display the minimum number of options to configure</li>
-        <li><tt>custom</tt> to display every available option to configure</li>
-        <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the option of using quick export</li>
+        <li><code>quick</code> to display the minimum number of options to configure</li>
+        <li><code>custom</code> to display every available option to configure</li>
+        <li><code>custom-no-form</code> same as <code>custom</code> but does not display the option of using quick export</li>
         </ul>
     </dd>
 
@@ -2195,19 +2195,19 @@ setfacl -d -m "g:www-data:rwx" tmp
         <span id="cfg_QueryHistoryMax">$cfg['QueryHistoryMax'] </span>integer
     </dt>
     <dd>
-        All those variables affect the query window feature. A <tt><abbr title="structured query language">SQL</abbr></tt> link
+        All those variables affect the query window feature. A <code><abbr title="structured query language">SQL</abbr></code> link
         or icon is always displayed on the left panel. If JavaScript is enabled in
         your browser, a click on this opens a distinct query window, which is
         a direct interface to enter <abbr title="structured query language">SQL</abbr> queries. Otherwise, the right panel
         changes to display a query box.<br /><br />
 
         The size of this query window can be customized with
-        <tt>$cfg['QueryWindowWidth']</tt> and <tt>$cfg['QueryWindowHeight']</tt>
+        <code>$cfg['QueryWindowWidth']</code> and <code>$cfg['QueryWindowHeight']</code>
         - both integers for the size in pixels. Note that normally, those
-        parameters will be modified in <tt>layout.inc.php</tt> for the
+        parameters will be modified in <code>layout.inc.php</code> for the
         theme you are using.<br /><br />
 
-        If <tt>$cfg['EditInWindow']</tt> is set to true, a click on [Edit]
+        If <code>$cfg['EditInWindow']</code> is set to true, a click on [Edit]
         from the results page (in the &quot;Showing Rows&quot; section)
         opens the query window and puts the current query
         inside it.  If set to false, clicking on the link puts the <abbr title="structured query language">SQL</abbr>
@@ -2219,7 +2219,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         use that feature. It currently is only tested with Internet Explorer 6
         and Mozilla 1.x.
         <br /><br />
-        If <tt>$cfg['QueryHistoryDB']</tt> is set to <tt>TRUE</tt>, all your Queries are logged
+        If <code>$cfg['QueryHistoryDB']</code> is set to <code>TRUE</code>, all your Queries are logged
         to a table, which has to be created by you (see <a
         href="#history" class="configrule">$cfg['Servers'][$i]['history']</a>).  If set to FALSE,
         all your queries will be appended to the form, but only as long as
@@ -2237,11 +2237,11 @@ setfacl -d -m "g:www-data:rwx" tmp
         uncheck the button whenever you definitely want the query window to
         get updated even though you have made alterations.
         <br /><br />
-        If <tt>$cfg['QueryHistoryDB']</tt> is set to <tt>TRUE</tt> you can specify the amount of
-        saved history items using <tt>$cfg['QueryHistoryMax']</tt>.
+        If <code>$cfg['QueryHistoryDB']</code> is set to <code>TRUE</code> you can specify the amount of
+        saved history items using <code>$cfg['QueryHistoryMax']</code>.
         <br /><br />
         The query window also has a custom tabbed look to group the features.
-        Using the variable <tt>$cfg['QueryWindowDefTab']</tt> you can specify the
+        Using the variable <code>$cfg['QueryWindowDefTab']</code> you can specify the
         default tab to be used when opening the query window. It can be set to
         either 'sql', 'files', 'history' or 'full'.</dd>
 
@@ -2269,14 +2269,14 @@ setfacl -d -m "g:www-data:rwx" tmp
         and in Database view, for the table list.</dd>
 
     <dt id="cfg_InitialSlidersState">$cfg['InitialSlidersState'] string</dt>
-    <dd>If set to <tt>'closed'</tt>, the visual sliders are initially in a
-    closed state. A value of <tt>'open'</tt> does the reverse. To completely 
-    disable all visual sliders, use <tt>'disabled'</tt>.</dd>
+    <dd>If set to <code>'closed'</code>, the visual sliders are initially in a
+    closed state. A value of <code>'open'</code> does the reverse. To completely 
+    disable all visual sliders, use <code>'disabled'</code>.</dd>
 
     <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] array</dt>
-    <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array)
+    <dd>Contains names of configuration options (keys in <code>$cfg</code> array)
         that users can't set through user preferences. For possible values, refer
-        to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
+        to <code>libraries/config/user_preferences.forms.php</code>.</dd>
 
     <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt>
     <dd>Activates in the user preferences a tab containing options for 
@@ -2309,7 +2309,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         <abbr title="Frequently Asked Questions">FAQ</abbr> 2.7</a>.</dd>
 
     <dt id="cfg_ThemeDefault">$cfg['ThemeDefault'] string</dt>
-    <dd>The default theme (a subdirectory under <tt>cfg['ThemePath']</tt>).</dd>
+    <dd>The default theme (a subdirectory under <code>cfg['ThemePath']</code>).</dd>
 
     <dt id="cfg_ThemePerServer">$cfg['ThemePerServer'] boolean</dt>
     <dd>Whether to allow different theme for each server.</dd>
@@ -2322,19 +2322,19 @@ setfacl -d -m "g:www-data:rwx" tmp
         <a href="#faq6_27">format string expansion</a>.
         </dd>
 
-    <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<tt>html</tt>|<tt>none</tt>]</dt>
+    <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<code>html</code>|<code>none</code>]</dt>
     <dd>
         The main use of the new <abbr title="structured query language">SQL</abbr> Parser is to pretty-print <abbr title="structured query language">SQL</abbr> queries. By
         default we use HTML to format the query, but you can disable this by
-        setting this variable to <tt>'none'</tt>.
+        setting this variable to <code>'none'</code>.
     </dd>
 
     <dt id="cfg_SQP_fmtInd">$cfg['SQP']['fmtInd'] float<br />
-        <span id="cfg_SQP">$cfg['SQP']['fmtIndUnit']</span> string [<tt>em</tt>|<tt>px</tt>|<tt>pt</tt>|<tt>ex</tt>]</dt>
+        <span id="cfg_SQP">$cfg['SQP']['fmtIndUnit']</span> string [<code>em</code>|<code>px</code>|<code>pt</code>|<code>ex</code>]</dt>
     <dd>For the pretty-printing of <abbr title="structured query language">SQL</abbr> queries, under some cases the part of a
         query inside a bracket is indented. By changing
-        <tt>$cfg['SQP']['fmtInd']</tt> you can change the amount of this indent.
-        <br />Related in purpose is <tt>$cfg['SQP']['fmtIndUnit']</tt> which
+        <code>$cfg['SQP']['fmtInd']</code> you can change the amount of this indent.
+        <br />Related in purpose is <code>$cfg['SQP']['fmtIndUnit']</code> which
         specifies the units of the indent amount that you specified. This is
         used via stylesheets.</dd>
 
@@ -2347,30 +2347,30 @@ setfacl -d -m "g:www-data:rwx" tmp
         You should not alter the class names, only the colour strings.<br />
         <strong>Class name key:</strong>
         <ul><li><strong>comment</strong> Applies to all comment sub-classes</li>
-            <li><strong>comment_mysql</strong> Comments as <tt>"#...\n"</tt></li>
-            <li><strong>comment_ansi</strong> Comments as <tt>"-- ...\n"</tt></li>
-            <li><strong>comment_c</strong> Comments as <tt>"/*...*/"</tt></li>
+            <li><strong>comment_mysql</strong> Comments as <code>"#...\n"</code></li>
+            <li><strong>comment_ansi</strong> Comments as <code>"-- ...\n"</code></li>
+            <li><strong>comment_c</strong> Comments as <code>"/*...*/"</code></li>
             <li><strong>digit</strong> Applies to all digit sub-classes</li>
             <li><strong>digit_hex</strong> Hexadecimal numbers</li>
             <li><strong>digit_integer</strong> Integer numbers</li>
             <li><strong>digit_float</strong> Floating point numbers</li>
             <li><strong>punct</strong> Applies to all punctuation sub-classes</li>
-            <li><strong>punct_bracket_open_round</strong> Opening brackets<tt>"("</tt></li>
-            <li><strong>punct_bracket_close_round</strong> Closing brackets <tt>")"</tt></li>
-            <li><strong>punct_listsep</strong> List item Separator <tt>","</tt></li>
-            <li><strong>punct_qualifier</strong> Table/Column Qualifier <tt>"."</tt> </li>
-            <li><strong>punct_queryend</strong> End of query marker <tt>";"</tt></li>
+            <li><strong>punct_bracket_open_round</strong> Opening brackets<code>"("</code></li>
+            <li><strong>punct_bracket_close_round</strong> Closing brackets <code>")"</code></li>
+            <li><strong>punct_listsep</strong> List item Separator <code>","</code></li>
+            <li><strong>punct_qualifier</strong> Table/Column Qualifier <code>"."</code> </li>
+            <li><strong>punct_queryend</strong> End of query marker <code>";"</code></li>
             <li><strong>alpha</strong> Applies to all alphabetic classes</li>
             <li><strong>alpha_columnType</strong> Identifiers matching a column type</li>
             <li><strong>alpha_columnAttrib</strong> Identifiers matching a database/table/column attribute</li>
             <li><strong>alpha_functionName</strong> Identifiers matching a MySQL function name</li>
             <li><strong>alpha_reservedWord</strong> Identifiers matching any other reserved word</li>
-            <li><strong>alpha_variable</strong> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <tt>"@foo"</tt></li>
+            <li><strong>alpha_variable</strong> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <code>"@foo"</code></li>
             <li><strong>alpha_identifier</strong> All other identifiers</li>
             <li><strong>quote</strong> Applies to all quotation mark classes</li>
-            <li><strong>quote_double</strong> Double quotes <tt>"</tt></li>
-            <li><strong>quote_single</strong> Single quotes <tt>'</tt></li>
-            <li><strong>quote_backtick</strong> Backtick quotes <tt>`</tt></li>
+            <li><strong>quote_double</strong> Double quotes <code>"</code></li>
+            <li><strong>quote_single</strong> Single quotes <code>'</code></li>
+            <li><strong>quote_backtick</strong> Backtick quotes <code>`</code></li>
         </ul>
     </dd>
 
@@ -2386,7 +2386,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
             <dt id="cfg_SQLValidator_username">$cfg['SQLValidator']['username'] string<br />
                 <span id="cfg_SQLValidator_password">$cfg['SQLValidator']['password']</span> string</dt>
-            <dd>The SOAP service allows you to log in with <tt>anonymous</tt>
+            <dd>The SOAP service allows you to log in with <code>anonymous</code>
                 and any password, so we use those by default. Instead, if
                 you have an account with them, you can put your login details
                 here, and it will be used in place of the anonymous login.</dd>
@@ -2441,7 +2441,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <h3 id="transformationsintro">1. Introduction</h3>
 
-<p> To enable transformations, you have to setup the <tt>column_info</tt> table
+<p> To enable transformations, you have to setup the <code>column_info</code> table
     and the proper directives. Please see the <a href="#config">Configuration
     section</a> on how to do so.</p>
 
@@ -2535,7 +2535,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <ol><li>A mimetype+subtype transform:<br /><br />
 
-        <tt>[mimetype]_[subtype]__[transform].inc.php</tt><br /><br />
+        <code>[mimetype]_[subtype]__[transform].inc.php</code><br /><br />
 
         Please not that mimetype and subtype are separated via '_', which shall
         not be contained in their names. The transform function/filename may
@@ -2543,16 +2543,16 @@ setfacl -d -m "g:www-data:rwx" tmp
         well as the PHP function naming convention.<br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_[mimetype]_[subtype]__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text_html__formatted.inc.php</tt><br />
-        <tt>PMA_transform_text_html__formatted()</tt></li>
+        <code>text_html__formatted.inc.php</code><br />
+        <code>PMA_transform_text_html__formatted()</code></li>
 
     <li>A mimetype (w/o subtype) transform:<br /><br />
 
-        <tt>[mimetype]__[transform].inc.php</tt><br /><br />
+        <code>[mimetype]__[transform].inc.php</code><br /><br />
 
         Please note that there are no single '_' characters.
         The transform function/filename may contain only characters which cause
@@ -2560,16 +2560,16 @@ setfacl -d -m "g:www-data:rwx" tmp
         convention.<br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_[mimetype]__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_[mimetype]__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text__formatted.inc.php</tt><br />
-        <tt>PMA_transform_text__formatted()</tt></li>
+        <code>text__formatted.inc.php</code><br />
+        <code>PMA_transform_text__formatted()</code></li>
 
     <li>A mimetype+subtype without specific transform function<br /><br />
 
-        <tt>[mimetype]_[subtype].inc.php</tt><br /><br />
+        <code>[mimetype]_[subtype].inc.php</code><br /><br />
 
         Please note that there are no '__' characters in the filename. Do not
         use special characters in the filename causing problems with the file
@@ -2579,12 +2579,12 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text_plain.inc.php</tt><br />
+        <code>text_plain.inc.php</code><br />
         (No function)</li>
 
     <li>A mimetype (w/o subtype) without specific transform function<br /><br />
 
-        <tt>[mimetype].inc.php</tt><br /><br />
+        <code>[mimetype].inc.php</code><br /><br />
 
         Please note that there are no '_' characters in the filename. Do not use
         special characters in the filename causing problems with the file system.
@@ -2594,20 +2594,20 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text.inc.php</tt><br />
+        <code>text.inc.php</code><br />
         (No function)</li>
 
     <li>A global transform function with no specific mimetype<br /><br />
 
-        <tt>global__[transform].inc.php</tt><br /><br />
+        <code>global__[transform].inc.php</code><br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_global__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_global__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>global__formatted</tt><br />
-        <tt>PMA_transform_global__formatted()</tt></li>
+        <code>global__formatted</code><br />
+        <code>PMA_transform_global__formatted()</code></li>
 </ol>
 
 <p> So generally use '_' to split up mimetype and subtype, and '__' to provide a
@@ -2621,9 +2621,9 @@ setfacl -d -m "g:www-data:rwx" tmp
     without a transform function.</p>
 
 <p> To create a new transform function please see
-    <tt>libraries/transformations/template_generator.sh</tt>.
+    <code>libraries/transformations/template_generator.sh</code>.
     To create a new, empty mimetype please see
-    <tt>libraries/transformations/template_generator_mimetype.sh</tt>.</p>
+    <code>libraries/transformations/template_generator_mimetype.sh</code>.</p>
 
 <p> A transform function always gets passed three variables:</p>
 
@@ -2681,8 +2681,8 @@ setfacl -d -m "g:www-data:rwx" tmp
     cryptic characters to my browser, what can I do?</a></h4>
 
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a>
-    directive to <tt>FALSE</tt> in your <em>config.inc.php</em> file and the
-    <tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php
+    directive to <code>FALSE</code> in your <em>config.inc.php</em> file and the
+    <code>zlib.output_compression</code> directive to <code>Off</code> in your php
     configuration file.<br /></p>
 
 <h4 id="faq1_2">
@@ -2726,7 +2726,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <a href="#faq1_6">1.6 I can't use phpMyAdmin on PWS: nothing is displayed!</a></h4>
 
 <p> This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
-    time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
+    time there is no better fix): remove or comment the <code>DOCTYPE</code>
     declarations (2 lines) from the scripts <em>libraries/header.inc.php</em>,
     <em>libraries/header_printview.inc.php</em>, <em>index.php</em>,
     <em>navigation.php</em> and <em>libraries/common.lib.php</em>.</p>
@@ -2736,26 +2736,26 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="comma separated values">CSV</abbr> export? It does not seem to
     work.</a></h4>
 
-<p> These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</tt>
+<p> These features are based on the <code>gzencode()</code> and <code>bzcompress()</code>
     PHP functions to be more independent of the platform (Unix/Windows, Safe Mode
     or not, and so on). So, you must have Zlib/Bzip2
-    support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p>
+    support (<code>--with-zlib</code> and <code>--with-bz2</code>).<br /></p>
 
 <h4 id="faq1_8">
     <a href="#faq1_8">1.8 I cannot insert a text file in a table, and I get
     an error about safe mode being in effect.</a></h4>
 
 <p> Your uploaded file is saved by PHP in the &quot;upload dir&quot;, as
-    defined in <em>php.ini</em> by the variable <tt>upload_tmp_dir</tt> (usually
+    defined in <em>php.ini</em> by the variable <code>upload_tmp_dir</code> (usually
     the system default is <em>/tmp</em>).<br />
     We recommend the following setup for Apache servers running in safe mode,
     to enable uploads of files while being reasonably secure:</p>
 
-<ul><li>create a separate directory for uploads: <tt>mkdir /tmp/php</tt></li>
+<ul><li>create a separate directory for uploads: <code>mkdir /tmp/php</code></li>
     <li>give ownership to the Apache server's user.group:
-        <tt>chown apache.apache /tmp/php</tt></li>
-    <li>give proper permission: <tt>chmod 600 /tmp/php</tt></li>
-    <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <em>php.ini</em></li>
+        <code>chown apache.apache /tmp/php</code></li>
+    <li>give proper permission: <code>chmod 600 /tmp/php</code></li>
+    <li>put <code>upload_tmp_dir = /tmp/php</code> in <em>php.ini</em></li>
     <li>restart Apache</li>
 </ul>
 
@@ -2801,8 +2801,8 @@ setfacl -d -m "g:www-data:rwx" tmp
     <a href="#faq1_15">1.15 I have problems with <em>mysql.user</em> column names.</a>
 </h4>
 
-<p> In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns 
-    were named <tt>user</tt> and <tt>password</tt>. Please modify your column 
+<p> In previous MySQL versions, the <code>User</code> and <code>Password</code>columns 
+    were named <code>user</code> and <code>password</code>. Please modify your column 
     names to align with current standards.</p>
 
 <h4 id="faq1_16">
@@ -2815,12 +2815,12 @@ setfacl -d -m "g:www-data:rwx" tmp
     to take advantage of the new import features.</p>
 
 <p> The first things to check (or ask your host provider to check) are the
-    values of <tt>upload_max_filesize</tt>, <tt>memory_limit</tt> and
-    <tt>post_max_size</tt> in the <em>php.ini</em> configuration file.
+    values of <code>upload_max_filesize</code>, <code>memory_limit</code> and
+    <code>post_max_size</code> in the <em>php.ini</em> configuration file.
     All of these three settings limit the maximum size of data that can be
     submitted and handled by PHP. One user also said that
-    <tt>post_max_size</tt>
-    and <tt>memory_limit</tt> need to be larger than <tt>upload_max_filesize</tt>.<br /> <br />
+    <code>post_max_size</code>
+    and <code>memory_limit</code> need to be larger than <code>upload_max_filesize</code>.<br /> <br />
 
     There exist several workarounds if your upload is too big or your
     hosting provider is unwilling to change the settings:</p>
@@ -2837,7 +2837,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         with it.</li>
     <li>If you have shell (command line) access, use MySQL to import the files
         directly. You can do this by issuing the &quot;source&quot; command from
-        within MySQL: <tt>source <em>filename.sql</em></tt>.</li>
+        within MySQL: <code>source <em>filename.sql</em></code>.</li>
 </ul>
 
 <h4 id="faq1_17">
@@ -2911,23 +2911,23 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="Common Gateway Interface">CGI</abbr> version of PHP under Unix,
     and I cannot log in using cookie auth.</a></h4>
 
-<p> In <em>php.ini</em>, set <tt>mysql.max_links</tt> higher than 1.</p>
+<p> In <em>php.ini</em>, set <code>mysql.max_links</code> higher than 1.</p>
 
 <h4 id="faq1_22">
     <a href="#faq1_22">1.22 I don't see the &quot;Location of text file&quot; field,
     so I cannot upload.</a></h4>
 
-<p> This is most likely because in <em>php.ini</em>, your <tt>file_uploads</tt>
+<p> This is most likely because in <em>php.ini</em>, your <code>file_uploads</code>
     parameter is not set to &quot;on&quot;.</p>
 
 <h4 id="faq1_23">
     <a href="#faq1_23">1.23 I'm running MySQL on a Win32 machine. Each time I create
     a new table the table and column names are changed to lowercase!</a></h4>
 
-<p> This happens because the MySQL directive <tt>lower_case_table_names</tt>
-    defaults to 1 (<tt>ON</tt>) in the Win32 version of MySQL. You can change
-    this behavior by simply changing the directive to 0 (<tt>OFF</tt>):<br />
-    Just edit your <tt>my.ini</tt> file that should be located in your Windows
+<p> This happens because the MySQL directive <code>lower_case_table_names</code>
+    defaults to 1 (<code>ON</code>) in the Win32 version of MySQL. You can change
+    this behavior by simply changing the directive to 0 (<code>OFF</code>):<br />
+    Just edit your <code>my.ini</code> file that should be located in your Windows
     directory and add the following line to the group [mysqld]:</p>
 
 <pre>set-variable = lower_case_table_names=0</pre>
@@ -2982,7 +2982,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     message 'Errorcode: 13'. What does this mean?</a></h4>
 
 <p> This can happen due to a MySQL bug when having database / table names with
-    upper case characters although <tt>lower_case_table_names</tt> is set to 1.
+    upper case characters although <code>lower_case_table_names</code> is set to 1.
     To fix this, turn off this directive, convert all database and table names
     to lower case and turn it on again. Alternatively, there's a bug-fix
     available starting with MySQL&nbsp;3.23.56 / 4.0.11-gamma.</p>
@@ -3007,9 +3007,9 @@ SetInputFilter PHP
 <pre>AddType application/x-httpd-php .php</pre>
 
 <p> In the case we saw, one set of directives was in
-    <tt>/etc/httpd/conf/httpd.conf</tt>, while
-    the other set was in <tt>/etc/httpd/conf/addon-modules/php.conf</tt>.<br />
-    The recommended way is with <tt>AddType</tt>, so just comment out
+    <code>/etc/httpd/conf/httpd.conf</code>, while
+    the other set was in <code>/etc/httpd/conf/addon-modules/php.conf</code>.<br />
+    The recommended way is with <code>AddType</code>, so just comment out
     the first set of lines and restart Apache:</p>
 
 <pre>
@@ -3038,14 +3038,14 @@ SetInputFilter PHP
 <p> Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in <abbr title="Internet Server Application Programming Interface">ISAPI</abbr>
     mode under <abbr title="Internet Information Services">IIS</abbr> 5.1.</p>
 
-<ol><li>In your <tt>php.ini</tt> file, set <tt>cgi.rfc2616_headers = 0</tt></li>
-    <li>In <tt>Web Site Properties -&gt; File/Directory Security -&gt; Anonymous
-        Access</tt> dialog box, check the <tt>Anonymous access</tt> checkbox and
-        uncheck any other checkboxes (i.e. uncheck <tt>Basic authentication</tt>,
-        <tt>Integrated Windows authentication</tt>, and <tt>Digest</tt> if it's
-        enabled.) Click <tt>OK</tt>.</li>
-    <li>In <tt>Custom Errors</tt>, select the range of <tt>401;1</tt> through
-        <tt>401;5</tt> and click the <tt>Set to Default</tt> button.</li>
+<ol><li>In your <code>php.ini</code> file, set <code>cgi.rfc2616_headers = 0</code></li>
+    <li>In <code>Web Site Properties -&gt; File/Directory Security -&gt; Anonymous
+        Access</code> dialog box, check the <code>Anonymous access</code> checkbox and
+        uncheck any other checkboxes (i.e. uncheck <code>Basic authentication</code>,
+        <code>Integrated Windows authentication</code>, and <code>Digest</code> if it's
+        enabled.) Click <code>OK</code>.</li>
+    <li>In <code>Custom Errors</code>, select the range of <code>401;1</code> through
+        <code>401;5</code> and click the <code>Set to Default</code> button.</li>
 </ol>
 
 <h4 id="faq1_33">
@@ -3055,8 +3055,8 @@ SetInputFilter PHP
     <a href="#faq1_34">1.34 Can I access directly to database or table pages?</a></h4>
 
 <p> Yes. Out of the box, you can use <abbr title="Uniform Resource Locator">URL</abbr>s like
-http://server/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script. For <tt>server</tt> you use the server number which refers to
-the order of the server paragraph in <tt>config.inc.php</tt>.
+http://server/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script. For <code>server</code> you use the server number which refers to
+the order of the server paragraph in <code>config.inc.php</code>.
     Table and script parts are optional. If you want
     http://server/phpMyAdmin/database[/table][/script] <abbr title="Uniform Resource Locator">URL</abbr>s, you need to do
     some configuration. Following lines apply only for <a
@@ -3142,7 +3142,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 
     <p>
         You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning">
-        <tt>SuhosinDisableWarning</tt> directive</a>.
+        <code>SuhosinDisableWarning</code> directive</a>.
     </p>
 
 <h4 id="faq1_39">
@@ -3150,7 +3150,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
     but then my connection is redirected back to http. What can cause this 
     behavior?</a></h4>
 
-<p> Be sure that you have enabled <tt>SSLOptions</tt> and <tt>StdEnvVars</tt>
+<p> Be sure that you have enabled <code>SSLOptions</code> and <code>StdEnvVars</code>
 in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>
 
 <h4 id="faq1_40">
@@ -3185,7 +3185,7 @@ ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
            privileges, I get an error about an unknown column.</a></h4>
 
 <p> The MySQL server's privilege tables are not up to date, you need to run
-the <tt>mysql_upgrade</tt> command on the server.</p>
+the <code>mysql_upgrade</code> command on the server.</p>
 
 <h4 id="faq1_42">
     <a href="#faq1_42">1.42 How can I prevent robots from accessing phpMyAdmin?</a></h4>
@@ -3225,10 +3225,10 @@ RewriteRule .* - [F]
 
 <p> Edit your <em>config.inc.php</em> file and ensure there is nothing
     (I.E. no blank lines, no spaces, no characters...) neither before the
-    <tt>&lt;?php</tt> tag at the beginning, neither after the <tt>?&gt;</tt>
+    <code>&lt;?php</code> tag at the beginning, neither after the <code>?&gt;</code>
     tag at the end. We also got a report from a user under
     <abbr title="Internet Information Services">IIS</abbr>, that used
-    a zipped distribution kit: the file <tt>libraries/Config.class.php</tt>
+    a zipped distribution kit: the file <code>libraries/Config.class.php</code>
     contained an end-of-line character (hex 0A) at the end; removing this character
     cleared his errors.</p>
 
@@ -3263,7 +3263,7 @@ RewriteRule .* - [F]
 <ul><li>First, you need to determine what socket is being used by MySQL.<br />
         To do this, telnet to your server and go to the MySQL bin directory. In
         this directory there should be a file named <em>mysqladmin</em>. Type
-        <tt>./mysqladmin variables</tt>, and this should give you a bunch of
+        <code>./mysqladmin variables</code>, and this should give you a bunch of
         info about your MySQL server, including the socket
         (<em>/tmp/mysql.sock</em>, for example).</li>
     <li>Then, you need to tell PHP to use this socket.<br /> To do this in
@@ -3287,7 +3287,7 @@ RewriteRule .* - [F]
     what can I do?</a></h4>
 
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGZip']</a>
-    directive to <tt>FALSE</tt> in the phpMyAdmin configuration file. It helps
+    directive to <code>FALSE</code> in the phpMyAdmin configuration file. It helps
     sometime.<br />
     Also have a look at your PHP version number: if it contains &quot;b&quot; or &quot;alpha&quot;
     it means you're running a testing version of PHP. That's not a so good idea,
@@ -3339,19 +3339,19 @@ RewriteRule .* - [F]
 
 <ul><li>make a new subdirectory (for example &quot;your_theme_name&quot;) under
         <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>
-        (by default <tt>themes</tt>)</li>
+        (by default <code>themes</code>)</li>
     <li>copy the files and directories from &quot;original&quot; to
         &quot;your_theme_name&quot;</li>
     <li>edit the css-files in &quot;your_theme_name/css&quot;</li>
     <li>put your new images in &quot;your_theme_name/img&quot;</li>
-    <li>edit <tt>layout.inc.php</tt> in &quot;your_theme_name&quot;</li>
-    <li>edit <tt>info.inc.php</tt> in &quot;your_theme_name&quot; to
+    <li>edit <code>layout.inc.php</code> in &quot;your_theme_name&quot;</li>
+    <li>edit <code>info.inc.php</code> in &quot;your_theme_name&quot; to
         contain your chosen theme name, that will be visible in user interface</li>
     <li>make a new screenshot of your theme and save it under
         &quot;your_theme_name/screen.png&quot;</li>
 </ul>
 
-<p> In theme directory there is file <tt>info.inc.php</tt> which contains
+<p> In theme directory there is file <code>info.inc.php</code> which contains
     theme verbose name, theme generation and theme version. These versions and
     generations are enumerated from 1 and do not have any direct dependence on
     phpMyAdmin version. Themes within same generation should be backwards
@@ -3369,7 +3369,7 @@ RewriteRule .* - [F]
 
 <p> Here are a few points to check:</p>
 
-<ul><li>In <tt>config.inc.php</tt>, try to leave the
+<ul><li>In <code>config.inc.php</code>, try to leave the
         <a href="#cfg_PmaAbsoluteUri" class="configrule">$cfg['PmaAbsoluteUri']</a>
         directive empty. See also
         <a href="#faq4_7"><abbr title="Frequently Asked Questions">FAQ</abbr> 4.7</a>.
@@ -3379,19 +3379,19 @@ RewriteRule .* - [F]
         <a href="http://bugs.php.net/bug.php?id=31134">
         http://bugs.php.net/bug.php?id=31134</a>.
     </li>
-    <li>If you are using Hardened PHP with the ini directive <tt>varfilter.max_request_variables</tt>
+    <li>If you are using Hardened PHP with the ini directive <code>varfilter.max_request_variables</code>
         set to the default (200) or another low value, you could get this
         error if your table has a high number of columns. Adjust this setting
         accordingly. (Thanks to Klaus Dorninger for the hint).
     </li>
-    <li>In the <tt>php.ini</tt> directive <tt>arg_separator.input</tt>, a value
+    <li>In the <code>php.ini</code> directive <code>arg_separator.input</code>, a value
         of &quot;;&quot; will cause this error. Replace it with &quot;&amp;;&quot;.
     </li>
     <li>If you are using <a href="http://www.hardened-php.net/">Hardened-PHP</a>,
        you might want to increase
        <a href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.
     </li>
-    <li>The directory specified in the <tt>php.ini</tt> directive <tt>session.save_path</tt> does not exist or is read-only.
+    <li>The directory specified in the <code>php.ini</code> directive <code>session.save_path</code> does not exist or is read-only.
     </li>
 </ul>
 
@@ -3402,7 +3402,7 @@ RewriteRule .* - [F]
 have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
     or the <a href="http://pecl.php.net/package/uploadprogress">uploadprogress</a>
     one. Moreover, the JSON extension has to be enabled in your PHP.</p>
-    <p> If using APC, you must set <tt>apc.rfc1867</tt> to <tt>on</tt> in your php.ini.</p>
+    <p> If using APC, you must set <code>apc.rfc1867</code> to <code>on</code> in your php.ini.</p>
 
 <h3 id="faqlimitations">Known limitations</h3>
 
@@ -3526,7 +3526,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <h4 id="faq3_10">
     <a href="#faq3_10">3.10 Homonyms and no primary key: When the results of a SELECT display
     more that one column with the same value
-    (for example <tt>SELECT lastname from employees where firstname like 'A%'</tt> and two &quot;Smith&quot; values are displayed),
+    (for example <code>SELECT lastname from employees where firstname like 'A%'</code> and two &quot;Smith&quot; values are displayed),
     if I click Edit I cannot be sure that I am editing the intended row.</a></h4>
 
 <p> Please make sure that your table has a primary key, so that phpMyAdmin
@@ -3545,7 +3545,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
     <a href="#faq3_12">3.12 (withdrawn).</a></h4>
 
 <h4 id="faq3_13">
-    <a href="#faq3_13">3.13 I get an error when entering <tt>USE</tt> followed by a db name
+    <a href="#faq3_13">3.13 I get an error when entering <code>USE</code> followed by a db name
     containing an hyphen.
 </a></h4>
 <p>
@@ -3630,7 +3630,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 </p>
 <ul>
     <li>
-        Your <em>config.inc.php</em> file should be <tt>chmod 660</tt>.
+        Your <em>config.inc.php</em> file should be <code>chmod 660</code>.
     </li>
     <li>
         All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
@@ -3648,8 +3648,8 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 </a></h4>
 <p>
     Check <em>php.ini</em>, or ask your sysadmin to check it. The
-    <tt>include_path</tt> must contain &quot;.&quot; somewhere in it, and
-    <tt>open_basedir</tt>, if used, must contain &quot;.&quot; and
+    <code>include_path</code> must contain &quot;.&quot; somewhere in it, and
+    <code>open_basedir</code>, if used, must contain &quot;.&quot; and
     &quot;./lang&quot; to allow normal operation of phpMyAdmin.
 </p>
 
@@ -3676,15 +3676,15 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <p> Starting with 2.2.5, in the user management page, you can enter a wildcard
     database name for a user (for example &quot;joe%&quot;),
     and put the privileges you want.  For example,
-    adding <tt>SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER</tt>
+    adding <code>SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER</code>
     would let a user create/manage his/her database(s).</p>
 
 <h4 id="faq4_6">
     <a href="#faq4_6">4.6 How can I use the Host-based authentication additions?</a></h4>
 
 <p> If you have existing rules from an old <a href="#glossary"><em>.htaccess</em></a> file, you can take them
-    and add a username between the <tt>'deny'</tt>/<tt>'allow'</tt> and
-    <tt>'from'</tt> strings. Using the username wildcard of <tt>'%'</tt> would
+    and add a username between the <code>'deny'</code>/<code>'allow'</code> and
+    <code>'from'</code> strings. Using the username wildcard of <code>'%'</code> would
     be a major benefit here if your installation is suited to using it. Then
     you can just add those updated lines into the
     <a href="#cfg_Servers_AllowDeny_rules" class="configrule">
@@ -3718,7 +3718,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
 <h4 id="faq4_8">
     <a href="#faq4_8">4.8 Which parameters can I use in the URL that starts phpMyAdmin?</a></h4>
 
-<p>When starting phpMyAdmin, you can use the <tt>db</tt>, <tt>pma_username</tt>, <tt>pma_password</tt> and <tt>server</tt> parameters. This last one can contain either the numeric host index (from <tt>$i</tt> of the configuration file) or one of the host names present in the configuration file. Using <tt>pma_username</tt> and <tt>pma_password</tt> has been tested along with the usage of 'cookie' <tt>auth_type</tt>.</p>
+<p>When starting phpMyAdmin, you can use the <code>db</code>, <code>pma_username</code>, <code>pma_password</code> and <code>server</code> parameters. This last one can contain either the numeric host index (from <code>$i</code> of the configuration file) or one of the host names present in the configuration file. Using <code>pma_username</code> and <code>pma_password</code> has been tested along with the usage of 'cookie' <code>auth_type</code>.</p>
 
 <h3 id="faqbrowsers">Browsers or client <abbr title="operating system">OS</abbr></h3>
 
@@ -3862,8 +3862,8 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
     Javascript errors. Or I cannot make phpMyAdmin work under Windows.</a></h4>
 
 <p> Please check the following points:</p>
-    <ul><li>Maybe you have defined your <tt>PmaAbsoluteUri</tt> setting
-            in <tt>config.inc.php</tt> to an <abbr title="Internet Protocol">IP</abbr>
+    <ul><li>Maybe you have defined your <code>PmaAbsoluteUri</code> setting
+            in <code>config.inc.php</code> to an <abbr title="Internet Protocol">IP</abbr>
             address and you are starting
             phpMyAdmin with a <abbr title="Uniform Resource Locator">URL</abbr>
             containing a domain name, or the reverse situation.</li>
@@ -3881,12 +3881,12 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
     installed in their Firefox is causing the problem.</p>
 
 <h4 id="faq5_18">
-<a href="#faq5_18">5.18 With Konqueror 4.2.x an invalid <tt>LIMIT</tt>
+<a href="#faq5_18">5.18 With Konqueror 4.2.x an invalid <code>LIMIT</code>
     clause is generated when I browse a table.</a></h4>
 <p> This happens only when both of these conditions are met: using the 
-    <tt>http</tt> authentication mode and <tt>register_globals</tt> being set 
-    to <tt>On</tt> on the server. It seems to be a browser-specific problem; 
-    meanwhile use the <tt>cookie</tt> authentication mode.</p>
+    <code>http</code> authentication mode and <code>register_globals</code> being set 
+    to <code>On</code> on the server. It seems to be a browser-specific problem; 
+    meanwhile use the <code>cookie</code> authentication mode.</p>
 
 <h4 id="faq5_19">
 <a href="#faq5_19">5.19 I get JavaScript errors in my browser.</a></h4>
@@ -3906,8 +3906,8 @@ to see if the problem goes away.</p>
     Common errors include:
 </p>
 <ul>
-    <li>Using <tt>VARCHAR</tt> without a size argument</li>
-    <li>Using <tt>TEXT</tt> or <tt>BLOB</tt> with a size argument</li>
+    <li>Using <code>VARCHAR</code> without a size argument</li>
+    <li>Using <code>TEXT</code> or <code>BLOB</code> with a size argument</li>
 </ul>
 <p>
     Also, look at the syntax chapter in the MySQL manual to confirm that your
@@ -3975,7 +3975,7 @@ to see if the problem goes away.</p>
     <a href="#faq6_6">6.6 How can I use the relation table in Query-by-example?</a></h4>
 
 <p> Here is an example with the tables persons, towns and countries, all
-    located in the database mydb. If you don't have a <tt>pma_relation</tt>
+    located in the database mydb. If you don't have a <code>pma_relation</code>
     table, create it as explained in the configuration section. Then create the
     example tables:</p>
 
@@ -4175,8 +4175,8 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
 <p>
     To install <abbr title="PHP Extension and Application
     Repository">PEAR</abbr> <abbr title="Simple Object Access
-    Protocol">SOAP</abbr> module, run <tt>"pear install Net_Socket Net_URL
-    HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr
+    Protocol">SOAP</abbr> module, run <code>"pear install Net_Socket Net_URL
+    HTTP_Request Mail_Mime Net_DIME SOAP"</code> to get the necessary <abbr
     title="PHP Extension and Application Repository">PEAR</abbr> modules for
     usage.
 </p>
@@ -4318,7 +4318,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
 
     For 100 values or more, a distinct window will appear, to browse foreign
     key values and choose one. To change the default limit of 100, see
-    <tt><a href="#cfg_ForeignKeyMaxLimit" class="configrule">$cfg['ForeignKeyMaxLimit']</a></tt>.</p>
+    <code><a href="#cfg_ForeignKeyMaxLimit" class="configrule">$cfg['ForeignKeyMaxLimit']</a></code>.</p>
 
 <h4 id="faq6_22">
     <a href="#faq6_22">6.22 Bookmarks: Can I execute a default bookmark
@@ -4439,7 +4439,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
             <p>
             Create a Zip archive with .shp and .dbf files and import it. For this to work, 
             you need to set <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to a
-            place where the web server user can write (for example <tt>'./tmp'</tt>).
+            place where the web server user can write (for example <code>'./tmp'</code>).
             </p>
 
             <p> To create the temporary directory on a UNIX-based system, you can do:</p>
@@ -4614,7 +4614,7 @@ the source and target corresponding tables.
 </p>
 
 <p>
-The difference is depicted by the red and green buttons with <tt>S</tt> and <tt>D</tt>
+The difference is depicted by the red and green buttons with <code>S</code> and <code>D</code>
 letters, indicating that either Structure or Data are not up to date. By
 clicking on them, they will turn grey, what means that they will be synchronized.
 </p>
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index c47e6ea6bd..7e48366e01 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -618,7 +618,7 @@ if ($GLOBALS['PMA_Config']->error_config_default_file) {
     trigger_error($error, E_USER_ERROR);
 }
 if ($GLOBALS['PMA_Config']->error_pma_uri) {
-    trigger_error(__('The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!'), E_USER_ERROR);
+    trigger_error(__('The <code>$cfg[\'PmaAbsoluteUri\']</code> directive MUST be set in your configuration file!'), E_USER_ERROR);
 }
 
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 435eef8a5f..461c3eb620 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -295,7 +295,7 @@ if (!empty($submit_mult) && !empty($what)) {
             }
             echo __('Do you really want to execute following query?');
         ?>:</legend>
-        <tt><?php echo $full_query; ?></tt>
+        <code><?php echo $full_query; ?></code>
     </fieldset>
     <fieldset class="tblFooters">
         <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" />
diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
index 7ce0329e20..e7ec025b06 100644
--- a/libraries/tcpdf/tcpdf.php
+++ b/libraries/tcpdf/tcpdf.php
@@ -20710,7 +20710,7 @@ class TCPDF {
 		// define self-closing tags
 		$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
 		// remove all unsupported tags (the line below lists all supported tags)
-		$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
+		$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><code><u><ul>');
 		//replace some blank characters
 		$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
 		$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
diff --git a/po/af.po b/po/af.po
index e0e584928c..4d8303dd0b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2880,10 +2880,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Die <tt>$cfg['PmaAbsoluteUri']</tt> veranderlike MOET gestel wees in jou "
+"Die <code>$cfg['PmaAbsoluteUri']</code> veranderlike MOET gestel wees in jou "
 "konfigurasie leer!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ar.po b/po/ar.po
index d7bbffed9b..7ef1646ae4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2769,10 +2769,10 @@ msgstr "لا يمكن تحميل الإعدادات الإفتراضية من :
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"المتغير <span dir=\"ltr\"><tt>$cfg['PmaAbsoluteUri']</tt></span> يجب تعديله "
+"المتغير <span dir=\"ltr\"><code>$cfg['PmaAbsoluteUri']</code></span> يجب تعديله "
 "في ملف التعريف !"
 
 #: libraries/common.inc.php:647
diff --git a/po/az.po b/po/az.po
index e0ff994887..901d1c152d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2911,10 +2911,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktivi PMA konfiqurasiya faylınızda "
+"<code>$cfg['PmaAbsoluteUri']</code> direktivi PMA konfiqurasiya faylınızda "
 "QURULMAMIŞDIR!"
 
 #: libraries/common.inc.php:647
diff --git a/po/be.po b/po/be.po
index 45acb55766..4090a21435 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2979,10 +2979,10 @@ msgstr "Немагчыма загрузіць канфігурацыю па зм
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Дырэктыва <tt>$cfg['PmaAbsoluteUri']</tt> ПАВІННА быць вызначаная ў вашым "
+"Дырэктыва <code>$cfg['PmaAbsoluteUri']</code> ПАВІННА быць вызначаная ў вашым "
 "канфігурацыйным файле!"
 
 #: libraries/common.inc.php:647
diff --git a/po/be@latin.po b/po/be@latin.po
index db303900a2..5e6767e666 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -2994,7 +2994,7 @@ msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "Dyrektyva $cfg['PmaAbsoluteUri'] PAVINNA być vyznačanaja ŭ vašym "
diff --git a/po/bg.po b/po/bg.po
index 5029a122f5..cb4baa32fb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2757,10 +2757,10 @@ msgstr "Конфигурацията по подразбиране не може
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"На <tt>$cfg['PmaAbsoluteUri']</tt> ТРЯБВА да се зададе стойност в "
+"На <code>$cfg['PmaAbsoluteUri']</code> ТРЯБВА да се зададе стойност в "
 "конфигурационния файл!"
 
 #: libraries/common.inc.php:647
diff --git a/po/bn.po b/po/bn.po
index 9a3faf64a8..631af528c5 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -2893,10 +2893,10 @@ msgstr "\"%1$s\" হতে ডিফল্ট কনফিগারেশন ল
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/br.po b/po/br.po
index 4b88c93796..f2b1fd92a6 100644
--- a/po/br.po
+++ b/po/br.po
@@ -2787,10 +2787,10 @@ msgstr "N'eus ket bet gallet kargañ ar c'hefluniadur dre ziouer adalek %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"RET eo d'an arventenn <tt>$cfg['PmaAbsoluteUri']</tt> bezañ resisaet er "
+"RET eo d'an arventenn <code>$cfg['PmaAbsoluteUri']</code> bezañ resisaet er "
 "restr kefluniañ!"
 
 #: libraries/common.inc.php:647
diff --git a/po/bs.po b/po/bs.po
index 5806f81ec8..665076c342 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2909,10 +2909,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podješena u "
+"<code>$cfg['PmaAbsoluteUri']</code> direktiva MORA biti podješena u "
 "konfiguracionoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ca.po b/po/ca.po
index 4326bfa45a..fbb732b334 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2738,10 +2738,10 @@ msgstr "No es pot carregar la configuració per defecte des de: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"La directiva <tt>$cfg['PmaAbsoluteUri']</tt> HA d'estar establerta a l'arxiu "
+"La directiva <code>$cfg['PmaAbsoluteUri']</code> HA d'estar establerta a l'arxiu "
 "de configuració!"
 
 #: libraries/common.inc.php:647
diff --git a/po/cs.po b/po/cs.po
index 2be3670aed..e052730ac8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2748,10 +2748,10 @@ msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Parametr <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ být nastaven v konfiguračním "
+"Parametr <code>$cfg['PmaAbsoluteUri']</code> MUSÍ být nastaven v konfiguračním "
 "souboru!"
 
 #: libraries/common.inc.php:647
diff --git a/po/cy.po b/po/cy.po
index e6f1dcb24a..6cc76337b0 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2905,7 +2905,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index e17996bd24..2feb7c6c22 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2802,10 +2802,10 @@ msgstr "Kunne ikke indlæse standardkonfiguration fra: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktivet SKAL være sat i din "
+"<code>$cfg['PmaAbsoluteUri']</code> direktivet SKAL være sat i din "
 "konfigurationsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/de.po b/po/de.po
index 4b70909d61..39d04d2625 100644
--- a/po/de.po
+++ b/po/de.po
@@ -856,7 +856,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
 
-# Schema is not the right word for it, because a dump contains also data, and
+# Schema is not the right word for it, because a dump contains also data, and
 # NOT just the scheme.
 #: export.php:654
 #, php-format
@@ -919,8 +919,8 @@ msgstr "LineString"
 msgid "Outer Ring"
 msgstr "Ankreis"
 
-# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
-# 
+# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
+# 
 # Ja
 #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:320
 msgid "Inner Ring"
@@ -2795,10 +2795,10 @@ msgstr "Fehler beim Laden der Standard-Konfiguration von: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Das <tt>$cfg['PmaAbsoluteUri']</tt> Verzeichnis MUSS in Ihrer "
+"Das <code>$cfg['PmaAbsoluteUri']</code> Verzeichnis MUSS in Ihrer "
 "Konfigurationsdatei angegeben werden!"
 
 #: libraries/common.inc.php:647
@@ -3285,7 +3285,7 @@ msgstr "Zeile unter Mauscursor hervorheben"
 msgid "Highlight pointer"
 msgstr "Cursor hervorheben"
 
-# Maybe the wikipedia link should point to the german version of the article
+# Maybe the wikipedia link should point to the german version of the article
 # (http://de.wikipedia.org/wiki/Bzip2 )
 #: libraries/config/messages.inc.php:30
 msgid ""
@@ -5362,7 +5362,7 @@ msgstr "Aktiviere die Prüfung auf Aktualisierungen auf der Hauptseite"
 msgid "Version check"
 msgstr "Versionsüberprüfung"
 
-# Maybe wikipedia links should point to $lang.wikipedia.org, eg
+# Maybe wikipedia links should point to $lang.wikipedia.org, eg
 # http://de.wikipedia.org/wiki/ZIP-Dateiformat
 #: libraries/config/messages.inc.php:524
 msgid ""
diff --git a/po/el.po b/po/el.po
index 32937c37d5..de06e8adea 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2779,10 +2779,10 @@ msgstr "Αδύνατη η φόρτωση της προεπιλεγμένης ρ
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Η εντολή <tt>$cfg['PmaAbsoluteUri']</tt> ΠΡΕΠΕΙ να οριστεί στο αρχείο "
+"Η εντολή <code>$cfg['PmaAbsoluteUri']</code> ΠΡΕΠΕΙ να οριστεί στο αρχείο "
 "ρυθμίσεων!"
 
 #: libraries/common.inc.php:647
diff --git a/po/en_GB.po b/po/en_GB.po
index 7bd9a1bdde..e2c1553ecc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2746,10 +2746,10 @@ msgstr "Could not load default configuration from: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/es.po b/po/es.po
index 4a833ba660..c3b5c9bc24 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1362,7 +1362,7 @@ msgstr "PB"
 msgid "EiB"
 msgstr "EB"
 
-# singular: tabla
+# singular: tabla
 # plural: tablas
 #: js/messages.php:128
 #, php-format
@@ -2787,10 +2787,10 @@ msgstr "No se pudo cargar la configuración predeterminada desde: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"¡El contenido de <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar definido en el "
+"¡El contenido de <code>$cfg['PmaAbsoluteUri']</code> DEBE estar definido en el "
 "archivo de configuración config.inc.php!"
 
 #: libraries/common.inc.php:647
@@ -12844,7 +12844,7 @@ msgstr ""
 msgid "Percentage of used open files limit"
 msgstr "Porcentaje de uso del límite de archivos de abiertos"
 
-# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
+# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
 # traducirlo
 #: po/advisory_rules.php:186
 msgid ""
diff --git a/po/et.po b/po/et.po
index 5a849bc43d..b2f30bf7e2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2748,10 +2748,10 @@ msgstr "Ei saanud laadida vaikimisi seadistuse faili kohast: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> väärtus PEAB sinu seadistusfailis olema "
+"<code>$cfg['PmaAbsoluteUri']</code> väärtus PEAB sinu seadistusfailis olema "
 "määratud!"
 
 #: libraries/common.inc.php:647
diff --git a/po/eu.po b/po/eu.po
index 2aaf4f8ab1..8733017ace 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2857,10 +2857,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktibak zure konfigurazio fitxategian "
+"<code>$cfg['PmaAbsoluteUri']</code> direktibak zure konfigurazio fitxategian "
 "zehaztuta behar du egon!"
 
 #: libraries/common.inc.php:647
diff --git a/po/fa.po b/po/fa.po
index da47ce2c0d..833324b49e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2873,7 +2873,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 80b781b425..7c29009f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2840,9 +2840,9 @@ msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<tt>$cfg['PmaAbsoluteUri']</tt> täytyy määritellä asetustiedostossa!"
+msgstr "<code>$cfg['PmaAbsoluteUri']</code> täytyy määritellä asetustiedostossa!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/fr.po b/po/fr.po
index f69fee06f7..ee2cf26279 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2775,10 +2775,10 @@ msgstr "Chargement de la configuration par défaut impossible depuis %1$s"
 # OK
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Le paramètre <tt>$cfg['PmaAbsoluteUri']</tt> DOIT être renseigné dans votre "
+"Le paramètre <code>$cfg['PmaAbsoluteUri']</code> DOIT être renseigné dans votre "
 "fichier de configuration !"
 
 #: libraries/common.inc.php:647
diff --git a/po/gl.po b/po/gl.po
index 87d56137c3..f4cb0f809e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2986,10 +2986,10 @@ msgstr "Non se puido cargar a configuración desde: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A directiva <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar asignada no seu "
+"A directiva <code>$cfg['PmaAbsoluteUri']</code> DEBE estar asignada no seu "
 "ficheiro de configuración."
 
 #: libraries/common.inc.php:647
diff --git a/po/he.po b/po/he.po
index 1ae9ecd73d..3e195847e4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2913,7 +2913,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index f2bc4640a5..0289df43bc 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2862,10 +2862,10 @@ msgstr "%1$s से मूलभूत विन्यास लोड नही
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
+"<code>$cfg['PmaAbsoluteUri']</code> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/hr.po b/po/hr.po
index 6f14607633..e3053b4a3e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2975,10 +2975,10 @@ msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> MORA BITI postavljena u vašoj "
+"Direktiva <code>$cfg['PmaAbsoluteUri']</code> MORA BITI postavljena u vašoj "
 "konfiguracijskoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/hu.po b/po/hu.po
index 3350676299..b995477ddb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2766,10 +2766,10 @@ msgstr "Nem lehetett betölteni az alapértelmezett konfigurációt innen: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A <tt>$cfg['PmaAbsoluteUri']</tt> utasítás értékét a konfigurációs fájlban "
+"A <code>$cfg['PmaAbsoluteUri']</code> utasítás értékét a konfigurációs fájlban "
 "KELL megadni!"
 
 #: libraries/common.inc.php:647
diff --git a/po/id.po b/po/id.po
index 877da97f9a..4c85585ca7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2759,10 +2759,10 @@ msgstr "Tidak dapat memuat konfigurasi default dari: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Directif <tt>$cfg['PmaAbsoluteUri']</tt> WAJIB diset dalam berkas "
+"Directif <code>$cfg['PmaAbsoluteUri']</code> WAJIB diset dalam berkas "
 "konfigurasi!"
 
 #: libraries/common.inc.php:647
diff --git a/po/it.po b/po/it.po
index d5372153a8..21f9457a31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2779,10 +2779,10 @@ msgstr "Non posso caricare la configurazione predefinita da: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"La direttiva <tt>$cfg['PmaAbsoluteUri']</tt> DEVE essere impostata nel file "
+"La direttiva <code>$cfg['PmaAbsoluteUri']</code> DEVE essere impostata nel file "
 "di configurazione!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ja.po b/po/ja.po
index 1df0098663..8cb10adb31 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2751,10 +2751,10 @@ msgstr "デフォルトの設定を読み込めませんでした: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> は<b>必ず</b>設定ファイルに設定しなければなり"
+"<code>$cfg['PmaAbsoluteUri']</code> は<b>必ず</b>設定ファイルに設定しなければなり"
 "ません！"
 
 #: libraries/common.inc.php:647
diff --git a/po/ka.po b/po/ka.po
index 2cf6625828..a458ce4116 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2963,10 +2963,10 @@ msgstr "Could not load default configuration from: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ko.po b/po/ko.po
index 1d81b6cebf..676fb0b16b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2741,10 +2741,10 @@ msgstr "기본 설정을 가져올 수 없습니다: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 정의되어야 합니다!"
+"환경설정 파일에 <code>$cfg['PmaAbsoluteUri']</code> 변수가 정의되어야 합니다!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/lt.po b/po/lt.po
index 17f4c6305e..597384aa64 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2784,10 +2784,10 @@ msgstr "Nepavyko užkrauti numatytų nustatymų failo iš: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"BŪTINA nustatymų faile įrašyti <tt>$cfg['PmaAbsoluteUri']</tt> reikšmę!"
+"BŪTINA nustatymų faile įrašyti <code>$cfg['PmaAbsoluteUri']</code> reikšmę!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/lv.po b/po/lv.po
index 6d33fa2fed..9a9c8fecda 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2922,10 +2922,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktīvai ir JĀBŪT nodefinētai Jūsu "
+"<code>$cfg['PmaAbsoluteUri']</code> direktīvai ir JĀBŪT nodefinētai Jūsu "
 "konfigurācijas failā!"
 
 #: libraries/common.inc.php:647
diff --git a/po/mk.po b/po/mk.po
index bab361fb6b..347f88c955 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2924,10 +2924,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> директивата МОРА да биде подесена во "
+"<code>$cfg['PmaAbsoluteUri']</code> директивата МОРА да биде подесена во "
 "конфигурациската податотека!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ml.po b/po/ml.po
index 142f9740e4..fad073e8ab 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2668,7 +2668,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/mn.po b/po/mn.po
index 0c3cf6cfff..aa2ba9f28b 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -2943,10 +2943,10 @@ msgstr "Анхдагч тохиргоо дуудагдсангүй нь: \"%1$s\
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> -ыг тохиргооны файлд тохируулах хэрэгтэй!"
+"<code>$cfg['PmaAbsoluteUri']</code> -ыг тохиргооны файлд тохируулах хэрэгтэй!"
 
 #: libraries/common.inc.php:647
 #, fuzzy, php-format
diff --git a/po/ms.po b/po/ms.po
index 075b369b4e..89bc1c0358 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2892,10 +2892,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[PmaAbsoluteUri]</tt> MESTI disetkan di dalam fail konfigurasi."
+"<code>$cfg[PmaAbsoluteUri]</code> MESTI disetkan di dalam fail konfigurasi."
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/nb.po b/po/nb.po
index a65452cad5..d8f1c1e487 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2888,10 +2888,10 @@ msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> variabelen MÅ være innstilt i din "
+"<code>$cfg['PmaAbsoluteUri']</code> variabelen MÅ være innstilt i din "
 "konfigurasjonsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/nl.po b/po/nl.po
index 04018774d5..ef451208da 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2785,10 +2785,10 @@ msgstr "Standaard configuratiebestand kon niet geladen worden vanuit: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"De <tt>$cfg['PmaAbsoluteUri']</tt> richtlijn MOET gezet zijn in het "
+"De <code>$cfg['PmaAbsoluteUri']</code> richtlijn MOET gezet zijn in het "
 "configuratiebestand!"
 
 #: libraries/common.inc.php:647
@@ -9769,8 +9769,8 @@ msgstr ""
 "Deze MySQL server is ingesteld als <b>slave</b> in een <b>replicatie</b> "
 "proces."
 
-# Er moet een betere vertaling voor "replication" zijn. "Nadoen"?
-# "Deze MySQL-server functioneert als %s in een <b>replicatie</b> proces."
+# Er moet een betere vertaling voor "replication" zijn. "Nadoen"?
+# "Deze MySQL-server functioneert als %s in een <b>replicatie</b> proces."
 # weggehaald.
 #: server_status.php:1076
 msgid ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index c0bf01a835..1525311d30 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -2665,7 +2665,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 4fe711a52a..e64438f1e4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2766,10 +2766,10 @@ msgstr "Nie można załadować domyślnej konfiguracji z: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Dyrektywa <tt>$cfg['PmaAbsoluteUri']</tt> musi być ustawiona w pliku "
+"Dyrektywa <code>$cfg['PmaAbsoluteUri']</code> musi być ustawiona w pliku "
 "konfiguracyjnym!"
 
 #: libraries/common.inc.php:647
diff --git a/po/pt.po b/po/pt.po
index d067a70328..71846200c7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2811,10 +2811,10 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A directiva <tt>$cfg['PmaAbsoluteUri']</tt> TEM que ser definida no ficheiro "
+"A directiva <code>$cfg['PmaAbsoluteUri']</code> TEM que ser definida no ficheiro "
 "de configuração!"
 
 #: libraries/common.inc.php:647
diff --git a/po/pt_BR.po b/po/pt_BR.po
index efabe52edd..43abfc737d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2775,10 +2775,10 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A diretriz<tt>$cfg['PmaAbsoluteUri']</tt> dDEVE ser estabelecida no seu "
+"A diretriz<code>$cfg['PmaAbsoluteUri']</code> dDEVE ser estabelecida no seu "
 "arquivo de configuração!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ro.po b/po/ro.po
index 1c4d910db5..0a373767ed 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2896,10 +2896,10 @@ msgstr "Nu s-a putut încărca configurația implicită din: „%1$s”"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Directiva <tt>$cfg['PmaAbsoluteUri']</tt> TREBUIE să fie stabilită în "
+"Directiva <code>$cfg['PmaAbsoluteUri']</code> TREBUIE să fie stabilită în "
 "fișierul de configurare!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ru.po b/po/ru.po
index 4809671e6b..d76c9f2e8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2772,10 +2772,10 @@ msgstr "Невозможно загрузить изначальную конф
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Директива <tt>$cfg['PmaAbsoluteUri']</tt> ДОЛЖНА быть установлена в "
+"Директива <code>$cfg['PmaAbsoluteUri']</code> ДОЛЖНА быть установлена в "
 "конфигурационном файле!"
 
 #: libraries/common.inc.php:647
diff --git a/po/si.po b/po/si.po
index 512657928a..f50f67c514 100644
--- a/po/si.po
+++ b/po/si.po
@@ -2726,10 +2726,10 @@ msgstr "%1$s වෙතින් පෙරනිමි සිටුවම් ප
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> සඳහා අගය ඔබගේ වින්‍යාස ගොනුවේ අඩංගු විය යුතුමය!"
+"<code>$cfg['PmaAbsoluteUri']</code> සඳහා අගය ඔබගේ වින්‍යාස ගොනුවේ අඩංගු විය යුතුමය!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/sk.po b/po/sk.po
index 34959a390b..1ea9654a2c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2746,10 +2746,10 @@ msgstr "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktíva <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ byť nastavená v konfiguračnom "
+"Direktíva <code>$cfg['PmaAbsoluteUri']</code> MUSÍ byť nastavená v konfiguračnom "
 "súbore!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sl.po b/po/sl.po
index 7ceed6471d..8207bb3713 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2763,10 +2763,10 @@ msgstr "Ne morem naložiti privzete konfiguracije iz: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Ukaz <tt>$cfg['PmaAbsoluteUri']</tt> MORA biti določen v konfiguracijski "
+"Ukaz <code>$cfg['PmaAbsoluteUri']</code> MORA biti določen v konfiguracijski "
 "datoteki!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sq.po b/po/sq.po
index a4401f6eda..282b5e5b12 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -2919,10 +2919,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> DUHET të përcaktohet tek file i "
+"Direktiva <code>$cfg['PmaAbsoluteUri']</code> DUHET të përcaktohet tek file i "
 "konfigurimit!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sr.po b/po/sr.po
index 493c5102b5..233588ab1e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2960,10 +2960,10 @@ msgstr "Не могу да учитам подразумевану конфиг
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> директива МОРА бити подешена у "
+"<code>$cfg['PmaAbsoluteUri']</code> директива МОРА бити подешена у "
 "конфигурационој датотеци!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 0aa39244e2..b70a3c3bf9 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -2953,10 +2953,10 @@ msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podešena u "
+"<code>$cfg['PmaAbsoluteUri']</code> direktiva MORA biti podešena u "
 "konfiguracionoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sv.po b/po/sv.po
index 1733d9e156..9f566857fe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2751,10 +2751,10 @@ msgstr "Kunde inte ladda standardkonfiguration från: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Variabeln <tt>$cfg['PmaAbsoluteUri']</tt> direktivet MÅSTE anges i din "
+"Variabeln <code>$cfg['PmaAbsoluteUri']</code> direktivet MÅSTE anges i din "
 "konfigurationsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ta.po b/po/ta.po
index 546cfe0b81..6124b4856e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2743,7 +2743,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index db019a759c..f5681db8c2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2825,7 +2825,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 4964fe3c1c..f4f0daba14 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2690,9 +2690,9 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<b>ต้อง</b>กำหนดค่า <tt>$cfg['PmaAbsoluteUri']</tt> ในไฟล์คอนฟิกูเรชั่นเสียก่อน"
+msgstr "<b>ต้อง</b>กำหนดค่า <code>$cfg['PmaAbsoluteUri']</code> ในไฟล์คอนฟิกูเรชั่นเสียก่อน"
 
 #: libraries/common.inc.php:647
 #, php-format
@@ -12623,8 +12623,8 @@ msgstr "ขนาดบัฟเฟอร์ของ InnoDB"
 msgid "Your InnoDB buffer pool is fairly small."
 msgstr "ขนาดบัฟเฟอร์  InnoDB ของคุณมีขนาดเล็ก"
 
-# buffer pool แปลเป็น บัฟเฟอร์
-# non-InnoDB-Tables ใช้คำทับศัพท์
+# buffer pool แปลเป็น บัฟเฟอร์
+# non-InnoDB-Tables ใช้คำทับศัพท์
 #
 #: po/advisory_rules.php:267
 #, php-format
diff --git a/po/tk.po b/po/tk.po
index d2c3c077b7..a24865586b 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -2671,7 +2671,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 97e38567fc..2166f35211 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2756,10 +2756,10 @@ msgstr "Varsayılan yapılandırma bundan yüklenemedi: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> talimatı yapılandırma dosyanız içinde "
+"<code>$cfg['PmaAbsoluteUri']</code> talimatı yapılandırma dosyanız içinde "
 "AYARLANMAK zorundadır!"
 
 #: libraries/common.inc.php:647
diff --git a/po/tt.po b/po/tt.po
index 75a3ece388..aff12a49d5 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -2938,10 +2938,10 @@ msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ug.po b/po/ug.po
index 05f6ee5dcd..5de2aad6f8 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2871,9 +2871,9 @@ msgstr "تەڭشەك ئەندىزى %1$s كىرگۈزىلمىدى."
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<tt>$cfg['PmaAbsoluteUri']</tt> نى تەڭشەڭ !تەڭشەك ھۆججىتى ئىچىدىكى"
+msgstr "<code>$cfg['PmaAbsoluteUri']</code> نى تەڭشەڭ !تەڭشەك ھۆججىتى ئىچىدىكى"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/uk.po b/po/uk.po
index 4eeba56669..34d2bee2b1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2779,10 +2779,10 @@ msgstr "Неможливо завантажити стандартну функ
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Змінна <tt>$cfg['PmaAbsoluteUri']</tt> ПОВИННА бути встановлена у Вашому "
+"Змінна <code>$cfg['PmaAbsoluteUri']</code> ПОВИННА бути встановлена у Вашому "
 "конфігураційному файлі!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ur.po b/po/ur.po
index eef11b47b9..7c720e7b76 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -2866,10 +2866,10 @@ msgstr "طے شدہ تشکیلات کو لوڈ نہیں کرسکا: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> ہدایات آپ کے تشکیل مسل میں لازمی موجود ہوں!"
+"<code>$cfg['PmaAbsoluteUri']</code> ہدایات آپ کے تشکیل مسل میں لازمی موجود ہوں!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/uz.po b/po/uz.po
index e8d4f35376..2237ea34bc 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3012,10 +3012,10 @@ msgstr "\"%1$s\" файлидан андоза конфигурацияни юк
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> директиваси конфигурацион файлда созланиши "
+"<code>$cfg[\"PmaAbsoluteUrl\"]</code> директиваси конфигурацион файлда созланиши "
 "ШАРТ!"
 
 #: libraries/common.inc.php:647
diff --git a/po/uz@latin.po b/po/uz@latin.po
index 67140ddbe8..f832885d70 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3019,10 +3019,10 @@ msgstr "\"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi."
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> direktivasi konfiguratsion faylda "
+"<code>$cfg[\"PmaAbsoluteUrl\"]</code> direktivasi konfiguratsion faylda "
 "sozlanishi SHART!"
 
 #: libraries/common.inc.php:647
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08d763df65..dd132a3d6b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2705,9 +2705,9 @@ msgstr "无法加载默认配置: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "必须在您的配置文件中设置 <tt>$cfg['PmaAbsoluteUri']</tt> ！"
+msgstr "必须在您的配置文件中设置 <code>$cfg['PmaAbsoluteUri']</code> ！"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ee363c079f..98c313b556 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2820,9 +2820,9 @@ msgstr "無法載入預設設定: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "必須在您的設定檔案中設定 <tt>$cfg['PmaAbsoluteUri']</tt> ！"
+msgstr "必須在您的設定檔案中設定 <code>$cfg['PmaAbsoluteUri']</code> ！"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/server_privileges.php b/server_privileges.php
index d7c0a875c2..101503eddc 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -449,8 +449,8 @@ function PMA_displayColumnPrivs($columns, $row, $name_for_select,
 ) {
     echo '    <div class="item" id="div_item_' . $name . '">' . "\n"
        . '        <label for="select_' . $name . '_priv">' . "\n"
-       . '            <tt><dfn title="' . $name_for_dfn . '">'
-        . $priv_for_header . '</dfn></tt>' . "\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";
@@ -662,11 +662,11 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                 : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
 
             echo '            <label for="checkbox_' . $current_grant
-                . '"><tt><dfn title="'
+                . '"><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></tt></label>' . "\n"
+               . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
                . '        </div>' . "\n";
         } // end foreach ()
 
@@ -766,8 +766,8 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                     .                   ' value="Y" title="' . $priv[2] . '"'
                     .                   ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
                     .               '/>' . "\n"
-                    . '            <label for="checkbox_' . $priv[0] . '_priv"><tt><dfn title="' . $priv[2] . '">'
-                    .                    $priv[1] . '</dfn></tt></label>' . "\n"
+                    . '            <label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                    .                    $priv[1] . '</dfn></code></label>' . "\n"
                     . '        </div>' . "\n";
             }
             echo '    </fieldset>' . "\n";
@@ -779,26 +779,26 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                . '        <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"><tt><dfn title="'
-                . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></tt></label>' . "\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"><tt><dfn title="'
-                . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></tt></label>' . "\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"><tt><dfn title="'
-                . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></tt></label>' . "\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"><tt><dfn title="'
-                . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></tt></label>' . "\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"
@@ -1570,7 +1570,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
         };
 
         $new_user_string .= '</td>'."\n";
-        $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></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')) {
@@ -1708,8 +1708,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 // a automatic repair feature soon.
                 $raw = 'Your privilege table structure seems to be older than'
                     . ' this MySQL version!<br />'
-                    . 'Please run the <tt>mysql_upgrade</tt> command'
-                    . '(<tt>mysql_fix_privilege_tables</tt> on older systems)'
+                    . '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();
@@ -1856,9 +1856,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                             break;
                         } // end switch
                         echo '</td>' . "\n"
-                           . '            <td><tt>' . "\n"
+                           . '            <td><code>' . "\n"
                            . '                ' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
-                           . '                </tt></td>' . "\n"
+                           . '                </code></td>' . "\n"
                            . '            <td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
                            . '            <td align="center">';
                         printf($link_edit, urlencode($host['User']), urlencode($host['Host']), '', '');
@@ -2198,9 +2198,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
                     echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
                        . '    <td>' . htmlspecialchars((! isset($dbname)) ? $row['Db'] : $row['Table_name']) . '</td>' . "\n"
-                       . '    <td><tt>' . "\n"
+                       . '    <td><code>' . "\n"
                        . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
-                       . '        </tt></td>' . "\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'])) {
@@ -2489,14 +2489,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 } elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) {
                     $user_form .= __('database-specific');
                 } else {
-                    $user_form .= __('wildcard'). ': <tt>' . htmlspecialchars($current['Db']) . '</tt>';
+                    $user_form .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
                 }
                 $user_form .= "\n"
                    . '        </td>' . "\n"
                    . '        <td>' . "\n"
-                   . '            <tt>' . "\n"
+                   . '            <code>' . "\n"
                    . '                ' . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
-                   . '            </tt>' . "\n"
+                   . '            </code>' . "\n"
                    . '        </td>' . "\n"
                    . '        <td>' . "\n"
                    . '            ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n"
diff --git a/sql.php b/sql.php
index 95b28b0067..e196acdbad 100644
--- a/sql.php
+++ b/sql.php
@@ -384,7 +384,7 @@ if ($do_confirm) {
     <?php
     echo '<fieldset class="confirmation">' . "\n"
         .'    <legend>' . __('Do you really want to execute following query?') . '</legend>'
-        .'    <tt>' . htmlspecialchars($stripped_sql_query) . '</tt>' . "\n"
+        .'    <code>' . htmlspecialchars($stripped_sql_query) . '</code>' . "\n"
         .'</fieldset>' . "\n"
         .'<fieldset class="tblFooters">' . "\n";
     ?>
diff --git a/test/theme.php b/test/theme.php
index 7dc63e0e2f..c7d150a9db 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -201,7 +201,7 @@ echo sprintf(__('Welcome to %s'),
 
 <fieldset class="confirmation">
     <legend>Confirmation fieldset</legend>
-    <tt>QUERY TO EXECUTE;</tt>
+    <code>QUERY TO EXECUTE;</code>
 </fieldset>
 <fieldset class="tblFooters">
     <input type="submit" name="yes" value="YES" />

From c36a9113e0122bf022f823d3db917a855762ecbb Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 19:53:43 +0100
Subject: [PATCH 36/36] Replaced td[align] with td[class] due to HTML5

---
 db_printview.php                        | 26 +++++------
 db_qbe.php                              | 26 +++++------
 db_search.php                           |  8 ++--
 db_structure.php                        | 26 +++++------
 js/pmd/history.js                       |  6 +--
 js/server_status_monitor.js             |  4 +-
 libraries/auth/config.auth.lib.php      |  2 +-
 libraries/display_tbl.lib.php           | 26 +++++------
 libraries/relation.lib.php              |  8 ++--
 libraries/tbl_properties.inc.php        |  4 +-
 pmd_general.php                         | 62 ++++++++++++-------------
 server_binlog.php                       |  8 ++--
 server_collations.php                   |  2 +-
 server_export.php                       |  2 +-
 server_privileges.php                   |  4 +-
 sql.php                                 |  2 +-
 tbl_change.php                          | 14 +++---
 tbl_create.php                          |  2 +-
 tbl_printview.php                       | 26 +++++------
 tbl_relation.php                        |  2 +-
 tbl_structure.php                       | 24 +++++-----
 themes/original/css/theme_right.css.php | 12 +++++
 themes/pmahomme/css/theme_right.css.php | 12 +++++
 23 files changed, 166 insertions(+), 142 deletions(-)

diff --git a/db_printview.php b/db_printview.php
index 328a900576..70beda080a 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -130,7 +130,7 @@ if ($num_tables == 0) {
 
         if (isset($sts_data['TABLE_ROWS'])) {
             ?>
-    <td align="right">
+    <td class="right">
             <?php
             if ($merged_size) {
                 echo '<i>' . PMA_formatNumber($sts_data['TABLE_ROWS'], 0) . '</i>' . "\n";
@@ -148,14 +148,14 @@ if ($num_tables == 0) {
                 $sum_size += $tblsize;
                 list($formated_size, $unit) =  PMA_formatByteDown($tblsize, 3, 1);
                 ?>
-    <td align="right" nowrap="nowrap">
+    <td class="right" nowrap="nowrap">
         <?php echo $formated_size . ' ' . $unit; ?>
     </td>
                 <?php
             } // end if
         } else {
             ?>
-    <td colspan="3" align="center">
+    <td colspan="3" class="center">
         <?php echo __('in use'); ?>
     </td>
             <?php
@@ -181,8 +181,8 @@ if ($num_tables == 0) {
             if (! empty($sts_data['Create_time'])) {
                 ?>
                 <tr>
-                    <td align="right"><?php echo __('Creation') . ': '; ?></td>
-                    <td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
+                    <td class="right"><?php echo __('Creation') . ': '; ?></td>
+                    <td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
                 </tr>
                 <?php
             }
@@ -190,8 +190,8 @@ if ($num_tables == 0) {
             if (! empty($sts_data['Update_time'])) {
                 ?>
                 <tr>
-                    <td align="right"><?php echo __('Last update') . ': '; ?></td>
-                    <td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
+                    <td class="right"><?php echo __('Last update') . ': '; ?></td>
+                    <td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
                 </tr>
                 <?php
             }
@@ -199,8 +199,8 @@ if ($num_tables == 0) {
             if (! empty($sts_data['Check_time'])) {
                 ?>
                 <tr>
-                    <td align="right"><?php echo __('Last check') . ': '; ?></td>
-                    <td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
+                    <td class="right"><?php echo __('Last check') . ': '; ?></td>
+                    <td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
                 </tr>
                 <?php
             }
@@ -215,20 +215,20 @@ if ($num_tables == 0) {
     }
     ?>
 <tr>
-    <th align="center">
+    <th class="center">
         <?php echo sprintf(_ngettext('%s table', '%s tables', $num_tables), PMA_formatNumber($num_tables, 0)); ?>
     </th>
-    <th align="right" nowrap="nowrap">
+    <th class="right" nowrap="nowrap">
         <?php echo PMA_formatNumber($sum_entries, 0); ?>
     </th>
-    <th align="center">
+    <th class="center">
         --
     </th>
     <?php
     if ($cfg['ShowStats']) {
         list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1);
         ?>
-    <th align="right" nowrap="nowrap">
+    <th class="right" nowrap="nowrap">
         <?php echo $sum_formated . ' ' . $unit; ?>
     </th>
         <?php
diff --git a/db_qbe.php b/db_qbe.php
index c228aba978..e2ec414fe3 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -146,7 +146,7 @@ $realwidth = $form_column_width . 'ex';
 function showColumnSelectCell($columns, $column_number, $selected = '')
 {
     ?>
-    <td align="center">
+    <td class="center">
         <select name="Field[<?php echo $column_number; ?>]" size="1">
             <option value="">&nbsp;</option>
     <?php
@@ -225,7 +225,7 @@ $z = 0;
 for ($x = 0; $x < $col; $x++) {
     if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
         ?>
-    <td align="center">
+    <td class="center">
         <select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
             <option value="">&nbsp;</option>
             <option value="ASC"><?php echo __('Ascending'); ?></option>
@@ -241,7 +241,7 @@ for ($x = 0; $x < $col; $x++) {
         continue;
     }
     ?>
-    <td align="center">
+    <td class="center">
         <select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
             <option value="">&nbsp;</option>
     <?php
@@ -289,7 +289,7 @@ $z = 0;
 for ($x = 0; $x < $col; $x++) {
     if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
         ?>
-    <td align="center">
+    <td class="center">
         <input type="checkbox" name="Show[<?php echo $z; ?>]" />
     </td>
         <?php
@@ -307,7 +307,7 @@ for ($x = 0; $x < $col; $x++) {
         $checked     =  '';
     }
     ?>
-    <td align="center">
+    <td class="center">
         <input type="checkbox" name="Show[<?php echo $z; ?>]"<?php echo $checked; ?> />
     </td>
     <?php
@@ -325,7 +325,7 @@ $z = 0;
 for ($x = 0; $x < $col; $x++) {
     if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
         ?>
-    <td align="center">
+    <td class="center">
         <input type="text" name="criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
         <?php
@@ -346,7 +346,7 @@ for ($x = 0; $x < $col; $x++) {
         $curCriteria[$z]   = $prev_criteria[$x];
     }
     ?>
-    <td align="center">
+    <td class="center">
         <input type="hidden" name="prev_criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($curCriteria[$z]); ?>" />
         <input type="text" name="criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($tmp_criteria); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
@@ -405,7 +405,7 @@ for ($y = 0; $y <= $row; $y++) {
                 echo "\n";
                 $or = 'Or' . $w . '[' . $z . ']';
                 ?>
-    <td align="center">
+    <td class="center">
         <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
                 <?php
@@ -418,7 +418,7 @@ for ($y = 0; $y <= $row; $y++) {
             echo "\n";
             $or = 'Or' . $w . '[' . $z . ']';
             ?>
-    <td align="center">
+    <td class="center">
         <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
             <?php
@@ -485,7 +485,7 @@ for ($y = 0; $y <= $row; $y++) {
             echo "\n";
             $or = 'Or' . $w . '[' . $z . ']';
             ?>
-    <td align="center">
+    <td class="center">
         <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
             <?php
@@ -506,7 +506,7 @@ for ($y = 0; $y <= $row; $y++) {
             $tmp_or     = '';
         }
         ?>
-    <td align="center">
+    <td class="center">
         <input type="text" name="Or<?php echo $w . '[' . $z . ']'; ?>" value="<?php echo htmlspecialchars($tmp_or); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
     </td>
         <?php
@@ -540,7 +540,7 @@ for ($x = 0; $x < $col; $x++) {
             $chk['or']  = '';
         }
         ?>
-    <td align="center">
+    <td class="center">
         <strong><?php echo __('Or'); ?>:</strong>
         <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
         &nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
@@ -571,7 +571,7 @@ for ($x = 0; $x < $col; $x++) {
         $chk['or']  = '';
     }
     ?>
-    <td align="center">
+    <td class="center">
         <strong><?php echo __('Or'); ?>:</strong>
         <input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
         &nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
diff --git a/db_search.php b/db_search.php
index a669591b8a..c395425c86 100644
--- a/db_search.php
+++ b/db_search.php
@@ -278,7 +278,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
         <td><input type="text" name="search_str" size="60"
                 value="<?php echo $searched; ?>" /></td>
     </tr>
-    <tr><td align="right" valign="top">
+    <tr><td class="right" valign="top">
             <?php echo __('Find:'); ?></td>
             <td><?php
 
@@ -296,7 +296,7 @@ unset($choices);
             ?>
             </td>
     </tr>
-    <tr><td align="right" valign="top">
+    <tr><td class="right" valign="top">
             <?php echo __('Inside tables:'); ?></td>
         <td rowspan="2">
 <?php
@@ -323,10 +323,10 @@ $alter_select
 ?>
         </td>
     </tr>
-    <tr><td align="right" valign="bottom">
+    <tr><td class="right" valign="bottom">
             <?php echo $alter_select; ?></td>
     </tr>
-    <tr><td align="right">
+    <tr><td class="right">
             <?php echo __('Inside column:'); ?></td>
         <td><input type="text" name="field_str" size="60"
                 value="<?php echo ! empty($field_str) ? htmlspecialchars($field_str) : ''; ?>" /></td>
diff --git a/db_structure.php b/db_structure.php
index d1198eb9ca..a34e0282af 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -408,31 +408,31 @@ foreach ($tables as $keyname => $each_table) {
     }
     ?>
 <tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
-    <td align="center">
+    <td class="center">
         <input type="checkbox" name="selected_tbl[]"
             value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
             id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
     <th><?php echo $browse_table_label; ?>
         <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
     </th>
-   <?php if ($server_slave_status) { ?><td align="center"><?php
+   <?php if ($server_slave_status) { ?><td class="center"><?php
         echo $ignored
             ? PMA_getImage('s_cancel.png', 'NOT REPLICATED')
             : ''.
         $do
             ? PMA_getImage('s_success.png', 'REPLICATED')
             : ''; ?></td><?php } ?>
-    <td align="center"><?php echo $browse_table; ?></td>
-    <td align="center">
+    <td class="center"><?php echo $browse_table; ?></td>
+    <td class="center">
         <a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
             <?php echo $titles['Structure']; ?></a></td>
-    <td align="center"><?php echo $search_table; ?></td>
+    <td class="center"><?php echo $search_table; ?></td>
     <?php if (! $db_is_information_schema) { ?>
-    <td align="center" class="insert_table">
+    <td class="insert_table center">
         <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax"' : ''); ?> href="tbl_change.php?<?php echo $tbl_url_query; ?>">
             <?php echo $titles['Insert']; ?></a></td>
-    <td align="center"><?php echo $empty_table; ?></td>
-    <td align="center">
+    <td class="center"><?php echo $empty_table; ?></td>
+    <td class="center">
     <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query;
             ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php
             echo urlencode($drop_query); ?>&amp;message_to_show=<?php
@@ -497,7 +497,7 @@ foreach ($tables as $keyname => $each_table) {
         <?php } ?>
     <?php } else { ?>
     <td colspan="<?php echo ($colspan_for_structure - ($db_is_information_schema ? 5 : 8)) ?>"
-        align="center">
+        class="center">
         <?php echo __('in use'); ?></td>
     <?php } // end if (isset($each_table['TABLE_ROWS'])) else ?>
 </tr>
@@ -514,7 +514,7 @@ if ($is_show_stats) {
 </tbody>
 <tbody id="tbl_summary_row">
 <tr><th></th>
-    <th align="center" nowrap="nowrap" class="tbl_num">
+    <th nowrap="nowrap" class="tbl_num center">
         <?php
             echo sprintf(
                 _ngettext('%s table', '%s tables', $num_tables),
@@ -527,18 +527,18 @@ if ($is_show_stats) {
             echo '    <th>' . __('Replication') . '</th>' . "\n";
         }
     ?>
-    <th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" align="center">
+    <th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" class="center">
         <?php echo __('Sum'); ?></th>
     <th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th>
 <?php
 if (!($cfg['PropertiesNumColumns'] > 1)) {
     $default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1);
-    echo '    <th align="center">' . "\n"
+    echo '    <th class="center">' . "\n"
        . '        <dfn title="'
        . sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine)
        . '">' .$default_engine . '</dfn></th>' . "\n";
     // we got a case where $db_collation was empty
-    echo '    <th align="center">' . "\n";
+    echo '    <th class="center">' . "\n";
     if (! empty($db_collation)) {
         echo '        <dfn title="'
             . PMA_getCollationDescr($db_collation) . ' (' . __('Default') . ')">' . $db_collation
diff --git a/js/pmd/history.js b/js/pmd/history.js
index edace46c56..844cddbba9 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -73,12 +73,12 @@ function display(init,finit)
             else {
                str +='<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
             }
-            str +='<td style="padding-left: 5px;" align="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
+            str +='<td style="padding-left: 5px;" class="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
             if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
-                str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
+                str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
            }
            else {
-               str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i].               get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
+               str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i].               get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
            }
            i++;
            if(i >= history_array.length) {
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 15af4d1a27..56044f0744 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1581,7 +1581,7 @@ $(function() {
             $('div#logTable table tfoot tr')
                 .html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
                       PMA_messages['strSumRows'] + ' ' + rowSum + '<span style="float:right">' +
-                      PMA_messages['strTotal'] + '</span></th><th align="right">' + totalSum + '</th>');
+                      PMA_messages['strTotal'] + '</span></th><th class="right">' + totalSum + '</th>');
         }
     }
 
@@ -1658,7 +1658,7 @@ $(function() {
         $table.append('<tfoot>' +
                     '<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
                     ' ' + data.numRows + '<span style="float:right">' + PMA_messages['strTotal'] +
-                    '</span></th><th align="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
+                    '</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
 
         // Append a tooltip to the count column, if there exist one
         if ($('#logTable th:last').html() == '#') {
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index dcf9a15bb1..162d93f728 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -86,7 +86,7 @@ function PMA_auth_fails()
     <h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
 </center>
 <br />
-<table cellpadding="0" cellspacing="3" align="center" width="80%">
+<table cellpadding="0" cellspacing="3" style="margin: 0 auto" width="80%">
     <tr>
         <td>
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 73fbc1a373..98d9fe8943 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1146,7 +1146,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
  */
 function PMA_buildValueDisplay($class, $condition_field, $value)
 {
-    return '<td align="left"' . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $value . '</td>';
+    return '<td class="left ' . $class . ($condition_field ? ' condition' : '') . '">' . $value . '</td>';
 }
 
 /**
@@ -1556,15 +1556,15 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                 //       so use the $pointer
 
                 if (! isset($row[$i]) || is_null($row[$i])) {
-                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"');
+                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay('right '.$class, $condition_field, $meta, '');
                 } elseif ($row[$i] != '') {
 
                     $nowrap = ' nowrap';
                     $where_comparison = ' = ' . $row[$i];
 
-                    $vertical_display['data'][$row_no][$i]     = '<td align="right"' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
+                    $vertical_display['data'][$row_no][$i]     = '<td ' . PMA_prepare_row_data('right '.$class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
                 } else {
-                    $vertical_display['data'][$row_no][$i]     = PMA_buildEmptyDisplay($class, $condition_field, $meta, 'align="right"');
+                    $vertical_display['data'][$row_no][$i]     = PMA_buildEmptyDisplay('right '.$class, $condition_field, $meta, '');
                 }
 
             //  b l o b
@@ -2877,7 +2877,7 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla
         if (! empty($class)) {
             $ret .= 'class="' . $class . '"';
         }
-        $ret .= ' align="center">'
+        $ret .= ' class="center">'
            . '<input type="checkbox" id="id_rows_to_delete' . $row_no . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"'
            . ' class="multi_checkbox"'
            . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />'
@@ -2902,7 +2902,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
 {
     $ret = '';
     if (! empty($edit_url)) {
-        $ret .= '<td class="' . $class . '" align="center" ' . ' ><span class="nowrap">'
+        $ret .= '<td class="' . $class . ' center" ' . ' ><span class="nowrap">'
            . PMA_linkOrButton($edit_url, $edit_str, array(), false);
         /*
          * Where clause for selecting this row uniquely is provided as
@@ -2931,18 +2931,18 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
 {
     $ret = '';
     if (! empty($copy_url)) {
-        $ret .= '<td ';
+        $ret .= '<td class="';
         if (! empty($class)) {
-            $ret .= 'class="' . $class . '" ';
+            $ret .= $class . ' ';
         }
-        $ret .= 'align="center" ' . ' ><span class="nowrap">'
+        $ret .= 'center" ' . ' ><span class="nowrap">'
            . PMA_linkOrButton($copy_url, $copy_str, array(), false);
         /*
          * Where clause for selecting this row uniquely is provided as
          * a hidden input. Used by jQuery scripts for handling grid editing
          */
         if (! empty($where_clause)) {
-            $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
+            $ret .= '<input type="hidden" class="where_clause" value="' . $where_clause_html . '" />';
         }
         $ret .= '</span></td>';
     }
@@ -2963,11 +2963,11 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class)
 {
     $ret = '';
     if (! empty($del_url)) {
-        $ret .= '<td ';
+        $ret .= '<td class="';
         if (! empty($class)) {
-            $ret .= 'class="' . $class . '" ';
+            $ret .= $class . ' ';
         }
-        $ret .= 'align="center" ' . ' >'
+        $ret .= 'center" ' . ' >'
            . PMA_linkOrButton($del_url, $del_str, $js_conf, false)
            . '</td>';
     }
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 14e3f1087f..35c8381b5c 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -116,7 +116,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
     PMA_printDiagMessageForFeature(__('Browser transformation'), 'mimework', $messages);
 
     if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) {
-        echo '<tr><td colspan=2 align="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n";
+        echo '<tr><td colspan=2 class="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n";
     }
 
     PMA_printDiagMessageForParameter('bookmarktable', isset($cfgRelation['bookmark']), $messages, 'bookmark');
@@ -170,7 +170,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
  */
 function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true)
 {
-    echo '    <tr><td colspan=2 align="right">' . $feature_name . ': '
+    echo '    <tr><td colspan=2 class="right">' . $feature_name . ': '
          . ($GLOBALS['cfgRelation'][$relation_parameter] ? $messages['enabled'] : $messages['disabled'])
          . '</td></tr>' . "\n";
     if ($skip_line) {
@@ -190,8 +190,8 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes
  */
 function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor)
 {
-    echo '    <tr><th align="left">';
-    echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\']  ... </th><td align="right">';
+    echo '    <tr><th class="left">';
+    echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\']  ... </th><td class="right">';
     echo ($relation_parameter_set ? $messages['ok'] : sprintf($messages['error'], $doc_anchor)) . '</td></tr>' . "\n";
 }
 
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 9a20ce5406..8a30f2ef32 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -605,7 +605,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
         if (is_array($content_row)) {
             foreach ($content_row as $content_row_val) {
                 ?>
-    <td align="center"><?php echo $content_row_val; ?></td>
+    <td class="center"><?php echo $content_row_val; ?></td>
                 <?php
             }
         }
@@ -624,7 +624,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
 if ($display_type == 'horizontal') {
     $new_field = '';
     foreach ($empty_row as $content_row_val) {
-        $new_field .= '<td align="center">' . $content_row_val . '</td>';
+        $new_field .= '<td class="center">' . $content_row_val . '</td>';
     }
     ?>
 <script type="text/javascript">
diff --git a/pmd_general.php b/pmd_general.php
index b606a732de..e2b14b82c2 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -120,7 +120,7 @@ echo $script_tabs . $script_contr . $script_display_field;
   <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas>
 </div>
 <div id="layer_menu" style="display:none;">
-<div align="center" style="padding-top:5px;">
+<div class="center" style="padding-top:5px;">
     <a href="#"
         onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show all'); ?>" alt="v"
@@ -166,10 +166,10 @@ for ($i = 0; $i < $name_cnt; $i++) {
     </table>
 </div>
 
-<div align="center">
+<div class="center">
     <?php echo __('Number of tables') . ': ' . $name_cnt; ?>
 </div>
-<div align="right">
+<div class="right">
     <div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">
     </div>
 </div>
@@ -340,15 +340,15 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" class="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
+            <td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
         </tr>
         </thead>
         <tbody id="foreign_relation">
         <tr>
-        <td colspan="2" align="center" nowrap="nowrap"><strong>FOREIGN KEY</strong></td>
+        <td colspan="2" class="center" nowrap="nowrap"><strong>FOREIGN KEY</strong></td>
         </tr>
         <tr>
             <td width="58" nowrap="nowrap">on delete</td>
@@ -375,7 +375,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="New_relation()" />
                 <input type="button" class="butt" name="Button"
@@ -407,12 +407,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="100%" align="center" cellpadding="2" cellspacing="0">
+        <table width="100%" class="center" cellpadding="2" cellspacing="0">
         <tr>
-            <td colspan="3" align="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
+            <td colspan="3" class="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
         </tr>
         <tr>
-            <td colspan="3" align="center" nowrap="nowrap">
+            <td colspan="3" class="center" nowrap="nowrap">
                 <input name="Button" type="button" class="butt"
                     onclick="Upd_relation()" value="<?php echo __('Delete'); ?>" />
                 <input type="button" class="butt" name="Button"
@@ -442,14 +442,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" class="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
-            <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td>
+            <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" class="center"></td>
         </tr>
         </thead>
         <tbody id="where">
-        <tr><td align="center" nowrap="nowrap"><b>WHERE</b></td></tr>
+        <tr><td class="center" nowrap="nowrap"><b>WHERE</b></td></tr>
         <tr>
         <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
             <td width="102"><select name="rel_opt" id="rel_opt">
@@ -471,12 +471,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             <td><textarea id="Query" value="" cols="18"></textarea>
             </td>
         </tr>
-        <tr><td align="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
+        <tr><td class="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
         <tr>
         <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td>
             <td width="102"><input type="text" value="" id="new_name"/></td>
         </tr>
-        <tr><td align="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
+        <tr><td class="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
          <tr>
          <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
             <td width="102"><select name="operator" id="operator">
@@ -489,14 +489,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
                     </select>
            </td></tr>
            <tr>
-                <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td>
+                <td nowrap="nowrap" width="58" class="center"><b>GROUP BY</b></td>
                 <td><input type="checkbox" value="groupby" id="groupby"/></td>
            </tr>
            <tr>
-                <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td>
+                <td nowrap="nowrap" width="58" class="center"><b>ORDER BY</b></td>
                 <td><input type="checkbox" value="orderby" id="orderby"/></td>
            </tr>
-          <tr><td align="center" nowrap="nowrap"><b>HAVING</b></td></tr>
+          <tr><td class="center" nowrap="nowrap"><b>HAVING</b></td></tr>
           <tr>
           <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
             <td width="102"><select name="h_operator" id="h_operator">
@@ -532,7 +532,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="add_object()" />
                 <input type="button" class="butt" name="Button"
@@ -564,10 +564,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" class="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
-        <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
+        <td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
         </tr>
         </thead>
         <tbody id="rename_to">
@@ -580,7 +580,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="edit('Rename')" />
                 <input type="button" class="butt" name="Button"
@@ -612,10 +612,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" class="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
-          <td colspan="2" align="center" nowrap="nowrap"><strong>HAVING</strong></td>
+          <td colspan="2" class="center" nowrap="nowrap"><strong>HAVING</strong></td>
         </tr>
         </thead>
         <tbody id="rename_to">
@@ -656,7 +656,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
          </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="edit('Having')" />
                 <input type="button" class="butt" name="Button"
@@ -688,10 +688,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" class="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
-        <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
+        <td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
         </tr>
         </thead>
         <tbody>
@@ -710,7 +710,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" />
                 <input type="button" class="butt" name="Button"
@@ -742,10 +742,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" class="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
-          <td colspan="2" align="center" nowrap="nowrap"><strong>WHERE</strong></td>
+          <td colspan="2" class="center" nowrap="nowrap"><strong>WHERE</strong></td>
         </tr>
         </thead>
         <tbody id="rename_to">
@@ -773,7 +773,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
          </tbody>
         <tbody>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap">
+            <td colspan="2" class="center" nowrap="nowrap">
                 <input type="button" class="butt" name="Button"
                     value="<?php echo __('OK'); ?>" onclick="edit('Where')" />
                 <input type="button" class="butt" name="Button"
diff --git a/server_binlog.php b/server_binlog.php
index 7a2262044c..adfa9a39f1 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -120,7 +120,7 @@ PMA_showMessage(PMA_Message::success());
 <table cellpadding="2" cellspacing="1">
 <thead>
 <tr>
-    <td colspan="6" align="center">
+    <td colspan="6" class="center">
 <?php
 // we do not now how much rows are in the binlog
 // so we can just force 'NEXT' button
@@ -195,10 +195,10 @@ while ($value = PMA_DBI_fetch_assoc($result)) {
     ?>
 <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
     <td>&nbsp;<?php echo $value['Log_name']; ?>&nbsp;</td>
-    <td align="right">&nbsp;<?php echo $value['Pos']; ?>&nbsp;</td>
+    <td class="right">&nbsp;<?php echo $value['Pos']; ?>&nbsp;</td>
     <td>&nbsp;<?php echo $value['Event_type']; ?>&nbsp;</td>
-    <td align="right">&nbsp;<?php echo $value['Server_id']; ?>&nbsp;</td>
-    <td align="right">&nbsp;<?php echo isset($value['Orig_log_pos']) ? $value['Orig_log_pos'] : $value['End_log_pos']; ?>&nbsp;</td>
+    <td class="right">&nbsp;<?php echo $value['Server_id']; ?>&nbsp;</td>
+    <td class="right">&nbsp;<?php echo isset($value['Orig_log_pos']) ? $value['Orig_log_pos'] : $value['End_log_pos']; ?>&nbsp;</td>
     <td>&nbsp;<?php echo htmlspecialchars($value['Info']); ?>&nbsp;</td>
 </tr>
     <?php
diff --git a/server_collations.php b/server_collations.php
index 8c6c8c906d..b9510cfb5e 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -67,7 +67,7 @@ foreach ($mysql_charsets as $current_charset) {
            . '</tr>' . "\n";
     }
     $i++;
-    echo '<tr><th colspan="2" align="right">' . "\n"
+    echo '<tr><th colspan="2" class="right">' . "\n"
        . '        ' . htmlspecialchars($current_charset) . "\n"
        . (empty($mysql_charsets_descriptions[$current_charset])
             ? ''
diff --git a/server_export.php b/server_export.php
index 91c8841422..f915ac0c3e 100644
--- a/server_export.php
+++ b/server_export.php
@@ -22,7 +22,7 @@ $checkall_url = 'server_export.php?'
               . PMA_generate_common_url()
               . '&amp;goto=db_export.php';
 
-$multi_values = '<div align="left">';
+$multi_values = '<div style="text-align: left">';
 $multi_values .= '<a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'db_select[]\', true); return false;">' . __('Select All') . '</a>
         /
         <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'db_select[]\', false); return false;">' . __('Unselect All') . '</a><br />';
diff --git a/server_privileges.php b/server_privileges.php
index 101503eddc..18b30e17cd 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1860,10 +1860,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                            . '                ' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
                            . '                </code></td>' . "\n"
                            . '            <td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
-                           . '            <td align="center">';
+                           . '            <td class="center">';
                         printf($link_edit, urlencode($host['User']), urlencode($host['Host']), '', '');
                         echo '</td>';
-                        echo '<td align="center">';
+                        echo '<td class="center">';
                         printf($link_export, urlencode($host['User']), urlencode($host['Host']), (isset($initial) ? $initial : ''));
                         echo '</td>';
                         echo '</tr>';
diff --git a/sql.php b/sql.php
index e196acdbad..432fb141b5 100644
--- a/sql.php
+++ b/sql.php
@@ -937,7 +937,7 @@ $(document).ready(makeProfilingChart);
         foreach ($profiling_results as $one_result) {
             echo ' <tr>' .  "\n";
             echo '<td>' . ucwords($one_result['Status']) . '</td>' .  "\n";
-            echo '<td align="right">' . (PMA_formatNumber($one_result['Duration'], 3, 1)) . 's</td>' .  "\n";
+            echo '<td class="right">' . (PMA_formatNumber($one_result['Duration'], 3, 1)) . 's</td>' .  "\n";
             $chart_json[ucwords($one_result['Status'])] = $one_result['Duration'];
         }
 
diff --git a/tbl_change.php b/tbl_change.php
index d5059a7e78..e3e6272fcd 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -367,7 +367,7 @@ foreach ($rows as $row_id => $vrow) {
     </thead>
     <tfoot>
         <tr>
-            <th colspan="5" align="right" class="tblFooters">
+            <th colspan="5" class="tblFooters right">
                 <input type="submit" value="<?php echo __('Go'); ?>" />
             </th>
         </tr>
@@ -508,12 +508,12 @@ foreach ($rows as $row_id => $vrow) {
         }
         ?>
         <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
-            <td <?php echo ($cfg['LongtextDoubleTextarea'] && strstr($field['True_Type'], 'longtext') ? 'rowspan="2"' : ''); ?> align="center">
+            <td <?php echo ($cfg['LongtextDoubleTextarea'] && strstr($field['True_Type'], 'longtext') ? 'rowspan="2"' : ''); ?> class="center">
                 <?php echo $field['Field_title']; ?>
                 <input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/>
             </td>
 <?php if ($cfg['ShowFieldTypesInDataEditView']) { ?>
-             <td align="center"<?php echo $field['wrap']; ?>><span class="column_type"><?php echo $field['pma_type']; ?></span>
+             <td class="center"<?php echo $field['wrap']; ?>><span class="column_type"><?php echo $field['pma_type']; ?></span>
              </td>
 
          <?php } //End if
@@ -613,12 +613,12 @@ foreach ($rows as $row_id => $vrow) {
             if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload)
                 || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])
             ) {
-                echo '        <td align="center">' . __('Binary') . '</td>' . "\n";
+                echo '        <td class="center">' . __('Binary') . '</td>' . "\n";
             } elseif (strstr($field['True_Type'], 'enum')
                 || strstr($field['True_Type'], 'set')
                 || in_array($field['pma_type'], $no_support_types)
             ) {
-                echo '        <td align="center">--</td>' . "\n";
+                echo '        <td class="center">--</td>' . "\n";
             } else {
                 ?>
                 <td>
@@ -720,7 +720,7 @@ foreach ($rows as $row_id => $vrow) {
             &nbsp;</td>
         </tr>
         <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
-            <td colspan="5" align="right">
+            <td colspan="5" class="right">
                 <?php echo $backup_field . "\n"; ?>
                 <textarea name="fields<?php echo $field_name_appendix; ?>"
                     rows="<?php echo ($cfg['TextareaRows']*2); ?>"
@@ -1101,7 +1101,7 @@ if (isset($where_clause)) {
         <td>
 <?php echo PMA_showHint(__('Use TAB key to move from value to value, or CTRL+arrows to move anywhere')); ?>
         </td>
-        <td colspan="3" align="right" valign="middle">
+        <td colspan="3" class="right" valign="middle">
             <input type="submit" class="control_at_footer" value="<?php echo __('Go'); ?>" tabindex="<?php echo ($tabindex + $tabindex_for_value + 6); ?>" id="buttonYes" />
             <input type="reset" class="control_at_footer" value="<?php echo __('Reset'); ?>" tabindex="<?php echo ($tabindex + $tabindex_for_value + 7); ?>" />
         </td>
diff --git a/tbl_create.php b/tbl_create.php
index 39bbea75f7..40b6e5841d 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -269,7 +269,7 @@ if (isset($_REQUEST['do_save_data'])) {
            }
 
             $new_table_string = '<tr>' . "\n";
-            $new_table_string .= '<td align="center"> <input type="checkbox" id="checkbox_tbl_" name="selected_tbl[]" value="'.htmlspecialchars($table).'" /> </td>' . "\n";
+            $new_table_string .= '<td class="center"> <input type="checkbox" id="checkbox_tbl_" name="selected_tbl[]" value="'.htmlspecialchars($table).'" /> </td>' . "\n";
 
             $new_table_string .= '<th>';
             $new_table_string .= '<a href="sql.php' . PMA_generate_common_url($tbl_url_params) . '">'. $table . '</a>';
diff --git a/tbl_printview.php b/tbl_printview.php
index 79dd3d3173..7c5b5cf37d 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -270,11 +270,11 @@ foreach ($the_tables as $key => $table) {
             <table width="100%">
             <tr>
                 <th><?php echo __('Type'); ?></th>
-                <th colspan="2" align="center"><?php echo __('Usage'); ?></th>
+                <th colspan="2" class="center"><?php echo __('Usage'); ?></th>
             </tr>
             <tr>
                 <td style="padding-right: 10px"><?php echo __('Data'); ?></td>
-                <td align="right"><?php echo $data_size; ?></td>
+                <td class="right"><?php echo $data_size; ?></td>
                 <td><?php echo $data_unit; ?></td>
             </tr>
                 <?php
@@ -283,7 +283,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td style="padding-right: 10px"><?php echo __('Index'); ?></td>
-                <td align="right"><?php echo $index_size; ?></td>
+                <td class="right"><?php echo $index_size; ?></td>
                 <td><?php echo $index_unit; ?></td>
             </tr>
                     <?php
@@ -293,12 +293,12 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr style="color: #bb0000">
                 <td style="padding-right: 10px"><?php echo __('Overhead'); ?></td>
-                <td align="right"><?php echo $free_size; ?></td>
+                <td class="right"><?php echo $free_size; ?></td>
                 <td><?php echo $free_unit; ?></td>
             </tr>
             <tr>
                 <td style="padding-right: 10px"><?php echo __('Effective'); ?></td>
-                <td align="right"><?php echo $effect_size; ?></td>
+                <td class="right"><?php echo $effect_size; ?></td>
                 <td><?php echo $effect_unit; ?></td>
             </tr>
                     <?php
@@ -308,7 +308,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td style="padding-right: 10px"><?php echo __('Total'); ?></td>
-                <td align="right"><?php echo $tot_size; ?></td>
+                <td class="right"><?php echo $tot_size; ?></td>
                 <td><?php echo $tot_unit; ?></td>
             </tr>
                     <?php
@@ -326,7 +326,7 @@ foreach ($the_tables as $key => $table) {
             <table width="100%">
             <tr>
                 <th><?php echo __('Statements'); ?></th>
-                <th align="center"><?php echo __('Value'); ?></th>
+                <th class="center"><?php echo __('Value'); ?></th>
             </tr>
                 <?php
                 if (isset($showtable['Row_format'])) {
@@ -351,7 +351,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Rows'); ?></td>
-                <td align="right">
+                <td class="right">
                     <?php echo PMA_formatNumber($showtable['Rows'], 0) . "\n"; ?>
                 </td>
             </tr>
@@ -371,7 +371,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Row size'); ?>&nbsp;&oslash;</td>
-                <td align="right">
+                <td class="right">
                     <?php echo $avg_size . ' ' . $avg_unit . "\n"; ?>
                 </td>
             </tr>
@@ -381,7 +381,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Next autoindex'); ?></td>
-                <td align="right">
+                <td class="right">
                     <?php echo PMA_formatNumber($showtable['Auto_increment'], 0) . "\n"; ?>
                 </td>
             </tr>
@@ -391,7 +391,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Creation'); ?></td>
-                <td align="right">
+                <td class="right">
                     <?php echo PMA_localisedDate(strtotime($showtable['Create_time'])) . "\n"; ?>
                 </td>
             </tr>
@@ -401,7 +401,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Last update'); ?></td>
-                <td align="right">
+                <td class="right">
                     <?php echo PMA_localisedDate(strtotime($showtable['Update_time'])) . "\n"; ?>
                 </td>
             </tr>
@@ -411,7 +411,7 @@ foreach ($the_tables as $key => $table) {
                     ?>
             <tr>
                 <td><?php echo __('Last check'); ?></td>
-                <td align="right">
+                <td class="right">
                     <?php echo PMA_localisedDate(strtotime($showtable['Check_time'])) . "\n"; ?>
                 </td>
             </tr>
diff --git a/tbl_relation.php b/tbl_relation.php
index 8d90d1879f..3dd0e88cc5 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -417,7 +417,7 @@ if (count($columns) > 0) {
         $myfield_html = htmlspecialchars($myfield);
         ?>
     <tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
-        <td align="center">
+        <td class="center">
             <strong><?php echo $myfield_html; ?></strong>
             <input type="hidden" name="fields_name[<?php echo $myfield_md5; ?>]" value="<?php echo $myfield_html; ?>"/>
         </td>
diff --git a/tbl_structure.php b/tbl_structure.php
index fb01b8bbb3..15cb2ec6de 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -336,10 +336,10 @@ foreach ($fields as $row) {
     echo "\n";
     ?>
 <tr class="<?php echo $odd_row ? 'odd': 'even'; $odd_row = !$odd_row; ?>">
-    <td align="center">
+    <td class="center">
         <input type="checkbox" name="selected_fld[]" value="<?php echo htmlspecialchars($row['Field']); ?>" id="checkbox_row_<?php echo $rownum; ?>" <?php echo $checked; ?> />
     </td>
-    <td align="right">
+    <td class="right">
         <?php echo $rownum; ?>
     </td>
     <th nowrap="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
@@ -359,20 +359,20 @@ foreach ($fields as $row) {
         echo '<i>' . _pgettext('None for default', 'None') . '</i>';
     } ?></td>
     <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
-    <td align="center" class="browse">
+    <td class="browse center">
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote(__('Rows')) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">
             <?php echo $titles['BrowseDistinctValues']; ?></a>
     </td>
     <?php if (! $tbl_is_view && ! $db_is_information_schema) { ?>
-    <td align="center" class="edit">
+    <td class="edit center">
         <a href="tbl_alter.php?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>">
             <?php echo $titles['Change']; ?></a>
     </td>
-    <td align="center" class="drop">
+    <td class="drop center">
         <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="drop_column_anchor"' : ''); ?> href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&amp;dropped_column=<?php echo urlencode($row['Field']); ?>&amp;message_to_show=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" >
             <?php echo $titles['Drop']; ?></a>
     </td>
-    <td align="center" class="primary">
+    <td class="primary center">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || ($primary && $primary->hasColumn($field_name))) {
             echo $titles['NoPrimary'] . "\n";
@@ -387,7 +387,7 @@ foreach ($fields as $row) {
         echo "\n";
         ?>
     </td>
-    <td align="center" class="unique">
+    <td class="unique center">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || isset($columns_with_unique_index[$field_name])) {
             echo $titles['NoUnique'] . "\n";
@@ -402,7 +402,7 @@ foreach ($fields as $row) {
         echo "\n";
         ?>
     </td>
-    <td align="center" class="index">
+    <td class="index center">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoIndex'] . "\n";
@@ -418,7 +418,7 @@ foreach ($fields as $row) {
         echo "\n";
         ?>
     </td>
-    <td align="center" class="spatial">
+    <td class="spatial center">
         <?php
         $spatial_types = array(
             'geometry', 'point', 'linestring', 'polygon', 'multipoint',
@@ -444,7 +444,7 @@ foreach ($fields as $row) {
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
             echo "\n";
             ?>
-    <td align="center" nowrap="nowrap" class="fulltext">
+    <td nowrap="nowrap" class="fulltext center">
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['IdxFulltext']; ?></a>
             <?php $fulltext_enabled = true; ?>
@@ -453,7 +453,7 @@ foreach ($fields as $row) {
         } else {
             echo "\n";
         ?>
-    <td align="center" nowrap="nowrap" class="fulltext">
+    <td nowrap="nowrap" class="fulltext center">
         <?php echo $titles['NoIdxFulltext'] . "\n"; ?>
         <?php $fulltext_enabled = false; ?>
     </td>
@@ -811,7 +811,7 @@ if ($cfg['ShowStats']) {
         if (isset($free_size) && !PMA_DRIZZLE && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) {
             ?>
     <tr class="tblFooters">
-        <td colspan="3" align="center">
+        <td colspan="3" class="center">
             <a href="sql.php?<?php echo $url_query; ?>&pos=0&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php
             echo PMA_getIcon('b_tbloptimize.png', __('Optimize table'));
             ?></a>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 5b5dd1c058..d2f50e663f 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -155,6 +155,18 @@ button {
     margin-<?php echo $right; ?>: 1em;
 }
 
+th.left, td.left {
+    text-align: left;
+}
+
+th.center, td.center {
+    text-align: center;
+}
+
+th.right, td.right {
+    text-align: right;
+}
+
 .paddingtop {
     padding-top: 1em;
 }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 76cdc6c609..8ca74ecd23 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -351,6 +351,18 @@ select[multiple] {
     margin-<?php echo $right; ?>: 1em;
 }
 
+th.left, td.left {
+    text-align: left;
+}
+
+th.center, td.center {
+    text-align: center;
+}
+
+th.right, td.right {
+    text-align: right;
+}
+
 .paddingtop {
     padding-top: 1em;
 }