diff --git a/ChangeLog b/ChangeLog
index 319658a732..151e85f9e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
 - bug #3313235 [interface] Error div misplaced
+- bug #3374802 [interface] Comment on a column breaks inline editing
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
diff --git a/js/functions.js b/js/functions.js
index 0ab281a03d..169d37d325 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -211,9 +211,10 @@ function confirmLink(theLink, theSqlQuery)
     var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery);
     if (is_confirmed) {
         if ( $(theLink).hasClass('formLinkSubmit') ) {
-			var name = 'is_js_confirmed';
-            if($(theLink).attr('href').indexOf('usesubform') != -1)
-				name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]';
+            var name = 'is_js_confirmed';
+            if ($(theLink).attr('href').indexOf('usesubform') != -1) {
+                name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]';
+            }
 
             $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />');
         } else if ( typeof(theLink.href) != 'undefined' ) {
@@ -848,10 +849,11 @@ function insertValueQuery() {
         var chaineAj = "";
         var NbSelect = 0;
         for(var i=0; i<myListBox.options.length; i++) {
-            if (myListBox.options[i].selected){
+            if (myListBox.options[i].selected) {
                 NbSelect++;
-                if (NbSelect > 1)
+                if (NbSelect > 1) {
                     chaineAj += ", ";
+                }
                 chaineAj += myListBox.options[i].value;
             }
         }
@@ -1139,12 +1141,14 @@ function pdfPaperSize(format, axis) {
 function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_height)
 {
     // if width not specified, use default
-    if (w_width == undefined)
+    if (w_width == undefined) {
         w_width = 640;
+    }
 
     // if height not specified, use default
-    if (w_height == undefined)
+    if (w_height == undefined) {
         w_height = 480;
+    }
 
     // open popup window (for displaying video/playing audio)
     var mediaWin = window.open('bs_play_media.php?' + url_params + '&bs_reference=' + bs_ref + '&media_type=' + m_type + '&custom_type=' + is_cust_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0');
@@ -1161,15 +1165,17 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh
 function requestMIMETypeChange(db, table, reference, current_mime_type)
 {
     // no mime type specified, set to default (nothing)
-    if (undefined == current_mime_type)
+    if (undefined == current_mime_type) {
         current_mime_type = "";
+    }
 
     // prompt user for new mime type
     var new_mime_type = prompt("Enter custom MIME type", current_mime_type);
 
     // if new mime_type is specified and is not the same as the previous type, request for mime type change
-    if (new_mime_type && new_mime_type != current_mime_type)
+    if (new_mime_type && new_mime_type != current_mime_type) {
         changeMIMEType(db, table, reference, new_mime_type);
+    }
 }
 
 /**
@@ -1470,8 +1476,11 @@ function PMA_createChart(passedSettings) {
                                     return;
                                 }
 
-                                if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
-                                else diff = parseInt(curValue.x - lastValue.x);
+                                if (lastValue==null) {
+                                    diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
+                                } else {
+                                    diff = parseInt(curValue.x - lastValue.x);
+                                }
 
                                 thisChart.xAxis[0].setExtremes(
                                     thisChart.xAxis[0].getExtremes().min+diff,
@@ -1485,7 +1494,9 @@ function PMA_createChart(passedSettings) {
                                 numLoadedPoints++;
 
                                 // Timeout has been cleared => don't start a new timeout
-                                if(chart_activeTimeouts[container] == null) return;
+                                if (chart_activeTimeouts[container] == null) {
+                                    return;
+                                }
 
                                 chart_activeTimeouts[container] = setTimeout(
                                     thisChart.options.realtime.timeoutCallBack,
@@ -1537,11 +1548,13 @@ function PMA_createChart(passedSettings) {
 
     /* Set/Get realtime chart default values */
     if(passedSettings.realtime) {
-        if(!passedSettings.realtime.refreshRate)
+        if(!passedSettings.realtime.refreshRate) {
             passedSettings.realtime.refreshRate = 5000;
+        }
 
-        if(!passedSettings.realtime.numMaxPoints)
+        if(!passedSettings.realtime.numMaxPoints) {
             passedSettings.realtime.numMaxPoints = 30;
+        }
 
         // Allow custom POST vars to be added
         passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData);
@@ -1597,10 +1610,15 @@ function PMA_createProfilingChart(data, options) {
 
 // Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js
 function PMA_prettyProfilingNum(num, acc) {
-    if(!acc) acc = 1;
+    if (!acc) {
+        acc = 1;
+    }
     acc = Math.pow(10,acc);
-    if(num*1000 < 0.1) num = Math.round(acc*(num*1000*1000))/acc + 'µ'
-    else if(num < 0.1) num = Math.round(acc*(num*1000))/acc + 'm'
+    if (num*1000 < 0.1) {
+        num = Math.round(acc*(num*1000*1000))/acc + 'µ'
+    } else if (num < 0.1) {
+        num = Math.round(acc*(num*1000))/acc + 'm'
+    }
 
     return num + 's';
 }
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 61f5aa6936..d812262c0b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1182,7 +1182,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         // in the tools div, only display the Inline link when not in ajax
         // mode because 1) it currently does not work and 2) we would
         // have two similar mechanisms on the page for the same goal
-        if ($is_select || $GLOBALS['is_ajax_request'] === false) {
+        if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) {
         // see in js/functions.js the jQuery code attached to id inline_edit
         // document.write conflicts with jQuery, hence used $().append()
             echo "<script type=\"text/javascript\">\n" .
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 7b71748743..daa335fcf7 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -11,11 +11,11 @@
  * for formatting. Takes variable number of arguments.
  * Based on PMA_sanitize from sanitize.lib.php.
  *
- * @param  string  $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
- * @param  mixed   $args     arguments for sprintf
+ * @param  string  $lang_key  key in $GLOBALS WITHOUT 'strSetup' prefix
+ * @param  mixed   $args,...  arguments for sprintf
  * @return string
  */
-function PMA_lang($lang_key)
+function PMA_lang($lang_key, $args = null)
 {
     $message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key;
 
@@ -48,29 +48,4 @@ function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);
 }
-
-/**
- * Wraps link in &lt;a&gt; tags and replaces argument separator in internal links
- * to the one returned by PMA_get_arg_separator()
- *
- * @param string $link
- * @param string $text
- * @return string
- */
-function PMA_lang_link_replace($link, $text)
-{
-    static $separator;
-
-    if (!isset($separator)) {
-        $separator = PMA_get_arg_separator('html');
-    }
-
-    if (!preg_match('#^https?://#', $link)) {
-        $link = str_replace('&amp;', $separator, $link);
-    } else {
-        $link = PMA_linkURL($link);
-    }
-
-    return '<a href="' . $link . '">' . $text . '</a>';
-}
 ?>
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index 357eac06cb..b8b35d5a1c 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -42,188 +42,188 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
+    }
 
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        return true;
+    }
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs the content of a table in NHibernate format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $CG_FORMATS, $CG_HANDLERS, $what;
-    $format = $GLOBALS[$what . '_format'];
-    if (isset($CG_FORMATS[$format])) {
-        return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf));
+    /**
+     * Outputs the content of a table in NHibernate format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $CG_FORMATS, $CG_HANDLERS, $what;
+        $format = $GLOBALS[$what . '_format'];
+        if (isset($CG_FORMATS[$format])) {
+            return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf));
+        }
+        return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
     }
-    return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
-}
 
-/**
- *
- * @package phpMyAdmin-Export
- * @subpackage Codegen
- */
-class TableProperty
-{
-    public $name;
-    public $type;
-    public $nullable;
-    public $key;
-    public $defaultValue;
-    public $ext;
-    function __construct($row)
+    /**
+     *
+     * @package phpMyAdmin-Export
+     * @subpackage Codegen
+     */
+    class TableProperty
     {
-        $this->name = trim($row[0]);
-        $this->type = trim($row[1]);
-        $this->nullable = trim($row[2]);
-        $this->key = trim($row[3]);
-        $this->defaultValue = trim($row[4]);
-        $this->ext = trim($row[5]);
+        public $name;
+        public $type;
+        public $nullable;
+        public $key;
+        public $defaultValue;
+        public $ext;
+        function __construct($row)
+        {
+            $this->name = trim($row[0]);
+            $this->type = trim($row[1]);
+            $this->nullable = trim($row[2]);
+            $this->key = trim($row[3]);
+            $this->defaultValue = trim($row[4]);
+            $this->ext = trim($row[5]);
+        }
+        function getPureType()
+        {
+            $pos=strpos($this->type, "(");
+            if ($pos > 0)
+                return substr($this->type, 0, $pos);
+            return $this->type;
+        }
+        function isNotNull()
+        {
+            return $this->nullable == "NO" ? "true" : "false";
+        }
+        function isUnique()
+        {
+            return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
+        }
+        function getDotNetPrimitiveType()
+        {
+            if (strpos($this->type, "int") === 0) return "int";
+            if (strpos($this->type, "long") === 0) return "long";
+            if (strpos($this->type, "char") === 0) return "string";
+            if (strpos($this->type, "varchar") === 0) return "string";
+            if (strpos($this->type, "text") === 0) return "string";
+            if (strpos($this->type, "longtext") === 0) return "string";
+            if (strpos($this->type, "tinyint") === 0) return "bool";
+            if (strpos($this->type, "datetime") === 0) return "DateTime";
+            return "unknown";
+        }
+        function getDotNetObjectType()
+        {
+            if (strpos($this->type, "int") === 0) return "Int32";
+            if (strpos($this->type, "long") === 0) return "Long";
+            if (strpos($this->type, "char") === 0) return "String";
+            if (strpos($this->type, "varchar") === 0) return "String";
+            if (strpos($this->type, "text") === 0) return "String";
+            if (strpos($this->type, "longtext") === 0) return "String";
+            if (strpos($this->type, "tinyint") === 0) return "Boolean";
+            if (strpos($this->type, "datetime") === 0) return "DateTime";
+            return "Unknown";
+        }
+        function getIndexName()
+        {
+            if (strlen($this->key)>0)
+                return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
+            return "";
+        }
+        function isPK()
+        {
+            return $this->key=="PRI";
+        }
+        function formatCs($text)
+        {
+            $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text);
+            return $this->format($text);
+        }
+        function formatXml($text)
+        {
+            $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text);
+            $text=str_replace("#indexName#", $this->getIndexName(), $text);
+            return $this->format($text);
+        }
+        function format($text)
+        {
+            $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text);
+            $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
+            $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
+            $text=str_replace("#type#", $this->getPureType(), $text);
+            $text=str_replace("#notNull#", $this->isNotNull(), $text);
+            $text=str_replace("#unique#", $this->isUnique(), $text);
+            return $text;
+        }
     }
-    function getPureType()
-    {
-        $pos=strpos($this->type, "(");
-        if ($pos > 0)
-            return substr($this->type, 0, $pos);
-        return $this->type;
-    }
-    function isNotNull()
-    {
-        return $this->nullable == "NO" ? "true" : "false";
-    }
-    function isUnique()
-    {
-        return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
-    }
-    function getDotNetPrimitiveType()
-    {
-        if (strpos($this->type, "int") === 0) return "int";
-        if (strpos($this->type, "long") === 0) return "long";
-        if (strpos($this->type, "char") === 0) return "string";
-        if (strpos($this->type, "varchar") === 0) return "string";
-        if (strpos($this->type, "text") === 0) return "string";
-        if (strpos($this->type, "longtext") === 0) return "string";
-        if (strpos($this->type, "tinyint") === 0) return "bool";
-        if (strpos($this->type, "datetime") === 0) return "DateTime";
-        return "unknown";
-    }
-    function getDotNetObjectType()
-    {
-        if (strpos($this->type, "int") === 0) return "Int32";
-        if (strpos($this->type, "long") === 0) return "Long";
-        if (strpos($this->type, "char") === 0) return "String";
-        if (strpos($this->type, "varchar") === 0) return "String";
-        if (strpos($this->type, "text") === 0) return "String";
-        if (strpos($this->type, "longtext") === 0) return "String";
-        if (strpos($this->type, "tinyint") === 0) return "Boolean";
-        if (strpos($this->type, "datetime") === 0) return "DateTime";
-        return "Unknown";
-    }
-    function getIndexName()
-    {
-        if (strlen($this->key)>0)
-            return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
-        return "";
-    }
-    function isPK()
-    {
-        return $this->key=="PRI";
-    }
-    function formatCs($text)
-    {
-        $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text);
-        return $this->format($text);
-    }
-    function formatXml($text)
-    {
-        $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text);
-        $text=str_replace("#indexName#", $this->getIndexName(), $text);
-        return $this->format($text);
-    }
-    function format($text)
-    {
-        $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text);
-        $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
-        $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
-        $text=str_replace("#type#", $this->getPureType(), $text);
-        $text=str_replace("#notNull#", $this->isNotNull(), $text);
-        $text=str_replace("#unique#", $this->isUnique(), $text);
-        return $text;
-    }
-}
 
     function cgMakeIdentifier($str, $ucfirst = true)
     {
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 19ca57335b..8b04841ba1 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -35,189 +35,189 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $what;
-    global $csv_terminated;
-    global $csv_separator;
-    global $csv_enclosed;
-    global $csv_escaped;
-
-    // Here we just prepare some values for export
-    if ($what == 'excel') {
-        $csv_terminated      = "\015\012";
-        switch($GLOBALS['excel_edition']) {
-        case 'win':
-            // as tested on Windows with Excel 2002 and Excel 2007
-            $csv_separator = ';';
-            break;
-        case 'mac_excel2003':
-            $csv_separator = ';';
-            break;
-        case 'mac_excel2008':
-            $csv_separator = ',';
-            break;
-        }
-        $csv_enclosed           = '"';
-        $csv_escaped            = '"';
-        if (isset($GLOBALS['excel_columns'])) {
-            $GLOBALS['csv_columns'] = 'yes';
-        }
-    } else {
-        if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
-            $csv_terminated  = $GLOBALS['crlf'];
-        } else {
-            $csv_terminated  = str_replace('\\r', "\015", $csv_terminated);
-            $csv_terminated  = str_replace('\\n', "\012", $csv_terminated);
-            $csv_terminated  = str_replace('\\t', "\011", $csv_terminated);
-        } // end if
-        $csv_separator          = str_replace('\\t', "\011", $csv_separator);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
-    return true;
-}
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $what;
+        global $csv_terminated;
+        global $csv_separator;
+        global $csv_enclosed;
+        global $csv_escaped;
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in CSV format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-    global $csv_terminated;
-    global $csv_separator;
-    global $csv_enclosed;
-    global $csv_escaped;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-
-    // If required, get fields name at the first line
-    if (isset($GLOBALS['csv_columns'])) {
-        $schema_insert = '';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            if ($csv_enclosed == '') {
-                $schema_insert .= stripslashes(PMA_DBI_field_name($result, $i));
-            } else {
-                $schema_insert .= $csv_enclosed
-                               . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, stripslashes(PMA_DBI_field_name($result, $i)))
-                               . $csv_enclosed;
+        // Here we just prepare some values for export
+        if ($what == 'excel') {
+            $csv_terminated      = "\015\012";
+            switch($GLOBALS['excel_edition']) {
+            case 'win':
+                // as tested on Windows with Excel 2002 and Excel 2007
+                $csv_separator = ';';
+                break;
+            case 'mac_excel2003':
+                $csv_separator = ';';
+                break;
+            case 'mac_excel2008':
+                $csv_separator = ',';
+                break;
             }
-            $schema_insert     .= $csv_separator;
-        } // end for
-        $schema_insert  =trim(substr($schema_insert, 0, -1));
-        if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-            return false;
+            $csv_enclosed           = '"';
+            $csv_escaped            = '"';
+            if (isset($GLOBALS['excel_columns'])) {
+                $GLOBALS['csv_columns'] = 'yes';
+            }
+        } else {
+            if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
+                $csv_terminated  = $GLOBALS['crlf'];
+            } else {
+                $csv_terminated  = str_replace('\\r', "\015", $csv_terminated);
+                $csv_terminated  = str_replace('\\n', "\012", $csv_terminated);
+                $csv_terminated  = str_replace('\\t', "\011", $csv_terminated);
+            } // end if
+            $csv_separator          = str_replace('\\t', "\011", $csv_separator);
         }
-    } // end if
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $schema_insert = '';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
-                $schema_insert .= $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                // always enclose fields
-                if ($what == 'excel') {
-                    $row[$j]       = preg_replace("/\015(\012)?/", "\012", $row[$j]);
-                }
-                // remove CRLF characters within field
-                if (isset($GLOBALS[$what . '_removeCRLF']) && $GLOBALS[$what . '_removeCRLF']) {
-                    $row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j]));
-                }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in CSV format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+        global $csv_terminated;
+        global $csv_separator;
+        global $csv_enclosed;
+        global $csv_escaped;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['csv_columns'])) {
+            $schema_insert = '';
+            for ($i = 0; $i < $fields_cnt; $i++) {
                 if ($csv_enclosed == '') {
-                    $schema_insert .= $row[$j];
+                    $schema_insert .= stripslashes(PMA_DBI_field_name($result, $i));
                 } else {
-                    // also double the escape string if found in the data
-                    if ('csv' == $what) {
-                        $schema_insert .= $csv_enclosed
-                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
+                    $schema_insert .= $csv_enclosed
+                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, stripslashes(PMA_DBI_field_name($result, $i)))
                                    . $csv_enclosed;
-                    } else {
-                        // for excel, avoid a problem when a field contains
-                        // double quotes
-                        $schema_insert .= $csv_enclosed
-                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
-                                   . $csv_enclosed;
-                    }
                 }
-            } else {
-                $schema_insert .= '';
+                $schema_insert     .= $csv_separator;
+            } // end for
+            $schema_insert  =trim(substr($schema_insert, 0, -1));
+            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
+                return false;
             }
-            if ($j < $fields_cnt-1) {
-                $schema_insert .= $csv_separator;
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $schema_insert = '';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $schema_insert .= $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    // always enclose fields
+                    if ($what == 'excel') {
+                        $row[$j]       = preg_replace("/\015(\012)?/", "\012", $row[$j]);
+                    }
+                    // remove CRLF characters within field
+                    if (isset($GLOBALS[$what . '_removeCRLF']) && $GLOBALS[$what . '_removeCRLF']) {
+                        $row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j]));
+                    }
+                    if ($csv_enclosed == '') {
+                        $schema_insert .= $row[$j];
+                    } else {
+                        // also double the escape string if found in the data
+                        if ('csv' == $what) {
+                            $schema_insert .= $csv_enclosed
+                                       . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
+                                       . $csv_enclosed;
+                        } else {
+                            // for excel, avoid a problem when a field contains
+                            // double quotes
+                            $schema_insert .= $csv_enclosed
+                                       . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
+                                       . $csv_enclosed;
+                        }
+                    }
+                } else {
+                    $schema_insert .= '';
+                }
+                if ($j < $fields_cnt-1) {
+                    $schema_insert .= $csv_separator;
+                }
+            } // end for
+
+            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
+                return false;
             }
-        } // end for
+        } // end while
+        PMA_DBI_free_result($result);
 
-        if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-            return false;
-        }
-    } // end while
-    PMA_DBI_free_result($result);
-
-    return true;
-} // end of the 'PMA_getTableCsv()' function
+        return true;
+    } // end of the 'PMA_getTableCsv()' function
 
 }
 ?>
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 6604ac6e7e..707bc7714c 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -34,321 +34,321 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return PMA_exportOutputHandler('</body></html>');
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $charset_of_file;
-    return PMA_exportOutputHandler('<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:x="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-    <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" />
-</head>
-<body>');
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . htmlspecialchars($db) . '</h1>');
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in HTML (Microsoft Word) format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $what;
-
-    if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
-        return false;
-    }
-    if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
-        return false;
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return PMA_exportOutputHandler('</body></html>');
     }
 
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $charset_of_file;
+        return PMA_exportOutputHandler('<html xmlns:o="urn:schemas-microsoft-com:office:office"
+    xmlns:x="urn:schemas-microsoft-com:office:word"
+    xmlns="http://www.w3.org/TR/REC-html40">
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS['htmlword_columns'])) {
-        $schema_insert = '<tr class="print-category">';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</b></td>';
-        } // end for
-        $schema_insert .= '</tr>';
-        if (! PMA_exportOutputHandler($schema_insert)) {
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html>
+    <head>
+        <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" />
+    </head>
+    <body>');
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . htmlspecialchars($db) . '</h1>');
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in HTML (Microsoft Word) format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $what;
+
+        if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
+            return false;
+        }
+        if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
             return false;
         }
-    } // end if
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $schema_insert = '<tr class="print-category">';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (! isset($row[$j]) || is_null($row[$j])) {
-                $value = $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                $value = $row[$j];
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['htmlword_columns'])) {
+            $schema_insert = '<tr class="print-category">';
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $schema_insert .= '<td class="print"><b>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</b></td>';
+            } // end for
+            $schema_insert .= '</tr>';
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $schema_insert = '<tr class="print-category">';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (! isset($row[$j]) || is_null($row[$j])) {
+                    $value = $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    $value = $row[$j];
+                } else {
+                    $value = '';
+                }
+                $schema_insert .= '<td class="print">' . htmlspecialchars($value) . '</td>';
+            } // end for
+            $schema_insert .= '</tr>';
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end while
+        PMA_DBI_free_result($result);
+        if (! PMA_exportOutputHandler('</table>')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
+            return false;
+        }
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && ! empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $value = '';
+                $have_rel = false;
             }
-            $schema_insert .= '<td class="print">' . htmlspecialchars($value) . '</td>';
-        } // end for
-        $schema_insert .= '</tr>';
-        if (! PMA_exportOutputHandler($schema_insert)) {
+        } else {
+               $have_rel = false;
+        } // end if
+
+        /**
+         * Displays the table structure
+         */
+        if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
             return false;
         }
-    } // end while
-    PMA_DBI_free_result($result);
-    if (! PMA_exportOutputHandler('</table>')) {
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
-        return false;
-    }
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && ! empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
-        return false;
-    }
-
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments && $cfgRelation['commwork']) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-
-    $schema_insert = '<tr class="print-category">';
-    $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
-    if ($do_relation && $have_rel) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
-    }
-    if ($do_comments) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars('MIME') . '</b></td>';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $schema_insert .= '</tr>';
-
-    if (! PMA_exportOutputHandler($schema_insert)) {
-        return false;
-    }
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $schema_insert = '<tr class="print-category">';
-        $type          = $column['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $attribute     = '&nbsp;';
-        if ($binary) {
-            $attribute = 'BINARY';
-        }
-        if ($unsigned) {
-            $attribute = 'UNSIGNED';
-        }
-        if ($zerofill) {
-            $attribute = 'UNSIGNED ZEROFILL';
-        }
-        if (! isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '<b>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</b>';
-        }
-        if ($column['Key'] == 'PRI') {
-            $fmt_pre = '<i>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</i>';
-        }
-        $schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
-
-        $field_name = $column['Field'];
 
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            $schema_insert .= '<td class="print">' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '') . '</td>';
+            $columns_cnt++;
         }
         if ($do_comments && $cfgRelation['commwork']) {
-            $schema_insert .= '<td class="print">' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '') . '</td>';
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $schema_insert .= '<td class="print">' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '') . '</td>';
+            $columns_cnt++;
         }
 
+        $schema_insert = '<tr class="print-category">';
+        $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
+        if ($do_relation && $have_rel) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
+        }
+        if ($do_comments) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars('MIME') . '</b></td>';
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
         $schema_insert .= '</tr>';
 
         if (! PMA_exportOutputHandler($schema_insert)) {
             return false;
         }
-    } // end while
 
-    return PMA_exportOutputHandler('</table>');
-}
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $schema_insert = '<tr class="print-category">';
+            $type          = $column['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $attribute     = '&nbsp;';
+            if ($binary) {
+                $attribute = 'BINARY';
+            }
+            if ($unsigned) {
+                $attribute = 'UNSIGNED';
+            }
+            if ($zerofill) {
+                $attribute = 'UNSIGNED ZEROFILL';
+            }
+            if (! isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                }
+            }
+
+            $fmt_pre = '';
+            $fmt_post = '';
+            if (in_array($column['Field'], $unique_keys)) {
+                $fmt_pre = '<b>' . $fmt_pre;
+                $fmt_post = $fmt_post . '</b>';
+            }
+            if ($column['Key'] == 'PRI') {
+                $fmt_pre = '<i>' . $fmt_pre;
+                $fmt_post = $fmt_post . '</i>';
+            }
+            $schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
+
+            $field_name = $column['Field'];
+
+            if ($do_relation && $have_rel) {
+                $schema_insert .= '<td class="print">' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '') . '</td>';
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $schema_insert .= '<td class="print">' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '') . '</td>';
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $schema_insert .= '<td class="print">' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '') . '</td>';
+            }
+
+            $schema_insert .= '</tr>';
+
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end while
+
+        return PMA_exportOutputHandler('</table>');
+    }
 
 }
 ?>
diff --git a/libraries/export/json.php b/libraries/export/json.php
index e008f0cd61..860d640caa 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -30,144 +30,144 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler(
-        '/**' . $GLOBALS['crlf']
-        . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf']
-        . ' @version 0.1' . $GLOBALS['crlf']
-        . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-    );
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    PMA_exportOutputHandler('// Database \'' . $db . '\'' . $GLOBALS['crlf'] );
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table in JSON format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler(
+            '/**' . $GLOBALS['crlf']
+            . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf']
+            . ' @version 0.1' . $GLOBALS['crlf']
+            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
+        );
+        return true;
+    }
 
-        $record_cnt++;
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        PMA_exportOutputHandler('// Database \'' . $db . '\'' . $GLOBALS['crlf'] );
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer .= '// ' . $db . '.' . $table . $crlf . $crlf;
-            $buffer .= '[{';
-        } else {
-            $buffer .= ', {';
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in JSON format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+        }
+        unset($i);
 
-            $isLastLine = ($i + 1 >= $columns_cnt);
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
 
-            $column = $columns[$i];
+            $record_cnt++;
 
-            if (is_null($record[$i])) {
-                $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : '');
-            } elseif (is_numeric($record[$i])) {
-                $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : '');
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer .= '// ' . $db . '.' . $table . $crlf . $crlf;
+                $buffer .= '[{';
             } else {
-                $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : '');
+                $buffer .= ', {';
             }
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+
+                $isLastLine = ($i + 1 >= $columns_cnt);
+
+                $column = $columns[$i];
+
+                if (is_null($record[$i])) {
+                    $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : '');
+                } elseif (is_numeric($record[$i])) {
+                    $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : '');
+                } else {
+                    $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : '');
+                }
+            }
+
+            $buffer .= '}';
         }
 
-        $buffer .= '}';
-    }
+        if ($record_cnt) {
+            $buffer .=  ']';
+        }
+        if (! PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
 
-    if ($record_cnt) {
-        $buffer .=  ']';
-    }
-    if (! PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
+        PMA_DBI_free_result($result);
 
-    PMA_DBI_free_result($result);
-
-    return true;
-}
+        return true;
+    }
 
 }
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 080d0acaf9..1c6064aecc 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -82,389 +82,389 @@ if (isset($plugin_list)) {
         array('type' => 'end_group');
 } else {
 
-/**
- * Escapes some special characters for use in TeX/LaTeX
- *
- * @param string      the string to convert
- *
- * @return  string      the converted string with escape codes
- *
- * @access  private
- */
-function PMA_texEscape($string) {
-    $escape = array('$', '%', '{', '}',  '&',  '#', '_', '^');
-    $cnt_escape = count($escape);
-    for ($k=0; $k < $cnt_escape; $k++) {
-        $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
-    }
-    return $string;
-}
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $crlf;
-    global $cfg;
-
-    $head  =  '% phpMyAdmin LaTeX Dump' . $crlf
-           .  '% version ' . PMA_VERSION . $crlf
-           .  '% http://www.phpmyadmin.net' . $crlf
-           .  '%' . $crlf
-           .  '% ' . __('Host') . ': ' . $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-         $head .= ':' . $cfg['Server']['port'];
-    }
-    $head .= $crlf
-           .  '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
-           .  '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
-           .  '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    global $crlf;
-    $head = '% ' . $crlf
-          . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
-          . '% ' . $crlf;
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in LaTeX table/sideways table environment
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    $result      = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = PMA_DBI_field_name($result, $i);
-    }
-    unset($i);
-
-    $buffer      = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf
-                 . ' \\begin{longtable}{|';
-
-    for ($index=0;$index<$columns_cnt;$index++) {
-       $buffer .= 'l|';
-    }
-    $buffer .= '} ' . $crlf ;
-
-    $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
-    }
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    // show column names
-    if (isset($GLOBALS['latex_columns'])) {
-        $buffer = '\\hline ';
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & ';
-          }
-
-        $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
-        if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) {
-            return false;
+    /**
+     * Escapes some special characters for use in TeX/LaTeX
+     *
+     * @param string      the string to convert
+     *
+     * @return  string      the converted string with escape codes
+     *
+     * @access  private
+     */
+    function PMA_texEscape($string) {
+        $escape = array('$', '%', '{', '}',  '&',  '#', '_', '^');
+        $cnt_escape = count($escape);
+        for ($k=0; $k < $cnt_escape; $k++) {
+            $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
         }
+        return $string;
+    }
+
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
+    }
+
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $crlf;
+        global $cfg;
+
+        $head  =  '% phpMyAdmin LaTeX Dump' . $crlf
+               .  '% version ' . PMA_VERSION . $crlf
+               .  '% http://www.phpmyadmin.net' . $crlf
+               .  '%' . $crlf
+               .  '% ' . __('Host') . ': ' . $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+             $head .= ':' . $cfg['Server']['port'];
+        }
+        $head .= $crlf
+               .  '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
+               .  '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
+               .  '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        global $crlf;
+        $head = '% ' . $crlf
+              . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+              . '% ' . $crlf;
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in LaTeX table/sideways table environment
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        $result      = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
+        for ($i = 0; $i < $columns_cnt; $i++) {
+            $columns[$i] = PMA_DBI_field_name($result, $i);
+        }
+        unset($i);
+
+        $buffer      = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf
+                     . ' \\begin{longtable}{|';
+
+        for ($index=0;$index<$columns_cnt;$index++) {
+           $buffer .= 'l|';
+        }
+        $buffer .= '} ' . $crlf ;
+
+        $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
         if (isset($GLOBALS['latex_caption'])) {
-            if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false;
+            $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
         }
-        if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
-            return false;
-        }
-    } else {
-        if (!PMA_exportOutputHandler('\\\\ \hline')) {
-            return false;
-        }
-    }
-
-    // print the whole table
-    while ($record = PMA_DBI_fetch_assoc($result)) {
-
-        $buffer = '';
-        // print each row
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            if (isset($record[$columns[$i]])
-             && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) {
-                $column_value = PMA_texEscape(stripslashes($record[$columns[$i]]));
-            } else {
-                $column_value = $GLOBALS['latex_null'];
-            }
-
-            // last column ... no need for & character
-            if ($i == ($columns_cnt - 1)) {
-                $buffer .= $column_value;
-            } else {
-                $buffer .= $column_value . " & ";
-            }
-        }
-        $buffer .= ' \\\\ \\hline ' . $crlf;
         if (!PMA_exportOutputHandler($buffer)) {
             return false;
         }
-    }
 
-    $buffer = ' \\end{longtable}' . $crlf;
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
+        // show column names
+        if (isset($GLOBALS['latex_columns'])) {
+            $buffer = '\\hline ';
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & ';
+              }
 
-    PMA_DBI_free_result($result);
-    return true;
-
-} // end getTableLaTeX
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    $buffer      = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table  . $crlf . '%' . $crlf
-                 . ' \\begin{longtable}{';
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    $columns_cnt = 4;
-    $alignment = '|l|c|c|c|';
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-        $alignment .= 'l|';
-    }
-    if ($do_comments) {
-        $columns_cnt++;
-        $alignment .= 'l|';
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-        $alignment .='l|';
-    }
-    $buffer = $alignment . '} ' . $crlf ;
-
-    $header = ' \\hline ';
-    $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
-    if ($do_relation && $have_rel) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
-    }
-    if ($do_comments) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{MIME}}';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-
-    // Table caption for first page and label
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
-                   . '} \\\\' . $crlf;
-    }
-    $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
-    // Table caption on next pages
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\\\ ' . $crlf;
-    }
-    $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
-
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    $fields = PMA_DBI_get_columns($db, $table);
-    foreach ($fields as $row) {
-        $type             = $row['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
+            $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
+            if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) {
+                return false;
             }
-
-            $binary       = preg_match('/BINARY/i', $row['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $row['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $row['Type']);
-        }
-        if (!isset($row['Default'])) {
-            if ($row['Null'] != 'NO') {
-                $row['Default'] = 'NULL';
+            if (isset($GLOBALS['latex_caption'])) {
+                if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false;
+            }
+            if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
+                return false;
+            }
+        } else {
+            if (!PMA_exportOutputHandler('\\\\ \hline')) {
+                return false;
             }
         }
 
-        $field_name = $row['Field'];
+        // print the whole table
+        while ($record = PMA_DBI_fetch_assoc($result)) {
 
-        $local_buffer = $field_name . "\000" . $type . "\000"
-            . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
-            . "\000" . (isset($row['Default']) ? $row['Default'] : '');
+            $buffer = '';
+            // print each row
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                if (isset($record[$columns[$i]])
+                 && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) {
+                    $column_value = PMA_texEscape(stripslashes($record[$columns[$i]]));
+                } else {
+                    $column_value = $GLOBALS['latex_null'];
+                }
 
+                // last column ... no need for & character
+                if ($i == ($columns_cnt - 1)) {
+                    $buffer .= $column_value;
+                } else {
+                    $buffer .= $column_value . " & ";
+                }
+            }
+            $buffer .= ' \\\\ \\hline ' . $crlf;
+            if (!PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
+        }
+
+        $buffer = ' \\end{longtable}' . $crlf;
+        if (!PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        PMA_DBI_free_result($result);
+        return true;
+
+    } // end getTableLaTeX
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
+            } else {
+                $have_rel = false;
+            }
+        } else {
+               $have_rel = false;
+        } // end if
+
+        /**
+         * Displays the table structure
+         */
+        $buffer      = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table  . $crlf . '%' . $crlf
+                     . ' \\begin{longtable}{';
+        if (!PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        $columns_cnt = 4;
+        $alignment = '|l|c|c|c|';
         if ($do_relation && $have_rel) {
-            $local_buffer .= "\000";
-            if (isset($res_rel[$field_name])) {
-                $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')';
-            }
+            $columns_cnt++;
+            $alignment .= 'l|';
         }
-        if ($do_comments && $cfgRelation['commwork']) {
-            $local_buffer .= "\000";
-            if (isset($comments[$field_name])) {
-                $local_buffer .= $comments[$field_name];
-            }
+        if ($do_comments) {
+            $columns_cnt++;
+            $alignment .= 'l|';
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $local_buffer .= "\000";
-            if (isset($mime_map[$field_name])) {
-                $local_buffer .= str_replace('_', '/', $mime_map[$field_name]['mimetype']);
-            }
+            $columns_cnt++;
+            $alignment .='l|';
         }
-        $local_buffer = PMA_texEscape($local_buffer);
-        if ($row['Key']=='PRI') {
-            $pos=strpos($local_buffer, "\000");
-            $local_buffer = '\\textit{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+        $buffer = $alignment . '} ' . $crlf ;
+
+        $header = ' \\hline ';
+        $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
+        if ($do_relation && $have_rel) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
         }
-        if (in_array($field_name, $unique_keys)) {
-            $pos=strpos($local_buffer, "\000");
-            $local_buffer = '\\textbf{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+        if ($do_comments) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
+            $comments = PMA_getComments($db, $table);
         }
-        $buffer = str_replace("\000", ' & ', $local_buffer);
-        $buffer .= ' \\\\ \\hline ' . $crlf;
+        if ($do_mime && $cfgRelation['mimework']) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{MIME}}';
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
+
+        // Table caption for first page and label
+        if (isset($GLOBALS['latex_caption'])) {
+            $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
+                       . '} \\\\' . $crlf;
+        }
+        $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
+        // Table caption on next pages
+        if (isset($GLOBALS['latex_caption'])) {
+            $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\\\ ' . $crlf;
+        }
+        $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
 
         if (!PMA_exportOutputHandler($buffer)) {
             return false;
         }
-    } // end while
 
-    $buffer = ' \\end{longtable}' . $crlf;
-    return PMA_exportOutputHandler($buffer);
-} // end of the 'PMA_exportStructure' function
+        $fields = PMA_DBI_get_columns($db, $table);
+        foreach ($fields as $row) {
+            $type             = $row['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $row['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $row['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $row['Type']);
+            }
+            if (!isset($row['Default'])) {
+                if ($row['Null'] != 'NO') {
+                    $row['Default'] = 'NULL';
+                }
+            }
+
+            $field_name = $row['Field'];
+
+            $local_buffer = $field_name . "\000" . $type . "\000"
+                . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
+                . "\000" . (isset($row['Default']) ? $row['Default'] : '');
+
+            if ($do_relation && $have_rel) {
+                $local_buffer .= "\000";
+                if (isset($res_rel[$field_name])) {
+                    $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')';
+                }
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $local_buffer .= "\000";
+                if (isset($comments[$field_name])) {
+                    $local_buffer .= $comments[$field_name];
+                }
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $local_buffer .= "\000";
+                if (isset($mime_map[$field_name])) {
+                    $local_buffer .= str_replace('_', '/', $mime_map[$field_name]['mimetype']);
+                }
+            }
+            $local_buffer = PMA_texEscape($local_buffer);
+            if ($row['Key']=='PRI') {
+                $pos=strpos($local_buffer, "\000");
+                $local_buffer = '\\textit{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+            }
+            if (in_array($field_name, $unique_keys)) {
+                $pos=strpos($local_buffer, "\000");
+                $local_buffer = '\\textbf{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+            }
+            $buffer = str_replace("\000", ' & ', $local_buffer);
+            $buffer .= ' \\\\ \\hline ' . $crlf;
+
+            if (!PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
+        } // end while
+
+        $buffer = ' \\end{longtable}' . $crlf;
+        return PMA_exportOutputHandler($buffer);
+    } // end of the 'PMA_exportStructure' function
 
 } // end else
 ?>
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index 8ec37491f1..d03610d836 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -24,136 +24,136 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in MediaWiki format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    $columns = PMA_DBI_get_columns($db, $table);
-    $columns = array_values($columns);
-    $row_cnt = count($columns);
-
-    $output = "{| cellpadding=\"10\" cellspacing=\"0\" border=\"1\" style=\"text-align:center;\"\n";
-    $output .= "|+'''" . $table . "'''\n";
-    $output .= "|- style=\"background:#ffdead;\"\n";
-    $output .= "! style=\"background:#ffffff\" | \n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Field'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Type\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Type'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Null\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Null'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Default\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Default'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Extra\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Extra'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|}\n\n\n\n";
-    return PMA_exportOutputHandler($output);
-}
+    /**
+     * Outputs the content of a table in MediaWiki format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        $columns = PMA_DBI_get_columns($db, $table);
+        $columns = array_values($columns);
+        $row_cnt = count($columns);
+
+        $output = "{| cellpadding=\"10\" cellspacing=\"0\" border=\"1\" style=\"text-align:center;\"\n";
+        $output .= "|+'''" . $table . "'''\n";
+        $output .= "|- style=\"background:#ffdead;\"\n";
+        $output .= "! style=\"background:#ffffff\" | \n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Field'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Type\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Type'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Null\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Null'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Default\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Default'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Extra\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Extra'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|}\n\n\n\n";
+        return PMA_exportOutputHandler($output);
+    }
 
 }
 ?>
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index fa62a962a5..0c62878c2f 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -30,192 +30,192 @@ if (isset($plugin_list)) {
         );
 } else {
 
-$GLOBALS['ods_buffer'] = '';
-require_once './libraries/opendocument.lib.php';
+    $GLOBALS['ods_buffer'] = '';
+    require_once './libraries/opendocument.lib.php';
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
-        . '</office:body>'
-        . '</office:document-content>';
-    if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.spreadsheet', $GLOBALS['ods_buffer']))) {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-        . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-        . '<office:automatic-styles>'
-            . '<number:date-style style:name="N37" number:automatic-order="true">'
-            . '<number:month number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:day number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-          . '</number:date-style>'
-          . '<number:time-style style:name="N43">'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:seconds number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-          . '</number:time-style>'
-          . '<number:date-style style:name="N50" number:automatic-order="true" number:format-source="language">'
-            . '<number:month/>'
-            . '<number:text>/</number:text>'
-            . '<number:day/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-            . '<number:text> </number:text>'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-          . '</number:date-style>'
-          . '<style:style style:name="DateCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N37"/>'
-          . '<style:style style:name="TimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N43"/>'
-          . '<style:style style:name="DateTimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N50"/>'
-        . '</office:automatic-styles>'
-        . '<office:body>'
-        . '<office:spreadsheet>';
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in ODS format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-    $fields_meta = PMA_DBI_get_fields_meta($result);
-    $field_flags = array();
-    for ($j = 0; $j < $fields_cnt; $j++) {
-        $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
+            . '</office:body>'
+            . '</office:document-content>';
+        if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.spreadsheet', $GLOBALS['ods_buffer']))) {
+            return false;
+        }
+        return true;
     }
 
-    $GLOBALS['ods_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '">';
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
+            . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
+            . '<office:automatic-styles>'
+                . '<number:date-style style:name="N37" number:automatic-order="true">'
+                . '<number:month number:style="long"/>'
+                . '<number:text>/</number:text>'
+                . '<number:day number:style="long"/>'
+                . '<number:text>/</number:text>'
+                . '<number:year/>'
+              . '</number:date-style>'
+              . '<number:time-style style:name="N43">'
+                . '<number:hours number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:minutes number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:seconds number:style="long"/>'
+                . '<number:text> </number:text>'
+                . '<number:am-pm/>'
+              . '</number:time-style>'
+              . '<number:date-style style:name="N50" number:automatic-order="true" number:format-source="language">'
+                . '<number:month/>'
+                . '<number:text>/</number:text>'
+                . '<number:day/>'
+                . '<number:text>/</number:text>'
+                . '<number:year/>'
+                . '<number:text> </number:text>'
+                . '<number:hours number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:minutes number:style="long"/>'
+                . '<number:text> </number:text>'
+                . '<number:am-pm/>'
+              . '</number:date-style>'
+              . '<style:style style:name="DateCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N37"/>'
+              . '<style:style style:name="TimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N43"/>'
+              . '<style:style style:name="DateTimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N50"/>'
+            . '</office:automatic-styles>'
+            . '<office:body>'
+            . '<office:spreadsheet>';
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $GLOBALS['ods_buffer'] .= '<table:table-row>';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
-                . '</table:table-cell>';
-        } // end for
-        $GLOBALS['ods_buffer'] .= '</table:table-row>';
-    } // end if
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $GLOBALS['ods_buffer'] .= '<table:table-row>';
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in ODS format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+        $fields_meta = PMA_DBI_get_fields_meta($result);
+        $field_flags = array();
         for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
-                    . '</table:table-cell>';
-            // ignore BLOB
-            } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "date") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d", strtotime($row[$j])) . '" table:style-name="DateCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "time") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="time" office:time-value="' . date("\P\TH\Hi\Ms\S", strtotime($row[$j])) . '" table:style-name="TimeCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "datetime") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d\TH:i:s", strtotime($row[$j])) . '" table:style-name="DateTimeCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            }
-        } // end for
-        $GLOBALS['ods_buffer'] .= '</table:table-row>';
-    } // end while
-    PMA_DBI_free_result($result);
+            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+        }
 
-    $GLOBALS['ods_buffer'] .= '</table:table>';
+        $GLOBALS['ods_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '">';
 
-    return true;
-}
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $GLOBALS['ods_buffer'] .= '<table:table-row>';
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                    . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
+                    . '</table:table-cell>';
+            } // end for
+            $GLOBALS['ods_buffer'] .= '</table:table-row>';
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $GLOBALS['ods_buffer'] .= '<table:table-row>';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
+                        . '</table:table-cell>';
+                // ignore BLOB
+                } elseif (stristr($field_flags[$j], 'BINARY')
+                        && $fields_meta[$j]->blob) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "date") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d", strtotime($row[$j])) . '" table:style-name="DateCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "time") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="time" office:time-value="' . date("\P\TH\Hi\Ms\S", strtotime($row[$j])) . '" table:style-name="TimeCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "datetime") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d\TH:i:s", strtotime($row[$j])) . '" table:style-name="DateTimeCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            } // end for
+            $GLOBALS['ods_buffer'] .= '</table:table-row>';
+        } // end while
+        PMA_DBI_free_result($result);
+
+        $GLOBALS['ods_buffer'] .= '</table:table>';
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index dba6e1c5cc..e02f8a6ea1 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -62,345 +62,345 @@ if (isset($plugin_list)) {
         array('type' => 'end_group');
 } else {
 
-$GLOBALS['odt_buffer'] = '';
-require_once './libraries/opendocument.lib.php';
+    $GLOBALS['odt_buffer'] = '';
+    require_once './libraries/opendocument.lib.php';
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $GLOBALS['odt_buffer'] .= '</office:text>'
-        . '</office:body>'
-        . '</office:document-content>';
-    if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-        . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-        . '<office:body>'
-        . '<office:text>';
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in ODT format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-    $fields_meta = PMA_DBI_get_fields_meta($result);
-    $field_flags = array();
-    for ($j = 0; $j < $fields_cnt; $j++) {
-        $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $GLOBALS['odt_buffer'] .= '</office:text>'
+            . '</office:body>'
+            . '</office:document-content>';
+        if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) {
+            return false;
+        }
+        return true;
     }
 
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
-    $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
-    $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
+            . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
+            . '<office:body>'
+            . '<office:text>';
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
-                . '</table:table-cell>';
-        } // end for
-        $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end if
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in ODT format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+        $fields_meta = PMA_DBI_get_fields_meta($result);
+        $field_flags = array();
         for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
+            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+        }
+
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
+        $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
+        $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            for ($i = 0; $i < $fields_cnt; $i++) {
                 $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
-                    . '</table:table-cell>';
-            // ignore BLOB
-            } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                    . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
                     . '</table:table-cell>';
+            } // end for
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
+                        . '</table:table-cell>';
+                // ignore BLOB
+                } elseif (stristr($field_flags[$j], 'BINARY')
+                        && $fields_meta[$j]->blob) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            } // end for
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end while
+        PMA_DBI_free_result($result);
+
+        $GLOBALS['odt_buffer'] .= '</table:table>';
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        /* Heading */
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            }
-        } // end for
-        $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end while
-    PMA_DBI_free_result($result);
-
-    $GLOBALS['odt_buffer'] .= '</table:table>';
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    /* Heading */
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_data">';
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-    $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $columns_cnt . '"/>';
-    /* Header */
-    $GLOBALS['odt_buffer'] .= '<table:table-row>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
-        . '</table:table-cell>';
-    if ($do_relation && $have_rel) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
-            . '</table:table-cell>';
-    }
-    if ($do_comments) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
-            . '</table:table-cell>';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
-            . '</table:table-cell>';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $GLOBALS['odt_buffer'] .= '</table:table-row>';
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $field_name = $column['Field'];
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
-            . '</table:table-cell>';
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        $type = $column['Type'];
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($type) . '</text:p>'
-            . '</table:table-cell>';
-        if (!isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            } else {
-                $column['Default'] = '';
+                $have_rel = false;
             }
         } else {
-            $column['Default'] = $column['Default'];
-        }
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
-            . '</table:table-cell>';
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
-            . '</table:table-cell>';
+               $have_rel = false;
+        } // end if
 
+        /**
+         * Displays the table structure
+         */
+        $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_data">';
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            if (isset($res_rel[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') . '</text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
         }
         if ($do_comments) {
-            if (isset($comments[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($comments[$field_name]) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            if (isset($mime_map[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
+        }
+        $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $columns_cnt . '"/>';
+        /* Header */
+        $GLOBALS['odt_buffer'] .= '<table:table-row>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
+            . '</table:table-cell>';
+        if ($do_relation && $have_rel) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
+                . '</table:table-cell>';
+        }
+        if ($do_comments) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
+                . '</table:table-cell>';
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
+                . '</table:table-cell>';
+            $mime_map = PMA_getMIME($db, $table, true);
         }
         $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end while
 
-    $GLOBALS['odt_buffer'] .= '</table:table>';
-    return true;
-} // end of the 'PMA_exportStructure' function
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $field_name = $column['Field'];
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
+                . '</table:table-cell>';
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            $type = $column['Type'];
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($type) . '</text:p>'
+                . '</table:table-cell>';
+            if (!isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                } else {
+                    $column['Default'] = '';
+                }
+            } else {
+                $column['Default'] = $column['Default'];
+            }
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
+                . '</table:table-cell>';
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
+                . '</table:table-cell>';
+
+            if ($do_relation && $have_rel) {
+                if (isset($res_rel[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            if ($do_comments) {
+                if (isset($comments[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($comments[$field_name]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                if (isset($mime_map[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end while
+
+        $GLOBALS['odt_buffer'] .= '</table:table>';
+        return true;
+    } // end of the 'PMA_exportStructure' function
 
 } // end else
 ?>
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 01ffc88be1..3cc0acfd24 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -30,441 +30,441 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Font used in PDF.
- *
- * @todo Make this configuratble (at least Sans/Serif).
- */
-define('PMA_PDF_FONT', 'DejaVuSans');
-require_once './libraries/tcpdf/tcpdf.php';
+    /**
+     * Font used in PDF.
+     *
+     * @todo Make this configuratble (at least Sans/Serif).
+     */
+    define('PMA_PDF_FONT', 'DejaVuSans');
+    require_once './libraries/tcpdf/tcpdf.php';
 
-/**
- * Adapted from a LGPL script by Philip Clarke
- * @package phpMyAdmin-Export
- * @subpackage PDF
- */
-class PMA_PDF extends TCPDF
-{
-    var $tablewidths;
-    var $headerset;
-    var $footerset;
+    /**
+     * Adapted from a LGPL script by Philip Clarke
+     * @package phpMyAdmin-Export
+     * @subpackage PDF
+     */
+    class PMA_PDF extends TCPDF
+    {
+        var $tablewidths;
+        var $headerset;
+        var $footerset;
 
-    function checkPageBreak($h=0, $y='', $addpage=true) {
-        if ($this->empty_string($y)) {
-            $y = $this->y;
-        }
-        $current_page = $this->page;
-        if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
-            if ($addpage) {
-                //Automatic page break
-                $x = $this->x;
-                $this->AddPage($this->CurOrientation);
-                $this->y = $this->dataY;
-                $oldpage = $this->page - 1;
-                if ($this->rtl) {
-                    if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
-                        $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
+        function checkPageBreak($h=0, $y='', $addpage=true) {
+            if ($this->empty_string($y)) {
+                $y = $this->y;
+            }
+            $current_page = $this->page;
+            if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
+                if ($addpage) {
+                    //Automatic page break
+                    $x = $this->x;
+                    $this->AddPage($this->CurOrientation);
+                    $this->y = $this->dataY;
+                    $oldpage = $this->page - 1;
+                    if ($this->rtl) {
+                        if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
+                            $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
+                        } else {
+                            $this->x = $x;
+                        }
                     } else {
-                        $this->x = $x;
-                    }
-                } else {
-                    if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-                        $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
-                    } else {
-                        $this->x = $x;
+                        if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
+                            $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
+                        } else {
+                            $this->x = $x;
+                        }
                     }
                 }
+                return true;
             }
-            return true;
+            if ($current_page != $this->page) {
+                // account for columns mode
+                return true;
+            }
+            return false;
         }
-        if ($current_page != $this->page) {
-            // account for columns mode
-            return true;
-        }
-        return false;
-    }
 
-    function Header()
-    {
-        global $maxY;
-        // Check if header for this page already exists
-        if (!isset($this->headerset[$this->page])) {
+        function Header()
+        {
+            global $maxY;
+            // Check if header for this page already exists
+            if (!isset($this->headerset[$this->page])) {
+                $fullwidth = 0;
+                foreach ($this->tablewidths as $width) {
+                    $fullwidth += $width;
+                }
+                $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3);
+                $this->cellFontSize = $this->FontSizePt ;
+                $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt));
+                $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
+                $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize);
+                $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5);
+                $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .',  ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L');
+                $l = ($this->lMargin);
+                foreach ($this->colTitles as $col => $txt) {
+                    $this->SetXY($l, ($this->tMargin));
+                    $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt);
+                    $l += $this->tablewidths[$col] ;
+                    $maxY = ($maxY < $this->getY()) ? $this->getY() : $maxY ;
+                }
+                $this->SetXY($this->lMargin, $this->tMargin);
+                $this->setFillColor(200, 200, 200);
+                $l = ($this->lMargin);
+                foreach ($this->colTitles as $col => $txt) {
+                    $this->SetXY($l, $this->tMargin);
+                    $this->cell($this->tablewidths[$col], $maxY-($this->tMargin), '', 1, 0, 'L', 1);
+                    $this->SetXY($l, $this->tMargin);
+                    $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt, 0, 'C');
+                    $l += $this->tablewidths[$col];
+                }
+                $this->setFillColor(255, 255, 255);
+                // set headerset
+                $this->headerset[$this->page] = 1;
+            }
+
+            $this->dataY = $maxY;
+        }
+
+        function Footer()
+        {
+            // Check if footer for this page already exists
+            if (!isset($this->footerset[$this->page])) {
+                $this->SetY(-15);
+                //Page number
+                $this->setFooterFont(PMA_PDF_FONT, '', 14);
+                $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' .  $this->getAliasNbPages(), 'T', 0, 'C');
+
+                // set footerset
+                $this->footerset[$this->page] = 1;
+            }
+        }
+
+        function morepagestable($lineheight=8)
+        {
+            // some things to set and 'remember'
+            $l = $this->lMargin;
+            $startheight = $h = $this->dataY;
+            $startpage = $currpage = $this->page;
+
+            // calculate the whole width
             $fullwidth = 0;
             foreach ($this->tablewidths as $width) {
                 $fullwidth += $width;
             }
-            $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3);
-            $this->cellFontSize = $this->FontSizePt ;
-            $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt));
-            $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
-            $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize);
-            $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5);
-            $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .',  ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L');
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, ($this->tMargin));
-                $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt);
-                $l += $this->tablewidths[$col] ;
-                $maxY = ($maxY < $this->getY()) ? $this->getY() : $maxY ;
-            }
-            $this->SetXY($this->lMargin, $this->tMargin);
-            $this->setFillColor(200, 200, 200);
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, $this->tMargin);
-                $this->cell($this->tablewidths[$col], $maxY-($this->tMargin), '', 1, 0, 'L', 1);
-                $this->SetXY($l, $this->tMargin);
-                $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt, 0, 'C');
-                $l += $this->tablewidths[$col];
-            }
-            $this->setFillColor(255, 255, 255);
-            // set headerset
-            $this->headerset[$this->page] = 1;
-        }
 
-        $this->dataY = $maxY;
-    }
+            // Now let's start to write the table
+            $row = 0;
+            $tmpheight = array();
+            $maxpage = $this->page;
 
-    function Footer()
-    {
-        // Check if footer for this page already exists
-        if (!isset($this->footerset[$this->page])) {
-            $this->SetY(-15);
-            //Page number
-            $this->setFooterFont(PMA_PDF_FONT, '', 14);
-            $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' .  $this->getAliasNbPages(), 'T', 0, 'C');
-
-            // set footerset
-            $this->footerset[$this->page] = 1;
-        }
-    }
-
-    function morepagestable($lineheight=8)
-    {
-        // some things to set and 'remember'
-        $l = $this->lMargin;
-        $startheight = $h = $this->dataY;
-        $startpage = $currpage = $this->page;
-
-        // calculate the whole width
-        $fullwidth = 0;
-        foreach ($this->tablewidths as $width) {
-            $fullwidth += $width;
-        }
-
-        // Now let's start to write the table
-        $row = 0;
-        $tmpheight = array();
-        $maxpage = $this->page;
-
-        while ($data = PMA_DBI_fetch_row($this->results)) {
-            $this->page = $currpage;
-            // write the horizontal borders
-            $this->Line($l, $h, $fullwidth+$l, $h);
-            // write the content and remember the height of the highest col
-            foreach ($data as $col => $txt) {
+            while ($data = PMA_DBI_fetch_row($this->results)) {
                 $this->page = $currpage;
-                $this->SetXY($l, $h);
-                if ($this->tablewidths[$col] > 0) {
-                    $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, $this->colAlign[$col]);
-                    $l += $this->tablewidths[$col];
+                // write the horizontal borders
+                $this->Line($l, $h, $fullwidth+$l, $h);
+                // write the content and remember the height of the highest col
+                foreach ($data as $col => $txt) {
+                    $this->page = $currpage;
+                    $this->SetXY($l, $h);
+                    if ($this->tablewidths[$col] > 0) {
+                        $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, $this->colAlign[$col]);
+                        $l += $this->tablewidths[$col];
+                    }
+
+                    if (!isset($tmpheight[$row.'-'.$this->page])) {
+                        $tmpheight[$row.'-'.$this->page] = 0;
+                    }
+                    if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+                        $tmpheight[$row.'-'.$this->page] = $this->GetY();
+                    }
+                    if ($this->page > $maxpage) {
+                        $maxpage = $this->page;
+                    }
+                    unset($data[$col]);
                 }
 
-                if (!isset($tmpheight[$row.'-'.$this->page])) {
-                    $tmpheight[$row.'-'.$this->page] = 0;
-                }
-                if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                    $tmpheight[$row.'-'.$this->page] = $this->GetY();
-                }
-                if ($this->page > $maxpage) {
-                    $maxpage = $this->page;
-                }
-                unset($data[$col]);
+                // get the height we were in the last used page
+                $h = $tmpheight[$row.'-'.$maxpage];
+                // set the "pointer" to the left margin
+                $l = $this->lMargin;
+                // set the $currpage to the last page
+                $currpage = $maxpage;
+                unset($data[$row]);
+                $row++;
             }
-
-            // get the height we were in the last used page
-            $h = $tmpheight[$row.'-'.$maxpage];
-            // set the "pointer" to the left margin
-            $l = $this->lMargin;
-            // set the $currpage to the last page
-            $currpage = $maxpage;
-            unset($data[$row]);
-            $row++;
-        }
-        // draw the borders
-        // we start adding a horizontal line on the last page
-        $this->page = $maxpage;
-        $this->Line($l, $h, $fullwidth+$l, $h);
-        // now we start at the top of the document and walk down
-        for ($i = $startpage; $i <= $maxpage; $i++) {
-            $this->page = $i;
-            $l = $this->lMargin;
-            $t = ($i == $startpage) ? $startheight : $this->tMargin;
-            $lh = ($i == $maxpage) ? $h : $this->h-$this->bMargin;
-            $this->Line($l, $t, $l, $lh);
-            foreach ($this->tablewidths as $width) {
-                $l += $width;
+            // draw the borders
+            // we start adding a horizontal line on the last page
+            $this->page = $maxpage;
+            $this->Line($l, $h, $fullwidth+$l, $h);
+            // now we start at the top of the document and walk down
+            for ($i = $startpage; $i <= $maxpage; $i++) {
+                $this->page = $i;
+                $l = $this->lMargin;
+                $t = ($i == $startpage) ? $startheight : $this->tMargin;
+                $lh = ($i == $maxpage) ? $h : $this->h-$this->bMargin;
                 $this->Line($l, $t, $l, $lh);
-            }
-        }
-        // set it to the last page, if not it'll cause some problems
-        $this->page = $maxpage;
-    }
-
-    function setAttributes($attr = array())
-    {
-        foreach ($attr as $key => $val) {
-            $this->$key = $val ;
-        }
-    }
-
-    function setTopMargin($topMargin)
-    {
-        $this->tMargin = $topMargin;
-    }
-
-    function mysql_report($query)
-    {
-        unset($this->tablewidths);
-        unset($this->colTitles);
-        unset($this->titleWidth);
-        unset($this->colFits);
-        unset($this->display_column);
-        unset($this->colAlign);
-
-        /**
-         * Pass 1 for column widths
-         */
-        $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
-        $this->numFields  = PMA_DBI_num_fields($this->results);
-        $this->fields = PMA_DBI_get_fields_meta($this->results);
-
-        // sColWidth = starting col width (an average size width)
-        $availableWidth = $this->w - $this->lMargin - $this->rMargin;
-        $this->sColWidth = $availableWidth / $this->numFields;
-        $totalTitleWidth = 0;
-
-        // loop through results header and set initial col widths/ titles/ alignment
-        // if a col title is less than the starting col width, reduce that column size
-        for ($i = 0; $i < $this->numFields; $i++) {
-            $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ;
-            // save the real title's width
-            $titleWidth[$i] = $stringWidth;
-            $totalTitleWidth += $stringWidth;
-
-            // set any column titles less than the start width to the column title width
-            if ($stringWidth < $this->sColWidth) {
-                $colFits[$i] = $stringWidth ;
-            }
-            $this->colTitles[$i] = $this->fields[$i]->name;
-            $this->display_column[$i] = true;
-
-            switch ($this->fields[$i]->type) {
-            case 'int':
-                $this->colAlign[$i] = 'R';
-                break;
-            case 'blob':
-            case 'tinyblob':
-            case 'mediumblob':
-            case 'longblob':
-                /**
-                 * @todo do not deactivate completely the display
-                 * but show the field's name and [BLOB]
-                 */
-                if (stristr($this->fields[$i]->flags, 'BINARY')) {
-                    $this->display_column[$i] = false;
-                    unset($this->colTitles[$i]);
+                foreach ($this->tablewidths as $width) {
+                    $l += $width;
+                    $this->Line($l, $t, $l, $lh);
                 }
-                $this->colAlign[$i] = 'L';
-                break;
-            default:
-                $this->colAlign[$i] = 'L';
+            }
+            // set it to the last page, if not it'll cause some problems
+            $this->page = $maxpage;
+        }
+
+        function setAttributes($attr = array())
+        {
+            foreach ($attr as $key => $val) {
+                $this->$key = $val ;
             }
         }
 
-        // title width verification
-        if ($totalTitleWidth > $availableWidth) {
-            $adjustingMode = true;
-        } else {
-            $adjustingMode = false;
-            // we have enough space for all the titles at their
-            // original width so use the true title's width
-            foreach ($titleWidth as $key => $val) {
-                $colFits[$key] = $val;
-            }
+        function setTopMargin($topMargin)
+        {
+            $this->tMargin = $topMargin;
         }
 
-        // loop through the data; any column whose contents
-        // is greater than the column size is resized
-        /**
-          * @todo force here a LIMIT to avoid reading all rows
-          */
-        while ($row = PMA_DBI_fetch_row($this->results)) {
-            foreach ($colFits as $key => $val) {
-                $stringWidth = $this->getstringwidth($row[$key]) + 6 ;
-                if ($adjustingMode && ($stringWidth > $this->sColWidth)) {
-                // any column whose data's width is bigger than the start width is now discarded
-                    unset($colFits[$key]);
-                } else {
-                // if data's width is bigger than the current column width,
-                // enlarge the column (but avoid enlarging it if the
-                // data's width is very big)
-                        if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) {
-                        $colFits[$key] = $stringWidth ;
+        function mysql_report($query)
+        {
+            unset($this->tablewidths);
+            unset($this->colTitles);
+            unset($this->titleWidth);
+            unset($this->colFits);
+            unset($this->display_column);
+            unset($this->colAlign);
+
+            /**
+             * Pass 1 for column widths
+             */
+            $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
+            $this->numFields  = PMA_DBI_num_fields($this->results);
+            $this->fields = PMA_DBI_get_fields_meta($this->results);
+
+            // sColWidth = starting col width (an average size width)
+            $availableWidth = $this->w - $this->lMargin - $this->rMargin;
+            $this->sColWidth = $availableWidth / $this->numFields;
+            $totalTitleWidth = 0;
+
+            // loop through results header and set initial col widths/ titles/ alignment
+            // if a col title is less than the starting col width, reduce that column size
+            for ($i = 0; $i < $this->numFields; $i++) {
+                $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ;
+                // save the real title's width
+                $titleWidth[$i] = $stringWidth;
+                $totalTitleWidth += $stringWidth;
+
+                // set any column titles less than the start width to the column title width
+                if ($stringWidth < $this->sColWidth) {
+                    $colFits[$i] = $stringWidth ;
+                }
+                $this->colTitles[$i] = $this->fields[$i]->name;
+                $this->display_column[$i] = true;
+
+                switch ($this->fields[$i]->type) {
+                case 'int':
+                    $this->colAlign[$i] = 'R';
+                    break;
+                case 'blob':
+                case 'tinyblob':
+                case 'mediumblob':
+                case 'longblob':
+                    /**
+                     * @todo do not deactivate completely the display
+                     * but show the field's name and [BLOB]
+                     */
+                    if (stristr($this->fields[$i]->flags, 'BINARY')) {
+                        $this->display_column[$i] = false;
+                        unset($this->colTitles[$i]);
+                    }
+                    $this->colAlign[$i] = 'L';
+                    break;
+                default:
+                    $this->colAlign[$i] = 'L';
+                }
+            }
+
+            // title width verification
+            if ($totalTitleWidth > $availableWidth) {
+                $adjustingMode = true;
+            } else {
+                $adjustingMode = false;
+                // we have enough space for all the titles at their
+                // original width so use the true title's width
+                foreach ($titleWidth as $key => $val) {
+                    $colFits[$key] = $val;
+                }
+            }
+
+            // loop through the data; any column whose contents
+            // is greater than the column size is resized
+            /**
+              * @todo force here a LIMIT to avoid reading all rows
+              */
+            while ($row = PMA_DBI_fetch_row($this->results)) {
+                foreach ($colFits as $key => $val) {
+                    $stringWidth = $this->getstringwidth($row[$key]) + 6 ;
+                    if ($adjustingMode && ($stringWidth > $this->sColWidth)) {
+                    // any column whose data's width is bigger than the start width is now discarded
+                        unset($colFits[$key]);
+                    } else {
+                    // if data's width is bigger than the current column width,
+                    // enlarge the column (but avoid enlarging it if the
+                    // data's width is very big)
+                            if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) {
+                            $colFits[$key] = $stringWidth ;
+                        }
                     }
                 }
             }
-        }
 
-        $totAlreadyFitted = 0;
-        foreach ($colFits as $key => $val) {
-            // set fitted columns to smallest size
-            $this->tablewidths[$key] = $val;
-            // to work out how much (if any) space has been freed up
-            $totAlreadyFitted += $val;
-        }
-
-        if ($adjustingMode) {
-            $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted;
-            $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits));
-        } else {
-            $surplusToAdd = 0;
-        }
-
-        for ($i=0; $i < $this->numFields; $i++) {
-            if (!in_array($i, array_keys($colFits))) {
-                $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd;
+            $totAlreadyFitted = 0;
+            foreach ($colFits as $key => $val) {
+                // set fitted columns to smallest size
+                $this->tablewidths[$key] = $val;
+                // to work out how much (if any) space has been freed up
+                $totAlreadyFitted += $val;
             }
-            if ($this->display_column[$i] == false) {
-                $this->tablewidths[$i] = 0;
+
+            if ($adjustingMode) {
+                $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted;
+                $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits));
+            } else {
+                $surplusToAdd = 0;
             }
+
+            for ($i=0; $i < $this->numFields; $i++) {
+                if (!in_array($i, array_keys($colFits))) {
+                    $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd;
+                }
+                if ($this->display_column[$i] == false) {
+                    $this->tablewidths[$i] = 0;
+                }
+            }
+
+            ksort($this->tablewidths);
+
+            PMA_DBI_free_result($this->results);
+
+            // Pass 2
+
+            $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
+            $this->setY($this->tMargin);
+            $this->AddPage();
+            $this->morepagestable($this->FontSizePt);
+            PMA_DBI_free_result($this->results);
+
+        } // end of mysql_report function
+
+    } // end of PMA_PDF class
+
+    $pdf = new PMA_PDF('L', 'pt', 'A3');
+
+    /**
+     * Finalize the pdf.
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        global $pdf;
+
+        // instead of $pdf->Output():
+        if (!PMA_exportOutputHandler($pdf->getPDFData())) {
+            return false;
         }
 
-        ksort($this->tablewidths);
-
-        PMA_DBI_free_result($this->results);
-
-        // Pass 2
-
-        $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
-        $this->setY($this->tMargin);
-        $this->AddPage();
-        $this->morepagestable($this->FontSizePt);
-        PMA_DBI_free_result($this->results);
-
-    } // end of mysql_report function
-
-} // end of PMA_PDF class
-
-$pdf = new PMA_PDF('L', 'pt', 'A3');
-
-/**
- * Finalize the pdf.
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    global $pdf;
-
-    // instead of $pdf->Output():
-    if (!PMA_exportOutputHandler($pdf->getPDFData())) {
-        return false;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Initialize the pdf to export data.
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        global $pdf_report_title;
+        global $pdf;
 
-/**
- * Initialize the pdf to export data.
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    global $pdf_report_title;
-    global $pdf;
+        $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
+        $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
+        $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
+        $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
+        $pdf->SetFont(PMA_PDF_FONT, '', 11.5);
+        $pdf->setFooterFont(array(PMA_PDF_FONT, '', 11.5));
+        $pdf->AliasNbPages();
+        $pdf->Open();
 
-    $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
-    $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
-    $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
-    $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
-    $pdf->SetFont(PMA_PDF_FONT, '', 11.5);
-    $pdf->setFooterFont(array(PMA_PDF_FONT, '', 11.5));
-    $pdf->AliasNbPages();
-    $pdf->Open();
+        $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
+        $pdf->setAttributes($attr);
+        $pdf->setTopMargin(45);
 
-    $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
-    $pdf->setAttributes($attr);
-    $pdf->setTopMargin(45);
+        return true;
+    }
 
-    return true;
-}
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
+    /**
+     * Outputs the content of a table in PDF format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $pdf;
 
-/**
- * Outputs the content of a table in PDF format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $pdf;
+        $attr=array('currentDb' => $db, 'currentTable' => $table);
+        $pdf->setAttributes($attr);
+        $pdf->mysql_report($sql_query);
 
-    $attr=array('currentDb' => $db, 'currentTable' => $table);
-    $pdf->setAttributes($attr);
-    $pdf->mysql_report($sql_query);
-
-    return true;
-} // end of the 'PMA_exportData()' function
+        return true;
+    } // end of the 'PMA_exportData()' function
 }
 ?>
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 783afe0930..642475954a 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -30,134 +30,134 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler(
-          '<?php' . $GLOBALS['crlf']
-        . '/**' . $GLOBALS['crlf']
-        . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
-        . ' * @version 0.2b' . $GLOBALS['crlf']
-        . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-    );
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table as a fragment of PHP code
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler(
+              '<?php' . $GLOBALS['crlf']
+            . '/**' . $GLOBALS['crlf']
+            . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
+            . ' * @version 0.2b' . $GLOBALS['crlf']
+            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
+        );
+        return true;
+    }
 
-        $record_cnt++;
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf;
-            $buffer .= '$' . $table . ' = array(' . $crlf;
-            $buffer .= '  array(';
-        } else {
-            $buffer .= ',' . $crlf . '  array(';
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs the content of a table as a fragment of PHP code
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
-            $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ',');
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+        }
+        unset($i);
+
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
+
+            $record_cnt++;
+
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf;
+                $buffer .= '$' . $table . ' = array(' . $crlf;
+                $buffer .= '  array(';
+            } else {
+                $buffer .= ',' . $crlf . '  array(';
+            }
+
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ',');
+            }
+
+            $buffer .= ')';
         }
 
-        $buffer .= ')';
+        $buffer .= $crlf . ');' . $crlf;
+        if (! PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        PMA_DBI_free_result($result);
+
+        return true;
     }
 
-    $buffer .= $crlf . ');' . $crlf;
-    if (! PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    PMA_DBI_free_result($result);
-
-    return true;
-}
-
 }
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 0781db428a..f0f6f15fb1 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -294,956 +294,956 @@ if (isset($plugin_list)) {
     }
 } else {
 
-/**
- * Avoids undefined variables, use NULL so isset() returns false
- */
-if (! isset($sql_backquotes)) {
-    $sql_backquotes = null;
-}
-
-/**
- * Exports routines (procedures and functions)
- *
- * @param string  $db
- * @return  bool  Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportRoutines($db) {
-    global $crlf;
-
-    $text = '';
-    $delimiter = '$$';
-
-    $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
-    $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
-
-    if ($procedure_names || $function_names) {
-        $text .= $crlf
-            . 'DELIMITER ' . $delimiter . $crlf;
+    /**
+     * Avoids undefined variables, use NULL so isset() returns false
+     */
+    if (! isset($sql_backquotes)) {
+        $sql_backquotes = null;
     }
 
-    if ($procedure_names) {
-        $text .=
-            PMA_exportComment()
-          . PMA_exportComment(__('Procedures'))
-          . PMA_exportComment();
+    /**
+     * Exports routines (procedures and functions)
+     *
+     * @param string  $db
+     * @return  bool  Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportRoutines($db) {
+        global $crlf;
 
-        foreach ($procedure_names as $procedure_name) {
-            if (! empty($GLOBALS['sql_drop_table'])) {
-                $text .= 'DROP PROCEDURE IF EXISTS '
-                    . PMA_backquote($procedure_name)
-                    . $delimiter . $crlf;
-            }
-            $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name)
-                . $delimiter . $crlf . $crlf;
-        }
-    }
-
-    if ($function_names) {
-        $text .=
-            PMA_exportComment()
-          . PMA_exportComment(__('Functions'))
-          . PMA_exportComment();
-
-        foreach ($function_names as $function_name) {
-            if (! empty($GLOBALS['sql_drop_table'])) {
-                $text .= 'DROP FUNCTION IF EXISTS '
-                    . PMA_backquote($function_name)
-                    . $delimiter . $crlf;
-            }
-            $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name)
-                . $delimiter . $crlf . $crlf;
-        }
-    }
-
-    if ($procedure_names || $function_names) {
-        $text .= 'DELIMITER ;' . $crlf;
-    }
-
-    if (! empty($text)) {
-        return PMA_exportOutputHandler($text);
-    } else {
-        return false;
-    }
-}
-
-/**
- * Possibly outputs comment
- *
- * @param string  $text  Text of comment
- * @return  string      The formatted comment
- *
- * @access  private
- */
-function PMA_exportComment($text = '')
-{
-    if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
-        // see http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html
-        return '--' . (empty($text) ? '' : ' ') . $text . $GLOBALS['crlf'];
-    } else {
-        return '';
-    }
-}
-
-/**
- * Possibly outputs CRLF
- *
- * @return  string  $crlf or nothing
- *
- * @access private
- */
-function PMA_possibleCRLF()
-{
-    if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
-        return $GLOBALS['crlf'];
-    } else {
-        return '';
-    }
-}
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    global $crlf;
-    global $mysql_charset_map;
-
-    $foot = '';
-
-    if (isset($GLOBALS['sql_disable_fk'])) {
-        $foot .=  'SET FOREIGN_KEY_CHECKS=1;' . $crlf;
-    }
-
-    if (isset($GLOBALS['sql_use_transaction'])) {
-        $foot .=  'COMMIT;' . $crlf;
-    }
-
-    // restore connection settings
-    $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
-    if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
-        $foot .=  $crlf
-                . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
-                . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf
-                . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf;
-    }
-
-    /* Restore timezone */
-    if ($GLOBALS['sql_utc_time']) {
-        PMA_DBI_query('SET time_zone = "' . $GLOBALS['old_tz'] . '"');
-    }
-
-    return PMA_exportOutputHandler($foot);
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    global $crlf;
-    global $cfg;
-    global $mysql_charset_map;
-
-    if (isset($GLOBALS['sql_compatibility'])) {
-        $tmp_compat = $GLOBALS['sql_compatibility'];
-        if ($tmp_compat == 'NONE') {
-            $tmp_compat = '';
-        }
-        PMA_DBI_try_query('SET SQL_MODE="' . $tmp_compat . '"');
-        unset($tmp_compat);
-    }
-    $head  =  PMA_exportComment('phpMyAdmin SQL Dump')
-           .  PMA_exportComment('version ' . PMA_VERSION)
-           .  PMA_exportComment('http://www.phpmyadmin.net')
-           .  PMA_exportComment();
-    $host_string = __('Host') . ': ' .  $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-        $host_string .= ':' . $cfg['Server']['port'];
-    }
-    $head .= PMA_exportComment($host_string);
-    $head .= PMA_exportComment(__('Generation Time')
-          . ': ' .  PMA_localisedDate())
-          .  PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION)
-          .  PMA_exportComment(__('PHP Version') . ': ' . phpversion())
-          .  PMA_possibleCRLF();
-
-    if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) {
-        // '\n' is not a newline (like "\n" would be), it's the characters
-        // backslash and n, as explained on the export interface
-        $lines = explode('\n', $GLOBALS['sql_header_comment']);
-        $head .= PMA_exportComment();
-        foreach ($lines as $one_line) {
-            $head .= PMA_exportComment($one_line);
-        }
-        $head .= PMA_exportComment();
-    }
-
-    if (isset($GLOBALS['sql_disable_fk'])) {
-        $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf;
-    }
-
-    /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */
-    if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') {
-        $head .= 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf;
-    }
-
-    if (isset($GLOBALS['sql_use_transaction'])) {
-        $head .= 'SET AUTOCOMMIT=0;' . $crlf
-               . 'START TRANSACTION;' . $crlf;
-    }
-
-
-    /* Change timezone if we should export timestamps in UTC */
-    if ($GLOBALS['sql_utc_time']) {
-        $head .= 'SET time_zone = "+00:00";' . $crlf;
-        $GLOBALS['old_tz'] = PMA_DBI_fetch_value('SELECT @@session.time_zone');
-        PMA_DBI_query('SET time_zone = "+00:00"');
-    }
-
-    $head .= PMA_possibleCRLF();
-
-    if (! empty($GLOBALS['asfile'])) {
-        // we are saving as file, therefore we provide charset information
-        // so that a utility like the mysql client can interpret
-        // the file correctly
-        if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
-            // we got a charset from the export dialog
-            $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
-        } else {
-            // by default we use the connection charset
-            $set_names = $mysql_charset_map['utf-8'];
-        }
-        $head .=  $crlf
-               . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf
-               . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;' . $crlf
-               . '/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;' . $crlf
-               . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
-    }
-
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    global $crlf;
-    if (isset($GLOBALS['sql_drop_database'])) {
-        if (!PMA_exportOutputHandler('DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db) . ';' . $crlf)) {
-            return false;
-        }
-    }
-    $create_query = 'CREATE DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db);
-    $collation = PMA_getDbCollation($db);
-    if (strpos($collation, '_')) {
-        $create_query .= ' DEFAULT CHARACTER SET ' . substr($collation, 0, strpos($collation, '_')) . ' COLLATE ' . $collation;
-    } else {
-        $create_query .= ' DEFAULT CHARACTER SET ' . $collation;
-    }
-    $create_query .= ';' . $crlf;
-    if (!PMA_exportOutputHandler($create_query)) {
-        return false;
-    }
-    if (isset($GLOBALS['sql_backquotes']) && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') {
-        $result = PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
-    } else {
-        $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
-    }
-
-    return $result;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    $head = PMA_exportComment()
-          . PMA_exportComment(__('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
-          . PMA_exportComment();
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    global $crlf;
-
-    $result = true;
-    if (isset($GLOBALS['sql_constraints'])) {
-        $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
-        unset($GLOBALS['sql_constraints']);
-    }
-
-    if (($GLOBALS['sql_structure_or_data'] == 'structure' || $GLOBALS['sql_structure_or_data'] == 'structure_and_data') && isset($GLOBALS['sql_procedure_function'])) {
         $text = '';
         $delimiter = '$$';
 
-        if (PMA_MYSQL_INT_VERSION > 50100) {
-            $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
-        } else {
-            $event_names = array();
+        $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
+        $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
+
+        if ($procedure_names || $function_names) {
+            $text .= $crlf
+                . 'DELIMITER ' . $delimiter . $crlf;
         }
 
-        if ($event_names) {
-            $text .= $crlf
-              . 'DELIMITER ' . $delimiter . $crlf;
-
+        if ($procedure_names) {
             $text .=
                 PMA_exportComment()
-              . PMA_exportComment(__('Events'))
+              . PMA_exportComment(__('Procedures'))
               . PMA_exportComment();
 
-            foreach ($event_names as $event_name) {
+            foreach ($procedure_names as $procedure_name) {
                 if (! empty($GLOBALS['sql_drop_table'])) {
-            $text .= 'DROP EVENT ' . PMA_backquote($event_name) . $delimiter . $crlf;
+                    $text .= 'DROP PROCEDURE IF EXISTS '
+                        . PMA_backquote($procedure_name)
+                        . $delimiter . $crlf;
                 }
-                $text .= PMA_DBI_get_definition($db, 'EVENT', $event_name) . $delimiter . $crlf . $crlf;
+                $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name)
+                    . $delimiter . $crlf . $crlf;
             }
+        }
 
+        if ($function_names) {
+            $text .=
+                PMA_exportComment()
+              . PMA_exportComment(__('Functions'))
+              . PMA_exportComment();
+
+            foreach ($function_names as $function_name) {
+                if (! empty($GLOBALS['sql_drop_table'])) {
+                    $text .= 'DROP FUNCTION IF EXISTS '
+                        . PMA_backquote($function_name)
+                        . $delimiter . $crlf;
+                }
+                $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name)
+                    . $delimiter . $crlf . $crlf;
+            }
+        }
+
+        if ($procedure_names || $function_names) {
             $text .= 'DELIMITER ;' . $crlf;
         }
 
         if (! empty($text)) {
-            $result = PMA_exportOutputHandler($text);
+            return PMA_exportOutputHandler($text);
+        } else {
+            return false;
         }
     }
-    return $result;
-}
 
-/**
- * Returns a stand-in CREATE definition to resolve view dependencies
- *
- * @param string  $db    the database name
- * @param string  $view  the view name
- * @param string  $crlf  the end of line sequence
- * @return  string         resulting definition
- *
- * @access  public
- */
-function PMA_getTableDefStandIn($db, $view, $crlf) {
-    $create_query = '';
-    if (! empty($GLOBALS['sql_drop_table'])) {
-        $create_query .= 'DROP VIEW IF EXISTS ' . PMA_backquote($view) . ';' . $crlf;
-    }
-
-    $create_query .= 'CREATE TABLE ';
-
-    if (isset($GLOBALS['sql_if_not_exists']) && $GLOBALS['sql_if_not_exists']) {
-        $create_query .= 'IF NOT EXISTS ';
-    }
-    $create_query .= PMA_backquote($view) . ' (' . $crlf;
-    $tmp = array();
-    $columns = PMA_DBI_get_columns_full($db, $view);
-    foreach ($columns as $column_name => $definition) {
-        $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf;
-    }
-    $create_query .= implode(',', $tmp) . ');';
-    return($create_query);
-}
-
-/**
- * Returns $table's CREATE definition
- *
- * @param string  $db             the database name
- * @param string  $table          the table name
- * @param string  $crlf           the end of line sequence
- * @param string  $error_url      the url to go back in case of error
- * @param bool    $show_dates     whether to include creation/update/check dates
- * @param bool    $add_semicolon  whether to add semicolon and end-of-line at the end
- * @param bool    $view           whether we're handling a view
- * @return  string   resulting schema
- *
- * @access  public
- */
-function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
-{
-    global $sql_drop_table;
-    global $sql_backquotes;
-    global $sql_constraints_query; // just the text of the query
-    global $sql_drop_foreign_keys;
-
-    $schema_create = '';
-    $auto_increment = '';
-    $new_crlf = $crlf;
-
-    // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
-    $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE);
-    if ($result != false) {
-        if (PMA_DBI_num_rows($result) > 0) {
-            $tmpres        = PMA_DBI_fetch_assoc($result);
-            // Here we optionally add the AUTO_INCREMENT next value,
-            // but starting with MySQL 5.0.24, the clause is already included
-            // in SHOW CREATE TABLE so we'll remove it below
-            if (isset($GLOBALS['sql_auto_increment']) && !empty($tmpres['Auto_increment'])) {
-                $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' ';
-            }
-
-            if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) {
-                $schema_create .= PMA_exportComment(__('Creation') . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
-
-            if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) {
-                $schema_create .= PMA_exportComment(__('Last update') . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
-
-            if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) {
-                $schema_create .= PMA_exportComment(__('Last check') . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
+    /**
+     * Possibly outputs comment
+     *
+     * @param string  $text  Text of comment
+     * @return  string      The formatted comment
+     *
+     * @access  private
+     */
+    function PMA_exportComment($text = '')
+    {
+        if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
+            // see http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html
+            return '--' . (empty($text) ? '' : ' ') . $text . $GLOBALS['crlf'];
+        } else {
+            return '';
         }
-        PMA_DBI_free_result($result);
     }
 
-    $schema_create .= $new_crlf;
-
-    // no need to generate a DROP VIEW here, it was done earlier
-    if (! empty($sql_drop_table) && ! PMA_Table::isView($db,$table)) {
-        $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf;
+    /**
+     * Possibly outputs CRLF
+     *
+     * @return  string  $crlf or nothing
+     *
+     * @access private
+     */
+    function PMA_possibleCRLF()
+    {
+        if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
+            return $GLOBALS['crlf'];
+        } else {
+            return '';
+        }
     }
 
-    // Complete table dump,
-    // Whether to quote table and fields names or not
-    if ($sql_backquotes) {
-        PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1');
-    } else {
-        PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 0');
-    }
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        global $crlf;
+        global $mysql_charset_map;
 
-    // I don't see the reason why this unbuffered query could cause problems,
-    // because SHOW CREATE TABLE returns only one row, and we free the
-    // results below. Nonetheless, we got 2 user reports about this
-    // (see bug 1562533) so I remove the unbuffered mode.
-    //$result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), null, PMA_DBI_QUERY_UNBUFFERED);
-    //
-    // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
-    // produce a displayable result for the default value of a BIT
-    // field, nor does the mysqldump command. See MySQL bug 35796
-    $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table));
-    // an error can happen, for example the table is crashed
-    $tmp_error = PMA_DBI_getError();
-    if ($tmp_error) {
-        return PMA_exportComment(__('in use') . '(' . $tmp_error . ')');
-    }
+        $foot = '';
 
-    if ($result != false && ($row = PMA_DBI_fetch_row($result))) {
-        $create_query = $row[1];
-        unset($row);
-
-        // Convert end of line chars to one that we want (note that MySQL doesn't return query it will accept in all cases)
-        if (strpos($create_query, "(\r\n ")) {
-            $create_query = str_replace("\r\n", $crlf, $create_query);
-        } elseif (strpos($create_query, "(\n ")) {
-            $create_query = str_replace("\n", $crlf, $create_query);
-        } elseif (strpos($create_query, "(\r ")) {
-            $create_query = str_replace("\r", $crlf, $create_query);
+        if (isset($GLOBALS['sql_disable_fk'])) {
+            $foot .=  'SET FOREIGN_KEY_CHECKS=1;' . $crlf;
         }
 
-        /*
-         * Drop database name from VIEW creation.
-         *
-         * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
-         * database name, but we don't want name to show up in CREATE VIEW
-         * statement.
-         */
-        if ($view) {
-            $create_query = preg_replace('/' . PMA_backquote($db) . '\./', '', $create_query);
+        if (isset($GLOBALS['sql_use_transaction'])) {
+            $foot .=  'COMMIT;' . $crlf;
         }
 
-        // Should we use IF NOT EXISTS?
-        if (isset($GLOBALS['sql_if_not_exists'])) {
-            $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
+        // restore connection settings
+        $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
+        if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
+            $foot .=  $crlf
+                    . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
+                    . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf
+                    . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf;
         }
 
-        // are there any constraints to cut out?
-        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query)) {
+        /* Restore timezone */
+        if ($GLOBALS['sql_utc_time']) {
+            PMA_DBI_query('SET time_zone = "' . $GLOBALS['old_tz'] . '"');
+        }
 
-            // Split the query into lines, so we can easily handle it. We know lines are separated by $crlf (done few lines above).
-            $sql_lines = explode($crlf, $create_query);
-            $sql_count = count($sql_lines);
+        return PMA_exportOutputHandler($foot);
+    }
 
-            // lets find first line with constraints
-            for ($i = 0; $i < $sql_count; $i++) {
-                if (preg_match('@^[\s]*(CONSTRAINT|FOREIGN[\s]+KEY)@', $sql_lines[$i])) {
-                    break;
-                }
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        global $crlf;
+        global $cfg;
+        global $mysql_charset_map;
+
+        if (isset($GLOBALS['sql_compatibility'])) {
+            $tmp_compat = $GLOBALS['sql_compatibility'];
+            if ($tmp_compat == 'NONE') {
+                $tmp_compat = '';
+            }
+            PMA_DBI_try_query('SET SQL_MODE="' . $tmp_compat . '"');
+            unset($tmp_compat);
+        }
+        $head  =  PMA_exportComment('phpMyAdmin SQL Dump')
+               .  PMA_exportComment('version ' . PMA_VERSION)
+               .  PMA_exportComment('http://www.phpmyadmin.net')
+               .  PMA_exportComment();
+        $host_string = __('Host') . ': ' .  $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+            $host_string .= ':' . $cfg['Server']['port'];
+        }
+        $head .= PMA_exportComment($host_string);
+        $head .= PMA_exportComment(__('Generation Time')
+              . ': ' .  PMA_localisedDate())
+              .  PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION)
+              .  PMA_exportComment(__('PHP Version') . ': ' . phpversion())
+              .  PMA_possibleCRLF();
+
+        if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) {
+            // '\n' is not a newline (like "\n" would be), it's the characters
+            // backslash and n, as explained on the export interface
+            $lines = explode('\n', $GLOBALS['sql_header_comment']);
+            $head .= PMA_exportComment();
+            foreach ($lines as $one_line) {
+                $head .= PMA_exportComment($one_line);
+            }
+            $head .= PMA_exportComment();
+        }
+
+        if (isset($GLOBALS['sql_disable_fk'])) {
+            $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf;
+        }
+
+        /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */
+        if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') {
+            $head .= 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf;
+        }
+
+        if (isset($GLOBALS['sql_use_transaction'])) {
+            $head .= 'SET AUTOCOMMIT=0;' . $crlf
+                   . 'START TRANSACTION;' . $crlf;
+        }
+
+
+        /* Change timezone if we should export timestamps in UTC */
+        if ($GLOBALS['sql_utc_time']) {
+            $head .= 'SET time_zone = "+00:00";' . $crlf;
+            $GLOBALS['old_tz'] = PMA_DBI_fetch_value('SELECT @@session.time_zone');
+            PMA_DBI_query('SET time_zone = "+00:00"');
+        }
+
+        $head .= PMA_possibleCRLF();
+
+        if (! empty($GLOBALS['asfile'])) {
+            // we are saving as file, therefore we provide charset information
+            // so that a utility like the mysql client can interpret
+            // the file correctly
+            if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
+                // we got a charset from the export dialog
+                $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
+            } else {
+                // by default we use the connection charset
+                $set_names = $mysql_charset_map['utf-8'];
+            }
+            $head .=  $crlf
+                   . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf
+                   . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;' . $crlf
+                   . '/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;' . $crlf
+                   . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
+        }
+
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        global $crlf;
+        if (isset($GLOBALS['sql_drop_database'])) {
+            if (!PMA_exportOutputHandler('DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db) . ';' . $crlf)) {
+                return false;
+            }
+        }
+        $create_query = 'CREATE DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db);
+        $collation = PMA_getDbCollation($db);
+        if (strpos($collation, '_')) {
+            $create_query .= ' DEFAULT CHARACTER SET ' . substr($collation, 0, strpos($collation, '_')) . ' COLLATE ' . $collation;
+        } else {
+            $create_query .= ' DEFAULT CHARACTER SET ' . $collation;
+        }
+        $create_query .= ';' . $crlf;
+        if (!PMA_exportOutputHandler($create_query)) {
+            return false;
+        }
+        if (isset($GLOBALS['sql_backquotes']) && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') {
+            $result = PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
+        } else {
+            $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        $head = PMA_exportComment()
+              . PMA_exportComment(__('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
+              . PMA_exportComment();
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        global $crlf;
+
+        $result = true;
+        if (isset($GLOBALS['sql_constraints'])) {
+            $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
+            unset($GLOBALS['sql_constraints']);
+        }
+
+        if (($GLOBALS['sql_structure_or_data'] == 'structure' || $GLOBALS['sql_structure_or_data'] == 'structure_and_data') && isset($GLOBALS['sql_procedure_function'])) {
+            $text = '';
+            $delimiter = '$$';
+
+            if (PMA_MYSQL_INT_VERSION > 50100) {
+                $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
+            } else {
+                $event_names = array();
             }
 
-            // If we really found a constraint
-            if ($i != $sql_count) {
+            if ($event_names) {
+                $text .= $crlf
+                  . 'DELIMITER ' . $delimiter . $crlf;
 
-                // remove , from the end of create statement
-                $sql_lines[$i - 1] = preg_replace('@,$@', '', $sql_lines[$i - 1]);
+                $text .=
+                    PMA_exportComment()
+                  . PMA_exportComment(__('Events'))
+                  . PMA_exportComment();
 
-                // prepare variable for constraints
-                if (!isset($sql_constraints)) {
-                    if (isset($GLOBALS['no_constraints_comments'])) {
-                        $sql_constraints = '';
-                    } else {
-                        $sql_constraints = $crlf
-                                         . PMA_exportComment()
-                                         . PMA_exportComment(__('Constraints for dumped tables'))
-                                         . PMA_exportComment();
+                foreach ($event_names as $event_name) {
+                    if (! empty($GLOBALS['sql_drop_table'])) {
+                $text .= 'DROP EVENT ' . PMA_backquote($event_name) . $delimiter . $crlf;
                     }
+                    $text .= PMA_DBI_get_definition($db, 'EVENT', $event_name) . $delimiter . $crlf . $crlf;
                 }
 
-                // comments for current table
-                if (!isset($GLOBALS['no_constraints_comments'])) {
-                    $sql_constraints .= $crlf
-                                      . PMA_exportComment()
-                                      . PMA_exportComment(__('Constraints for table') . ' ' . PMA_backquote($table))
-                                      . PMA_exportComment();
+                $text .= 'DELIMITER ;' . $crlf;
+            }
+
+            if (! empty($text)) {
+                $result = PMA_exportOutputHandler($text);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Returns a stand-in CREATE definition to resolve view dependencies
+     *
+     * @param string  $db    the database name
+     * @param string  $view  the view name
+     * @param string  $crlf  the end of line sequence
+     * @return  string         resulting definition
+     *
+     * @access  public
+     */
+    function PMA_getTableDefStandIn($db, $view, $crlf) {
+        $create_query = '';
+        if (! empty($GLOBALS['sql_drop_table'])) {
+            $create_query .= 'DROP VIEW IF EXISTS ' . PMA_backquote($view) . ';' . $crlf;
+        }
+
+        $create_query .= 'CREATE TABLE ';
+
+        if (isset($GLOBALS['sql_if_not_exists']) && $GLOBALS['sql_if_not_exists']) {
+            $create_query .= 'IF NOT EXISTS ';
+        }
+        $create_query .= PMA_backquote($view) . ' (' . $crlf;
+        $tmp = array();
+        $columns = PMA_DBI_get_columns_full($db, $view);
+        foreach ($columns as $column_name => $definition) {
+            $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf;
+        }
+        $create_query .= implode(',', $tmp) . ');';
+        return($create_query);
+    }
+
+    /**
+     * Returns $table's CREATE definition
+     *
+     * @param string  $db             the database name
+     * @param string  $table          the table name
+     * @param string  $crlf           the end of line sequence
+     * @param string  $error_url      the url to go back in case of error
+     * @param bool    $show_dates     whether to include creation/update/check dates
+     * @param bool    $add_semicolon  whether to add semicolon and end-of-line at the end
+     * @param bool    $view           whether we're handling a view
+     * @return  string   resulting schema
+     *
+     * @access  public
+     */
+    function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
+    {
+        global $sql_drop_table;
+        global $sql_backquotes;
+        global $sql_constraints_query; // just the text of the query
+        global $sql_drop_foreign_keys;
+
+        $schema_create = '';
+        $auto_increment = '';
+        $new_crlf = $crlf;
+
+        // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
+        $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE);
+        if ($result != false) {
+            if (PMA_DBI_num_rows($result) > 0) {
+                $tmpres        = PMA_DBI_fetch_assoc($result);
+                // Here we optionally add the AUTO_INCREMENT next value,
+                // but starting with MySQL 5.0.24, the clause is already included
+                // in SHOW CREATE TABLE so we'll remove it below
+                if (isset($GLOBALS['sql_auto_increment']) && !empty($tmpres['Auto_increment'])) {
+                    $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' ';
                 }
 
-                // let's do the work
-                $sql_constraints_query .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
-                $sql_constraints .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
-                $sql_drop_foreign_keys .= 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf;
+                if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) {
+                    $schema_create .= PMA_exportComment(__('Creation') . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
 
-                $first = true;
-                for ($j = $i; $j < $sql_count; $j++) {
-                    if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $sql_lines[$j])) {
-                        if (!$first) {
-                            $sql_constraints .= $crlf;
-                        }
-                        if (strpos($sql_lines[$j], 'CONSTRAINT') === false) {
-                            $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $tmp_str;
-                            $sql_constraints .= $tmp_str;
-                        } else {
-                            $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $tmp_str;
-                            $sql_constraints .= $tmp_str;
-                            preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
-                            if (! $first) {
-                                $sql_drop_foreign_keys .= ', ';
-                            }
-                            $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' . $matches[3];
-                        }
-                        $first = false;
-                    } else {
+                if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) {
+                    $schema_create .= PMA_exportComment(__('Last update') . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
+
+                if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) {
+                    $schema_create .= PMA_exportComment(__('Last check') . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
+            }
+            PMA_DBI_free_result($result);
+        }
+
+        $schema_create .= $new_crlf;
+
+        // no need to generate a DROP VIEW here, it was done earlier
+        if (! empty($sql_drop_table) && ! PMA_Table::isView($db,$table)) {
+            $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf;
+        }
+
+        // Complete table dump,
+        // Whether to quote table and fields names or not
+        if ($sql_backquotes) {
+            PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1');
+        } else {
+            PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 0');
+        }
+
+        // I don't see the reason why this unbuffered query could cause problems,
+        // because SHOW CREATE TABLE returns only one row, and we free the
+        // results below. Nonetheless, we got 2 user reports about this
+        // (see bug 1562533) so I remove the unbuffered mode.
+        //$result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), null, PMA_DBI_QUERY_UNBUFFERED);
+        //
+        // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
+        // produce a displayable result for the default value of a BIT
+        // field, nor does the mysqldump command. See MySQL bug 35796
+        $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table));
+        // an error can happen, for example the table is crashed
+        $tmp_error = PMA_DBI_getError();
+        if ($tmp_error) {
+            return PMA_exportComment(__('in use') . '(' . $tmp_error . ')');
+        }
+
+        if ($result != false && ($row = PMA_DBI_fetch_row($result))) {
+            $create_query = $row[1];
+            unset($row);
+
+            // Convert end of line chars to one that we want (note that MySQL doesn't return query it will accept in all cases)
+            if (strpos($create_query, "(\r\n ")) {
+                $create_query = str_replace("\r\n", $crlf, $create_query);
+            } elseif (strpos($create_query, "(\n ")) {
+                $create_query = str_replace("\n", $crlf, $create_query);
+            } elseif (strpos($create_query, "(\r ")) {
+                $create_query = str_replace("\r", $crlf, $create_query);
+            }
+
+            /*
+             * Drop database name from VIEW creation.
+             *
+             * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
+             * database name, but we don't want name to show up in CREATE VIEW
+             * statement.
+             */
+            if ($view) {
+                $create_query = preg_replace('/' . PMA_backquote($db) . '\./', '', $create_query);
+            }
+
+            // Should we use IF NOT EXISTS?
+            if (isset($GLOBALS['sql_if_not_exists'])) {
+                $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
+            }
+
+            // are there any constraints to cut out?
+            if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query)) {
+
+                // Split the query into lines, so we can easily handle it. We know lines are separated by $crlf (done few lines above).
+                $sql_lines = explode($crlf, $create_query);
+                $sql_count = count($sql_lines);
+
+                // lets find first line with constraints
+                for ($i = 0; $i < $sql_count; $i++) {
+                    if (preg_match('@^[\s]*(CONSTRAINT|FOREIGN[\s]+KEY)@', $sql_lines[$i])) {
                         break;
                     }
                 }
-                $sql_constraints .= ';' . $crlf;
-                $sql_constraints_query .= ';';
 
-                $create_query = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
-                unset($sql_lines);
-            }
-        }
-        $schema_create .= $create_query;
-    }
+                // If we really found a constraint
+                if ($i != $sql_count) {
 
-    // remove a possible "AUTO_INCREMENT = value" clause
-    // that could be there starting with MySQL 5.0.24
-    $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create);
+                    // remove , from the end of create statement
+                    $sql_lines[$i - 1] = preg_replace('@,$@', '', $sql_lines[$i - 1]);
 
-    $schema_create .= $auto_increment;
+                    // prepare variable for constraints
+                    if (!isset($sql_constraints)) {
+                        if (isset($GLOBALS['no_constraints_comments'])) {
+                            $sql_constraints = '';
+                        } else {
+                            $sql_constraints = $crlf
+                                             . PMA_exportComment()
+                                             . PMA_exportComment(__('Constraints for dumped tables'))
+                                             . PMA_exportComment();
+                        }
+                    }
 
-    PMA_DBI_free_result($result);
-    return $schema_create . ($add_semicolon ? ';' . $crlf : '');
-} // end of the 'PMA_getTableDef()' function
+                    // comments for current table
+                    if (!isset($GLOBALS['no_constraints_comments'])) {
+                        $sql_constraints .= $crlf
+                                          . PMA_exportComment()
+                                          . PMA_exportComment(__('Constraints for table') . ' ' . PMA_backquote($table))
+                                          . PMA_exportComment();
+                    }
 
-/**
- * Returns $table's comments, relations etc.
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         end of line sequence
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_mime      whether to include mime comments
- * @return  string   resulting comments
- *
- * @access  private
- */
-function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
-{
-    global $cfgRelation;
-    global $sql_backquotes;
-    global $sql_constraints;
+                    // let's do the work
+                    $sql_constraints_query .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
+                    $sql_constraints .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
+                    $sql_drop_foreign_keys .= 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf;
 
-    $schema_create = '';
+                    $first = true;
+                    for ($j = $i; $j < $sql_count; $j++) {
+                        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $sql_lines[$j])) {
+                            if (!$first) {
+                                $sql_constraints .= $crlf;
+                            }
+                            if (strpos($sql_lines[$j], 'CONSTRAINT') === false) {
+                                $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
+                                $sql_constraints_query .= $tmp_str;
+                                $sql_constraints .= $tmp_str;
+                            } else {
+                                $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
+                                $sql_constraints_query .= $tmp_str;
+                                $sql_constraints .= $tmp_str;
+                                preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
+                                if (! $first) {
+                                    $sql_drop_foreign_keys .= ', ';
+                                }
+                                $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' . $matches[3];
+                            }
+                            $first = false;
+                        } else {
+                            break;
+                        }
+                    }
+                    $sql_constraints .= ';' . $crlf;
+                    $sql_constraints_query .= ';';
 
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    if ($do_mime && $cfgRelation['mimework']) {
-        if (!($mime_map = PMA_getMIME($db, $table, true))) {
-            unset($mime_map);
-        }
-    }
-
-    if (isset($mime_map) && count($mime_map) > 0) {
-        $schema_create .= PMA_possibleCRLF()
-                       . PMA_exportComment()
-                       . PMA_exportComment(__('MIME TYPES FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
-        @reset($mime_map);
-        foreach ($mime_map AS $mime_field => $mime) {
-            $schema_create .= PMA_exportComment('  ' . PMA_backquote($mime_field, $sql_backquotes))
-                            . PMA_exportComment('      ' . PMA_backquote($mime['mimetype'], $sql_backquotes));
-        }
-        $schema_create .= PMA_exportComment();
-    }
-
-    if ($have_rel) {
-        $schema_create .= PMA_possibleCRLF()
-                       . PMA_exportComment()
-                       . PMA_exportComment(__('RELATIONS FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
-        foreach ($res_rel AS $rel_field => $rel) {
-            $schema_create .= PMA_exportComment('  ' . PMA_backquote($rel_field, $sql_backquotes))
-                            . PMA_exportComment('      ' . PMA_backquote($rel['foreign_table'], $sql_backquotes)
-                            . ' -> ' . PMA_backquote($rel['foreign_field'], $sql_backquotes));
-        }
-        $schema_create .= PMA_exportComment();
-    }
-
-    return $schema_create;
-
-} // end of the 'PMA_getTableComments()' function
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $relation     whether to include relation comments
- * @param bool    $comments     whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $mime         whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, $comments = false, $mime = false, $dates = false, $export_mode, $export_type)
-{
-    $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
-                          ? PMA_backquote($table)
-                          : '\'' . $table . '\'';
-    $dump = PMA_possibleCRLF()
-          . PMA_exportComment(str_repeat('-', 56))
-          . PMA_possibleCRLF()
-          . PMA_exportComment();
-
-    switch($export_mode) {
-        case 'create_table':
-            $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name);
-            $dump .= PMA_exportComment();
-            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
-            $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
-            break;
-        case 'triggers':
-            $dump = '';
-            $triggers = PMA_DBI_get_triggers($db, $table);
-            if ($triggers) {
-                $dump .=  PMA_possibleCRLF()
-                        . PMA_exportComment()
-                        . PMA_exportComment(__('Triggers') . ' ' . $formatted_table_name)
-                        . PMA_exportComment();
-                $delimiter = '//';
-                foreach ($triggers as $trigger) {
-                    $dump .= $trigger['drop'] . ';' . $crlf;
-                    $dump .= 'DELIMITER ' . $delimiter . $crlf;
-                    $dump .= $trigger['create'];
-                    $dump .= 'DELIMITER ;' . $crlf;
+                    $create_query = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
+                    unset($sql_lines);
                 }
             }
-            break;
-        case 'create_view':
-            $dump .= PMA_exportComment(__('Structure for view') . ' ' . $formatted_table_name)
-                   . PMA_exportComment();
-            // delete the stand-in table previously created (if any)
-            if ($export_type != 'table') {
-                $dump .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table) . ';' . $crlf;
-            }
-            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
-            break;
-        case 'stand_in':
-            $dump .=  PMA_exportComment(__('Stand-in structure for view') . ' ' . $formatted_table_name)
-                    . PMA_exportComment();
-            // export a stand-in definition to resolve view dependencies
-            $dump .= PMA_getTableDefStandIn($db, $table, $crlf);
-    } // end switch
-
-    // this one is built by PMA_getTableDef() to use in table copy/move
-    // but not in the case of export
-    unset($GLOBALS['sql_constraints_query']);
-
-    return PMA_exportOutputHandler($dump);
-}
-
-/**
- * Outputs the content of a table in SQL format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $sql_backquotes;
-    global $current_row;
-
-    $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
-                          ? PMA_backquote($table)
-                          : '\'' . $table . '\'';
-
-    // Do not export data for a VIEW
-    // (For a VIEW, this is called only when exporting a single VIEW)
-    if (PMA_Table::isView($db, $table)) {
-        $head = PMA_possibleCRLF()
-          . PMA_exportComment()
-          . PMA_exportComment('VIEW ' . ' ' . $formatted_table_name)
-          . PMA_exportComment(__('Data') . ': ' . __('None'))
-          . PMA_exportComment()
-          . PMA_possibleCRLF();
-
-        if (! PMA_exportOutputHandler($head)) {
-            return false;
+            $schema_create .= $create_query;
         }
-        return true;
+
+        // remove a possible "AUTO_INCREMENT = value" clause
+        // that could be there starting with MySQL 5.0.24
+        $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create);
+
+        $schema_create .= $auto_increment;
+
+        PMA_DBI_free_result($result);
+        return $schema_create . ($add_semicolon ? ';' . $crlf : '');
+    } // end of the 'PMA_getTableDef()' function
+
+    /**
+     * Returns $table's comments, relations etc.
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         end of line sequence
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_mime      whether to include mime comments
+     * @return  string   resulting comments
+     *
+     * @access  private
+     */
+    function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
+    {
+        global $cfgRelation;
+        global $sql_backquotes;
+        global $sql_constraints;
+
+        $schema_create = '';
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
+            } else {
+                $have_rel = false;
+            }
+        } else {
+               $have_rel = false;
+        } // end if
+
+        if ($do_mime && $cfgRelation['mimework']) {
+            if (!($mime_map = PMA_getMIME($db, $table, true))) {
+                unset($mime_map);
+            }
+        }
+
+        if (isset($mime_map) && count($mime_map) > 0) {
+            $schema_create .= PMA_possibleCRLF()
+                           . PMA_exportComment()
+                           . PMA_exportComment(__('MIME TYPES FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
+            @reset($mime_map);
+            foreach ($mime_map AS $mime_field => $mime) {
+                $schema_create .= PMA_exportComment('  ' . PMA_backquote($mime_field, $sql_backquotes))
+                                . PMA_exportComment('      ' . PMA_backquote($mime['mimetype'], $sql_backquotes));
+            }
+            $schema_create .= PMA_exportComment();
+        }
+
+        if ($have_rel) {
+            $schema_create .= PMA_possibleCRLF()
+                           . PMA_exportComment()
+                           . PMA_exportComment(__('RELATIONS FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
+            foreach ($res_rel AS $rel_field => $rel) {
+                $schema_create .= PMA_exportComment('  ' . PMA_backquote($rel_field, $sql_backquotes))
+                                . PMA_exportComment('      ' . PMA_backquote($rel['foreign_table'], $sql_backquotes)
+                                . ' -> ' . PMA_backquote($rel['foreign_field'], $sql_backquotes));
+            }
+            $schema_create .= PMA_exportComment();
+        }
+
+        return $schema_create;
+
+    } // end of the 'PMA_getTableComments()' function
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $relation     whether to include relation comments
+     * @param bool    $comments     whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $mime         whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, $comments = false, $mime = false, $dates = false, $export_mode, $export_type)
+    {
+        $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
+                              ? PMA_backquote($table)
+                              : '\'' . $table . '\'';
+        $dump = PMA_possibleCRLF()
+              . PMA_exportComment(str_repeat('-', 56))
+              . PMA_possibleCRLF()
+              . PMA_exportComment();
+
+        switch($export_mode) {
+            case 'create_table':
+                $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name);
+                $dump .= PMA_exportComment();
+                $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
+                $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
+                break;
+            case 'triggers':
+                $dump = '';
+                $triggers = PMA_DBI_get_triggers($db, $table);
+                if ($triggers) {
+                    $dump .=  PMA_possibleCRLF()
+                            . PMA_exportComment()
+                            . PMA_exportComment(__('Triggers') . ' ' . $formatted_table_name)
+                            . PMA_exportComment();
+                    $delimiter = '//';
+                    foreach ($triggers as $trigger) {
+                        $dump .= $trigger['drop'] . ';' . $crlf;
+                        $dump .= 'DELIMITER ' . $delimiter . $crlf;
+                        $dump .= $trigger['create'];
+                        $dump .= 'DELIMITER ;' . $crlf;
+                    }
+                }
+                break;
+            case 'create_view':
+                $dump .= PMA_exportComment(__('Structure for view') . ' ' . $formatted_table_name)
+                       . PMA_exportComment();
+                // delete the stand-in table previously created (if any)
+                if ($export_type != 'table') {
+                    $dump .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table) . ';' . $crlf;
+                }
+                $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
+                break;
+            case 'stand_in':
+                $dump .=  PMA_exportComment(__('Stand-in structure for view') . ' ' . $formatted_table_name)
+                        . PMA_exportComment();
+                // export a stand-in definition to resolve view dependencies
+                $dump .= PMA_getTableDefStandIn($db, $table, $crlf);
+        } // end switch
+
+        // this one is built by PMA_getTableDef() to use in table copy/move
+        // but not in the case of export
+        unset($GLOBALS['sql_constraints_query']);
+
+        return PMA_exportOutputHandler($dump);
     }
 
-    // analyze the query to get the true column names, not the aliases
-    // (this fixes an undefined index, also if Complete inserts
-    //  are used, we did not get the true column name in case of aliases)
-    $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($sql_query));
+    /**
+     * Outputs the content of a table in SQL format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $sql_backquotes;
+        global $current_row;
 
-    $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    // a possible error: the table has crashed
-    $tmp_error = PMA_DBI_getError();
-    if ($tmp_error) {
-        return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')'));
-    }
+        $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
+                              ? PMA_backquote($table)
+                              : '\'' . $table . '\'';
 
-    if ($result != false) {
-        $fields_cnt = PMA_DBI_num_fields($result);
+        // Do not export data for a VIEW
+        // (For a VIEW, this is called only when exporting a single VIEW)
+        if (PMA_Table::isView($db, $table)) {
+            $head = PMA_possibleCRLF()
+              . PMA_exportComment()
+              . PMA_exportComment('VIEW ' . ' ' . $formatted_table_name)
+              . PMA_exportComment(__('Data') . ': ' . __('None'))
+              . PMA_exportComment()
+              . PMA_possibleCRLF();
 
-        // Get field information
-        $fields_meta = PMA_DBI_get_fields_meta($result);
-        $field_flags = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+            if (! PMA_exportOutputHandler($head)) {
+                return false;
+            }
+            return true;
         }
 
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (isset($analyzed_sql[0]['select_expr'][$j]['column'])) {
-                $field_set[$j] = PMA_backquote($analyzed_sql[0]['select_expr'][$j]['column'], $sql_backquotes);
-            } else {
-                $field_set[$j] = PMA_backquote($fields_meta[$j]->name, $sql_backquotes);
-            }
+        // analyze the query to get the true column names, not the aliases
+        // (this fixes an undefined index, also if Complete inserts
+        //  are used, we did not get the true column name in case of aliases)
+        $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($sql_query));
+
+        $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        // a possible error: the table has crashed
+        $tmp_error = PMA_DBI_getError();
+        if ($tmp_error) {
+            return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')'));
         }
 
-        if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
-            // update
-            $schema_insert  = 'UPDATE ';
-            if (isset($GLOBALS['sql_ignore'])) {
-                $schema_insert .= 'IGNORE ';
+        if ($result != false) {
+            $fields_cnt = PMA_DBI_num_fields($result);
+
+            // Get field information
+            $fields_meta = PMA_DBI_get_fields_meta($result);
+            $field_flags = array();
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                $field_flags[$j] = PMA_DBI_field_flags($result, $j);
             }
-            // avoid EOL blank
-            $schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET';
-        } else {
-            // insert or replace
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') {
-                $sql_command = 'REPLACE';
+
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (isset($analyzed_sql[0]['select_expr'][$j]['column'])) {
+                    $field_set[$j] = PMA_backquote($analyzed_sql[0]['select_expr'][$j]['column'], $sql_backquotes);
+                } else {
+                    $field_set[$j] = PMA_backquote($fields_meta[$j]->name, $sql_backquotes);
+                }
+            }
+
+            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
+                // update
+                $schema_insert  = 'UPDATE ';
+                if (isset($GLOBALS['sql_ignore'])) {
+                    $schema_insert .= 'IGNORE ';
+                }
+                // avoid EOL blank
+                $schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET';
             } else {
-                $sql_command = 'INSERT';
+                // insert or replace
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') {
+                    $sql_command = 'REPLACE';
+                } else {
+                    $sql_command = 'INSERT';
+                }
+
+                // delayed inserts?
+                if (isset($GLOBALS['sql_delayed'])) {
+                    $insert_delayed = ' DELAYED';
+                } else {
+                    $insert_delayed = '';
+                }
+
+                // insert ignore?
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'INSERT' && isset($GLOBALS['sql_ignore'])) {
+                    $insert_delayed .= ' IGNORE';
+                }
+
+                // scheme for inserting fields
+                if ($GLOBALS['sql_insert_syntax'] == 'complete' || $GLOBALS['sql_insert_syntax'] == 'both') {
+                    $fields        = implode(', ', $field_set);
+                    $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
+                // avoid EOL blank
+                                   . ' (' . $fields . ') VALUES';
+                } else {
+                    $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
+                                   . ' VALUES';
+                }
             }
 
-            // delayed inserts?
-            if (isset($GLOBALS['sql_delayed'])) {
-                $insert_delayed = ' DELAYED';
+            $search      = array("\x00", "\x0a", "\x0d", "\x1a"); //\x08\\x09, not required
+            $replace     = array('\0', '\n', '\r', '\Z');
+            $current_row = 0;
+            $query_size  = 0;
+            if (($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') && (!isset($GLOBALS['sql_type']) || $GLOBALS['sql_type'] != 'UPDATE')) {
+                $separator    = ',';
+                $schema_insert .= $crlf;
             } else {
-                $insert_delayed = '';
+                $separator    = ';';
             }
 
-            // insert ignore?
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'INSERT' && isset($GLOBALS['sql_ignore'])) {
-                $insert_delayed .= ' IGNORE';
-            }
+            while ($row = PMA_DBI_fetch_row($result)) {
+                if ($current_row == 0) {
+                    $head = PMA_possibleCRLF()
+                          . PMA_exportComment()
+                          . PMA_exportComment(__('Dumping data for table') . ' ' . $formatted_table_name)
+                          . PMA_exportComment()
+                          . $crlf;
+                    if (! PMA_exportOutputHandler($head)) {
+                        return false;
+                    }
+                }
+                $current_row++;
+                for ($j = 0; $j < $fields_cnt; $j++) {
+                    // NULL
+                    if (!isset($row[$j]) || is_null($row[$j])) {
+                        $values[] = 'NULL';
+                    // a number
+                    // timestamp is numeric on some MySQL 4.1, BLOBs are sometimes numeric
+                    } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp'
+                            && ! $fields_meta[$j]->blob) {
+                        $values[] = $row[$j];
+                    // a true BLOB
+                    // - mysqldump only generates hex data when the --hex-blob
+                    //   option is used, for fields having the binary attribute
+                    //   no hex is generated
+                    // - a TEXT field returns type blob but a real blob
+                    //   returns also the 'binary' flag
+                    } elseif (stristr($field_flags[$j], 'BINARY')
+                            && $fields_meta[$j]->blob
+                            && isset($GLOBALS['sql_hex_for_blob'])) {
+                        // empty blobs need to be different, but '0' is also empty :-(
+                        if (empty($row[$j]) && $row[$j] != '0') {
+                            $values[] = '\'\'';
+                        } else {
+                            $values[] = '0x' . bin2hex($row[$j]);
+                        }
+                    // detection of 'bit' works only on mysqli extension
+                    } elseif ($fields_meta[$j]->type == 'bit') {
+                        $values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
+                    // something else -> treat as a string
+                    } else {
+                        $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\'';
+                    } // end if
+                } // end for
 
-            // scheme for inserting fields
-            if ($GLOBALS['sql_insert_syntax'] == 'complete' || $GLOBALS['sql_insert_syntax'] == 'both') {
-                $fields        = implode(', ', $field_set);
-                $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
-            // avoid EOL blank
-                               . ' (' . $fields . ') VALUES';
-            } else {
-                $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
-                               . ' VALUES';
-            }
-        }
+                // should we make update?
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
 
-        $search      = array("\x00", "\x0a", "\x0d", "\x1a"); //\x08\\x09, not required
-        $replace     = array('\0', '\n', '\r', '\Z');
-        $current_row = 0;
-        $query_size  = 0;
-        if (($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') && (!isset($GLOBALS['sql_type']) || $GLOBALS['sql_type'] != 'UPDATE')) {
-            $separator    = ',';
-            $schema_insert .= $crlf;
-        } else {
-            $separator    = ';';
-        }
+                    $insert_line = $schema_insert;
+                    for ($i = 0; $i < $fields_cnt; $i++) {
+                        if (0 == $i) {
+                            $insert_line .= ' ';
+                        }
+                        if ($i > 0) {
+                            // avoid EOL blank
+                            $insert_line .= ',';
+                        }
+                        $insert_line .= $field_set[$i] . ' = ' . $values[$i];
+                    }
 
-        while ($row = PMA_DBI_fetch_row($result)) {
-            if ($current_row == 0) {
-                $head = PMA_possibleCRLF()
-                      . PMA_exportComment()
-                      . PMA_exportComment(__('Dumping data for table') . ' ' . $formatted_table_name)
-                      . PMA_exportComment()
-                      . $crlf;
-                if (! PMA_exportOutputHandler($head)) {
+                    list($tmp_unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $row);
+                    $insert_line .= ' WHERE ' . $tmp_unique_condition;
+                    unset($tmp_unique_condition, $tmp_clause_is_unique);
+
+                } else {
+
+                    // Extended inserts case
+                    if ($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') {
+                        if ($current_row == 1) {
+                            $insert_line  = $schema_insert . '(' . implode(', ', $values) . ')';
+                        } else {
+                            $insert_line  = '(' . implode(', ', $values) . ')';
+                            if (isset($GLOBALS['sql_max_query_size']) && $GLOBALS['sql_max_query_size'] > 0 && $query_size + strlen($insert_line) > $GLOBALS['sql_max_query_size']) {
+                                if (!PMA_exportOutputHandler(';' . $crlf)) {
+                                    return false;
+                                }
+                                $query_size = 0;
+                                $current_row = 1;
+                                $insert_line = $schema_insert . $insert_line;
+                            }
+                        }
+                        $query_size += strlen($insert_line);
+                    }
+                    // Other inserts case
+                    else {
+                        $insert_line = $schema_insert . '(' . implode(', ', $values) . ')';
+                    }
+                }
+                unset($values);
+
+                if (!PMA_exportOutputHandler(($current_row == 1 ? '' : $separator . $crlf) . $insert_line)) {
+                    return false;
+                }
+
+            } // end while
+            if ($current_row > 0) {
+                if (!PMA_exportOutputHandler(';' . $crlf)) {
                     return false;
                 }
             }
-            $current_row++;
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                // NULL
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $values[] = 'NULL';
-                // a number
-                // timestamp is numeric on some MySQL 4.1, BLOBs are sometimes numeric
-                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp'
-                        && ! $fields_meta[$j]->blob) {
-                    $values[] = $row[$j];
-                // a true BLOB
-                // - mysqldump only generates hex data when the --hex-blob
-                //   option is used, for fields having the binary attribute
-                //   no hex is generated
-                // - a TEXT field returns type blob but a real blob
-                //   returns also the 'binary' flag
-                } elseif (stristr($field_flags[$j], 'BINARY')
-                        && $fields_meta[$j]->blob
-                        && isset($GLOBALS['sql_hex_for_blob'])) {
-                    // empty blobs need to be different, but '0' is also empty :-(
-                    if (empty($row[$j]) && $row[$j] != '0') {
-                        $values[] = '\'\'';
-                    } else {
-                        $values[] = '0x' . bin2hex($row[$j]);
-                    }
-                // detection of 'bit' works only on mysqli extension
-                } elseif ($fields_meta[$j]->type == 'bit') {
-                    $values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
-                // something else -> treat as a string
-                } else {
-                    $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\'';
-                } // end if
-            } // end for
+        } // end if ($result != false)
+        PMA_DBI_free_result($result);
 
-            // should we make update?
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
-
-                $insert_line = $schema_insert;
-                for ($i = 0; $i < $fields_cnt; $i++) {
-                    if (0 == $i) {
-                        $insert_line .= ' ';
-                    }
-                    if ($i > 0) {
-                        // avoid EOL blank
-                        $insert_line .= ',';
-                    }
-                    $insert_line .= $field_set[$i] . ' = ' . $values[$i];
-                }
-
-                list($tmp_unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $row);
-                $insert_line .= ' WHERE ' . $tmp_unique_condition;
-                unset($tmp_unique_condition, $tmp_clause_is_unique);
-
-            } else {
-
-                // Extended inserts case
-                if ($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') {
-                    if ($current_row == 1) {
-                        $insert_line  = $schema_insert . '(' . implode(', ', $values) . ')';
-                    } else {
-                        $insert_line  = '(' . implode(', ', $values) . ')';
-                        if (isset($GLOBALS['sql_max_query_size']) && $GLOBALS['sql_max_query_size'] > 0 && $query_size + strlen($insert_line) > $GLOBALS['sql_max_query_size']) {
-                            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                                return false;
-                            }
-                            $query_size = 0;
-                            $current_row = 1;
-                            $insert_line = $schema_insert . $insert_line;
-                        }
-                    }
-                    $query_size += strlen($insert_line);
-                }
-                // Other inserts case
-                else {
-                    $insert_line = $schema_insert . '(' . implode(', ', $values) . ')';
-                }
-            }
-            unset($values);
-
-            if (!PMA_exportOutputHandler(($current_row == 1 ? '' : $separator . $crlf) . $insert_line)) {
-                return false;
-            }
-
-        } // end while
-        if ($current_row > 0) {
-            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                return false;
-            }
-        }
-    } // end if ($result != false)
-    PMA_DBI_free_result($result);
-
-    return true;
-} // end of the 'PMA_exportData()' function
+        return true;
+    } // end of the 'PMA_exportData()' function
 }
 ?>
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index 06de740778..d248c1b605 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -32,302 +32,302 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n");
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in Texy format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $what;
-
-    if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) {
-        return false;
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
 
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $text_output = "|------\n";
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $text_output .= '|' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i)));
-        } // end for
-        $text_output .= "\n|------\n";
-        if (! PMA_exportOutputHandler($text_output)) {
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n");
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in Texy format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $what;
+
+        if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) {
             return false;
         }
-    } // end if
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $text_output = '';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (! isset($row[$j]) || is_null($row[$j])) {
-                $value = $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                $value = $row[$j];
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $text_output = "|------\n";
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $text_output .= '|' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i)));
+            } // end for
+            $text_output .= "\n|------\n";
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $text_output = '';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (! isset($row[$j]) || is_null($row[$j])) {
+                    $value = $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    $value = $row[$j];
+                } else {
+                    $value = ' ';
+                }
+                $text_output .= '|' . htmlspecialchars($value);
+            } // end for
+            $text_output .= "\n";
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end while
+        PMA_DBI_free_result($result);
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) {
+            return false;
+        }
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && ! empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $value = ' ';
+                $have_rel = false;
             }
-            $text_output .= '|' . htmlspecialchars($value);
-        } // end for
-        $text_output .= "\n";
-        if (! PMA_exportOutputHandler($text_output)) {
-            return false;
-        }
-    } // end while
-    PMA_DBI_free_result($result);
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) {
-        return false;
-    }
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && ! empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
         } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
+               $have_rel = false;
+        } // end if
 
-    /**
-     * Displays the table structure
-     */
-
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments && $cfgRelation['commwork']) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-
-    $text_output = "|------\n";
-    $text_output .= '|' . htmlspecialchars(__('Column'));
-    $text_output .= '|' . htmlspecialchars(__('Type'));
-    $text_output .= '|' . htmlspecialchars(__('Null'));
-    $text_output .= '|' . htmlspecialchars(__('Default'));
-    if ($do_relation && $have_rel) {
-        $text_output .= '|' . htmlspecialchars(__('Links to'));
-    }
-    if ($do_comments) {
-        $text_output .= '|' . htmlspecialchars(__('Comments'));
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $text_output .= '|' . htmlspecialchars('MIME');
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $text_output .= "\n|------\n";
-
-    if (! PMA_exportOutputHandler($text_output)) {
-        return false;
-    }
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $text_output = '';
-        $type             = $column['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $attribute     = '&nbsp;';
-        if ($binary) {
-            $attribute = 'BINARY';
-        }
-        if ($unsigned) {
-            $attribute = 'UNSIGNED';
-        }
-        if ($zerofill) {
-            $attribute = 'UNSIGNED ZEROFILL';
-        }
-        if (! isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '**' . $fmt_pre;
-            $fmt_post = $fmt_post . '**';
-        }
-        if ($column['Key']=='PRI') {
-            $fmt_pre = '//' . $fmt_pre;
-            $fmt_post = $fmt_post . '//';
-        }
-        $text_output .= '|' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post;
-        $text_output .= '|' . htmlspecialchars($type);
-        $text_output .= '|' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
-        $text_output .= '|' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '');
-
-        $field_name = $column['Field'];
+        /**
+         * Displays the table structure
+         */
 
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            $text_output .= '|' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '');
+            $columns_cnt++;
         }
         if ($do_comments && $cfgRelation['commwork']) {
-            $text_output .= '|' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '');
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $text_output .= '|' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '');
+            $columns_cnt++;
         }
 
-        $text_output .= "\n";
+        $text_output = "|------\n";
+        $text_output .= '|' . htmlspecialchars(__('Column'));
+        $text_output .= '|' . htmlspecialchars(__('Type'));
+        $text_output .= '|' . htmlspecialchars(__('Null'));
+        $text_output .= '|' . htmlspecialchars(__('Default'));
+        if ($do_relation && $have_rel) {
+            $text_output .= '|' . htmlspecialchars(__('Links to'));
+        }
+        if ($do_comments) {
+            $text_output .= '|' . htmlspecialchars(__('Comments'));
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $text_output .= '|' . htmlspecialchars('MIME');
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
+        $text_output .= "\n|------\n";
 
         if (! PMA_exportOutputHandler($text_output)) {
             return false;
         }
-    } // end while
 
-    return true;
-}
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $text_output = '';
+            $type             = $column['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $attribute     = '&nbsp;';
+            if ($binary) {
+                $attribute = 'BINARY';
+            }
+            if ($unsigned) {
+                $attribute = 'UNSIGNED';
+            }
+            if ($zerofill) {
+                $attribute = 'UNSIGNED ZEROFILL';
+            }
+            if (! isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                }
+            }
+
+            $fmt_pre = '';
+            $fmt_post = '';
+            if (in_array($column['Field'], $unique_keys)) {
+                $fmt_pre = '**' . $fmt_pre;
+                $fmt_post = $fmt_post . '**';
+            }
+            if ($column['Key']=='PRI') {
+                $fmt_pre = '//' . $fmt_pre;
+                $fmt_post = $fmt_post . '//';
+            }
+            $text_output .= '|' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post;
+            $text_output .= '|' . htmlspecialchars($type);
+            $text_output .= '|' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
+            $text_output .= '|' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '');
+
+            $field_name = $column['Field'];
+
+            if ($do_relation && $have_rel) {
+                $text_output .= '|' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '');
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $text_output .= '|' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '');
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $text_output .= '|' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '');
+            }
+
+            $text_output .= "\n";
+
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end while
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 5747f086a0..3ff6f6a920 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -30,164 +30,164 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/* Append the PHPExcel directory to the include path variable */
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
+    /* Append the PHPExcel directory to the include path variable */
+    set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
 
-require_once './libraries/PHPExcel/PHPExcel.php';
-require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php';
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    global $workbook;
-    global $tmp_filename;
-
-    $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_');
-
-    $workbookWriter = new PHPExcel_Writer_Excel5($workbook);
-    $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
-    $workbookWriter->save($tmp_filename);
-
-    if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
-        return false;
-    }
-
-    unlink($tmp_filename);
-
-    unset($GLOBALS['workbook']);
-    unset($GLOBALS['sheet_index']);
-
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $db;
-
-    /* Initialize the workbook */
-    $GLOBALS['workbook'] = new PHPExcel();
-    $GLOBALS['sheet_index'] = 0;
-    global $workbook;
-
-    $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setTitle($db);
-    $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump');
-
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-
-
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in XLS format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $workbook;
-    global $sheet_index;
+    require_once './libraries/PHPExcel/PHPExcel.php';
+    require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php';
 
     /**
-     * Get the data from the database using the original query
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
      */
-    $result      = PMA_DBI_fetch_result($sql_query);
-    $row_cnt     = count($result);
+    function PMA_exportFooter() {
+        global $workbook;
+        global $tmp_filename;
 
-    if ($row_cnt > 0) {
-        $col_names = array_keys($result[0]);
-        $fields_cnt = count($result[0]);
-        $row_offset = 1;
+        $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_');
 
-        /* Only one sheet is created on workbook initialization */
-        if ($sheet_index > 0) {
-            $workbook->createSheet();
+        $workbookWriter = new PHPExcel_Writer_Excel5($workbook);
+        $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
+        $workbookWriter->save($tmp_filename);
+
+        if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
+            return false;
         }
 
-        $workbook->setActiveSheetIndex($sheet_index);
-        $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+        unlink($tmp_filename);
 
-        if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) {
-            for ($i = 0; $i < $fields_cnt; ++$i) {
-                $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
-            }
-            $row_offset++;
-        }
+        unset($GLOBALS['workbook']);
+        unset($GLOBALS['sheet_index']);
 
-        for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
-            for ($c = 0; $c < $fields_cnt; ++$c) {
-                if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xls_null']);
-                } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
-                    /**
-                     * @todo we should somehow handle character set here!
-                     */
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
-                } else {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
-                }
-            }
-        }
-
-        $sheet_index++;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $db;
+
+        /* Initialize the workbook */
+        $GLOBALS['workbook'] = new PHPExcel();
+        $GLOBALS['sheet_index'] = 0;
+        global $workbook;
+
+        $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setTitle($db);
+        $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump');
+
+        return true;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+
+
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in XLS format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $workbook;
+        global $sheet_index;
+
+        /**
+         * Get the data from the database using the original query
+         */
+        $result      = PMA_DBI_fetch_result($sql_query);
+        $row_cnt     = count($result);
+
+        if ($row_cnt > 0) {
+            $col_names = array_keys($result[0]);
+            $fields_cnt = count($result[0]);
+            $row_offset = 1;
+
+            /* Only one sheet is created on workbook initialization */
+            if ($sheet_index > 0) {
+                $workbook->createSheet();
+            }
+
+            $workbook->setActiveSheetIndex($sheet_index);
+            $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+
+            if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) {
+                for ($i = 0; $i < $fields_cnt; ++$i) {
+                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
+                }
+                $row_offset++;
+            }
+
+            for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
+                for ($c = 0; $c < $fields_cnt; ++$c) {
+                    if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xls_null']);
+                    } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
+                        /**
+                         * @todo we should somehow handle character set here!
+                         */
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
+                    } else {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
+                    }
+                }
+            }
+
+            $sheet_index++;
+        }
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index 8f5cb19866..b06a615acf 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -30,163 +30,163 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/* Append the PHPExcel directory to the include path variable */
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
+    /* Append the PHPExcel directory to the include path variable */
+    set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
 
-require_once './libraries/PHPExcel/PHPExcel.php';
-require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php';
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    global $workbook;
-    global $tmp_filename;
-
-    $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
-
-    $workbookWriter = new PHPExcel_Writer_Excel2007($workbook);
-    $workbookWriter->save($tmp_filename);
-
-    if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
-        return false;
-    }
-
-    unlink($tmp_filename);
-
-    unset($GLOBALS['workbook']);
-    unset($GLOBALS['sheet_index']);
-
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $db;
-
-    /* Initialize the workbook */
-    $GLOBALS['workbook'] = new PHPExcel();
-    $GLOBALS['sheet_index'] = 0;
-    global $workbook;
-
-    $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setTitle($db);
-    $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump');
-
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-
-
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in XLSX format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $workbook;
-    global $sheet_index;
+    require_once './libraries/PHPExcel/PHPExcel.php';
+    require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php';
 
     /**
-     * Get the data from the database using the original query
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
      */
-    $result      = PMA_DBI_fetch_result($sql_query);
-    $row_cnt     = count($result);
+    function PMA_exportFooter() {
+        global $workbook;
+        global $tmp_filename;
 
-    if ($row_cnt > 0) {
-        $col_names = array_keys($result[0]);
-        $fields_cnt = count($result[0]);
-        $row_offset = 1;
+        $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
 
-        /* Only one sheet is created on workbook initialization */
-        if ($sheet_index > 0) {
-            $workbook->createSheet();
+        $workbookWriter = new PHPExcel_Writer_Excel2007($workbook);
+        $workbookWriter->save($tmp_filename);
+
+        if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
+            return false;
         }
 
-        $workbook->setActiveSheetIndex($sheet_index);
-        $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+        unlink($tmp_filename);
 
-        if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) {
-            for ($i = 0; $i < $fields_cnt; ++$i) {
-                $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
-            }
-            $row_offset++;
-        }
+        unset($GLOBALS['workbook']);
+        unset($GLOBALS['sheet_index']);
 
-        for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
-            for ($c = 0; $c < $fields_cnt; ++$c) {
-                if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xlsx_null']);
-                } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
-                    /**
-                     * @todo we should somehow handle character set here!
-                     */
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
-                } else {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
-                }
-            }
-        }
-
-        $sheet_index++;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $db;
+
+        /* Initialize the workbook */
+        $GLOBALS['workbook'] = new PHPExcel();
+        $GLOBALS['sheet_index'] = 0;
+        global $workbook;
+
+        $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setTitle($db);
+        $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump');
+
+        return true;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+
+
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in XLSX format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $workbook;
+        global $sheet_index;
+
+        /**
+         * Get the data from the database using the original query
+         */
+        $result      = PMA_DBI_fetch_result($sql_query);
+        $row_cnt     = count($result);
+
+        if ($row_cnt > 0) {
+            $col_names = array_keys($result[0]);
+            $fields_cnt = count($result[0]);
+            $row_offset = 1;
+
+            /* Only one sheet is created on workbook initialization */
+            if ($sheet_index > 0) {
+                $workbook->createSheet();
+            }
+
+            $workbook->setActiveSheetIndex($sheet_index);
+            $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+
+            if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) {
+                for ($i = 0; $i < $fields_cnt; ++$i) {
+                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
+                }
+                $row_offset++;
+            }
+
+            for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
+                for ($c = 0; $c < $fields_cnt; ++$c) {
+                    if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xlsx_null']);
+                    } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
+                        /**
+                         * @todo we should somehow handle character set here!
+                         */
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
+                    } else {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
+                    }
+                }
+            }
+
+            $sheet_index++;
+        }
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 26953af925..b55d1e9186 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -48,295 +48,295 @@ if (isset($plugin_list)) {
     $plugin_list['xml']['options'][] = array('type' => 'end_group');
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $foot = '</pma_xml_export>';
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $foot = '</pma_xml_export>';
 
-    return PMA_exportOutputHandler($foot);
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $crlf;
-    global $cfg;
-    global $db;
-    global $table;
-    global $tables;
-    
-    $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures'])
-        || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers'])
-        || isset($GLOBALS['xml_export_views']);
-    $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
-
-    if ($GLOBALS['output_charset_conversion']) {
-        $charset = $GLOBALS['charset_of_file'];
-    } else {
-        $charset = 'utf-8';
+        return PMA_exportOutputHandler($foot);
     }
 
-    $head  =  '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf
-           .  '<!--' . $crlf
-           .  '- phpMyAdmin XML Dump' . $crlf
-           .  '- version ' . PMA_VERSION . $crlf
-           .  '- http://www.phpmyadmin.net' . $crlf
-           .  '-' . $crlf
-           .  '- ' . __('Host') . ': ' . $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-         $head .= ':' . $cfg['Server']['port'];
-    }
-    $head .= $crlf
-           .  '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
-           .  '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
-           .  '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
-           .  '-->' . $crlf . $crlf;
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $crlf;
+        global $cfg;
+        global $db;
+        global $table;
+        global $tables;
 
-    $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf;
+        $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures'])
+            || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers'])
+            || isset($GLOBALS['xml_export_views']);
+        $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
 
-    if ($export_struct) {
-        $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.PMA_sqlAddSlashes($db).'\' LIMIT 1');
-        $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
-        $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME'];
-
-        $head .= '    <!--' . $crlf;
-        $head .= '    - Structure schemas' . $crlf;
-        $head .= '    -->' . $crlf;
-        $head .= '    <pma:structure_schemas>' . $crlf;
-        $head .= '        <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf;
-        
-        if (count($tables) == 0) {
-            $tables[] = $table;
+        if ($GLOBALS['output_charset_conversion']) {
+            $charset = $GLOBALS['charset_of_file'];
+        } else {
+            $charset = 'utf-8';
         }
 
-        foreach ($tables as $table) {
-            // Export tables and views
-            $result = PMA_DBI_fetch_result('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 0);
-            $tbl =  $result[$table][1];
+        $head  =  '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf
+               .  '<!--' . $crlf
+               .  '- phpMyAdmin XML Dump' . $crlf
+               .  '- version ' . PMA_VERSION . $crlf
+               .  '- http://www.phpmyadmin.net' . $crlf
+               .  '-' . $crlf
+               .  '- ' . __('Host') . ': ' . $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+             $head .= ':' . $cfg['Server']['port'];
+        }
+        $head .= $crlf
+               .  '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
+               .  '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
+               .  '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
+               .  '-->' . $crlf . $crlf;
 
-            $is_view = PMA_isView($db, $table);
+        $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf;
 
-            if ($is_view) {
-                $type = 'view';
-            } else {
-                $type = 'table';
-            }
-            
-            if ($is_view && ! isset($GLOBALS['xml_export_views'])) {
-                continue;
-            }
-            
-            if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) {
-                continue;
+        if ($export_struct) {
+            $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.PMA_sqlAddSlashes($db).'\' LIMIT 1');
+            $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
+            $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME'];
+
+            $head .= '    <!--' . $crlf;
+            $head .= '    - Structure schemas' . $crlf;
+            $head .= '    -->' . $crlf;
+            $head .= '    <pma:structure_schemas>' . $crlf;
+            $head .= '        <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf;
+
+            if (count($tables) == 0) {
+                $tables[] = $table;
             }
 
-            $head .= '            <pma:' . $type . ' name="' . $table . '">' . $crlf;
-            
-            $tbl = "                " . htmlspecialchars($tbl);
-            $tbl = str_replace("\n", "\n                ", $tbl);
+            foreach ($tables as $table) {
+                // Export tables and views
+                $result = PMA_DBI_fetch_result('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 0);
+                $tbl =  $result[$table][1];
 
-            $head .= $tbl . ';' . $crlf;
-            $head .= '            </pma:' . $type . '>' . $crlf;
-            
-            if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) {
-                // Export triggers
-                $triggers = PMA_DBI_get_triggers($db, $table);
-                if ($triggers) {
-                    foreach ($triggers as $trigger) {
-                        $code = $trigger['create'];
-                        $head .= '            <pma:trigger name="' . $trigger['name'] . '">' . $crlf;
+                $is_view = PMA_isView($db, $table);
+
+                if ($is_view) {
+                    $type = 'view';
+                } else {
+                    $type = 'table';
+                }
+
+                if ($is_view && ! isset($GLOBALS['xml_export_views'])) {
+                    continue;
+                }
+
+                if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) {
+                    continue;
+                }
+
+                $head .= '            <pma:' . $type . ' name="' . $table . '">' . $crlf;
+
+                $tbl = "                " . htmlspecialchars($tbl);
+                $tbl = str_replace("\n", "\n                ", $tbl);
+
+                $head .= $tbl . ';' . $crlf;
+                $head .= '            </pma:' . $type . '>' . $crlf;
+
+                if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) {
+                    // Export triggers
+                    $triggers = PMA_DBI_get_triggers($db, $table);
+                    if ($triggers) {
+                        foreach ($triggers as $trigger) {
+                            $code = $trigger['create'];
+                            $head .= '            <pma:trigger name="' . $trigger['name'] . '">' . $crlf;
+
+                            // Do some formatting
+                            $code = substr(rtrim($code), 0, -3);
+                            $code = "                " . htmlspecialchars($code);
+                            $code = str_replace("\n", "\n                ", $code);
+
+                            $head .= $code . $crlf;
+                            $head .= '            </pma:trigger>' . $crlf;
+                        }
+
+                        unset($trigger);
+                        unset($triggers);
+                    }
+                }
+            }
+
+            if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) {
+                // Export functions
+                $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
+                if ($functions) {
+                    foreach ($functions as $function) {
+                        $head .= '            <pma:function name="' . $function . '">' . $crlf;
 
                         // Do some formatting
-                        $code = substr(rtrim($code), 0, -3);
-                        $code = "                " . htmlspecialchars($code);
-                        $code = str_replace("\n", "\n                ", $code);
+                        $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function);
+                        $sql = rtrim($sql);
+                        $sql = "                " . htmlspecialchars($sql);
+                        $sql = str_replace("\n", "\n                ", $sql);
 
-                        $head .= $code . $crlf;
-                        $head .= '            </pma:trigger>' . $crlf;
+                        $head .= $sql . $crlf;
+                        $head .= '            </pma:function>' . $crlf;
                     }
 
-                    unset($trigger);
-                    unset($triggers);
+                    unset($create_func);
+                    unset($function);
+                    unset($functions);
                 }
             }
-        }
-        
-        if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) {
-            // Export functions
-            $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
-            if ($functions) {
-                foreach ($functions as $function) {
-                    $head .= '            <pma:function name="' . $function . '">' . $crlf;
 
-                    // Do some formatting
-                    $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function);
-                    $sql = rtrim($sql);
-                    $sql = "                " . htmlspecialchars($sql);
-                    $sql = str_replace("\n", "\n                ", $sql);
+            if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) {
+                // Export procedures
+                $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
+                if ($procedures) {
+                    foreach ($procedures as $procedure) {
+                        $head .= '            <pma:procedure name="' . $procedure . '">' . $crlf;
 
-                    $head .= $sql . $crlf;
-                    $head .= '            </pma:function>' . $crlf;
+                        // Do some formatting
+                        $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure);
+                        $sql = rtrim($sql);
+                        $sql = "                " . htmlspecialchars($sql);
+                        $sql = str_replace("\n", "\n                ", $sql);
+
+                        $head .= $sql . $crlf;
+                        $head .= '            </pma:procedure>' . $crlf;
+                    }
+
+                    unset($create_proc);
+                    unset($procedure);
+                    unset($procedures);
                 }
-
-                unset($create_func);
-                unset($function);
-                unset($functions);
             }
-        }
-        
-        if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) {
-            // Export procedures
-            $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
-            if ($procedures) {
-                foreach ($procedures as $procedure) {
-                    $head .= '            <pma:procedure name="' . $procedure . '">' . $crlf;
 
-                    // Do some formatting
-                    $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure);
-                    $sql = rtrim($sql);
-                    $sql = "                " . htmlspecialchars($sql);
-                    $sql = str_replace("\n", "\n                ", $sql);
+            unset($result);
 
-                    $head .= $sql . $crlf;
-                    $head .= '            </pma:procedure>' . $crlf;
-                }
+            $head .= '        </pma:database>' . $crlf;
+            $head .= '    </pma:structure_schemas>' . $crlf;
 
-                unset($create_proc);
-                unset($procedure);
-                unset($procedures);
+            if ($export_data) {
+                $head .= $crlf;
             }
         }
 
-        unset($result);
-
-        $head .= '        </pma:database>' . $crlf;
-        $head .= '    </pma:structure_schemas>' . $crlf;
-
-        if ($export_data) {
-            $head .= $crlf;
-        }
-    }
-
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    global $crlf;
-    
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        $head = '    <!--' . $crlf
-              . '    - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
-              . '    -->' . $crlf
-              . '    <database name="' . htmlspecialchars($db) . '">' . $crlf;
-        
         return PMA_exportOutputHandler($head);
     }
-    else
-    {
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        global $crlf;
+
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            $head = '    <!--' . $crlf
+                  . '    - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+                  . '    -->' . $crlf
+                  . '    <database name="' . htmlspecialchars($db) . '">' . $crlf;
+
+            return PMA_exportOutputHandler($head);
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        global $crlf;
+
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            return PMA_exportOutputHandler('    </database>' . $crlf);
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
         return true;
     }
-}
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    global $crlf;
-    
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        return PMA_exportOutputHandler('    </database>' . $crlf);
-    }
-    else
-    {
-        return true;
-    }
-}
+    /**
+     * Outputs the content of a table in XML format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
 
-/**
- * Outputs the content of a table in XML format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-        $columns_cnt = PMA_DBI_num_fields($result);
-        $columns = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
-        }
-        unset($i);
-
-        $buffer      = '        <!-- ' . __('Table') . ' ' . $table . ' -->' . $crlf;
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        while ($record = PMA_DBI_fetch_row($result)) {
-            $buffer         = '        <table name="' . htmlspecialchars($table) . '">' . $crlf;
+            $columns_cnt = PMA_DBI_num_fields($result);
+            $columns = array();
             for ($i = 0; $i < $columns_cnt; $i++) {
-                // If a cell is NULL, still export it to preserve the XML structure
-                if (!isset($record[$i]) || is_null($record[$i])) {
-                    $record[$i] = 'NULL';
-                }
-                $buffer .= '            <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i])
-                        .  '</column>' . $crlf;
+                $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
             }
-            $buffer         .= '        </table>' . $crlf;
+            unset($i);
 
+            $buffer      = '        <!-- ' . __('Table') . ' ' . $table . ' -->' . $crlf;
             if (!PMA_exportOutputHandler($buffer)) {
                 return false;
             }
-        }
-        PMA_DBI_free_result($result);
-    }
 
-    return true;
-} // end of the 'PMA_getTableXML()' function
-}
+            while ($record = PMA_DBI_fetch_row($result)) {
+                $buffer         = '        <table name="' . htmlspecialchars($table) . '">' . $crlf;
+                for ($i = 0; $i < $columns_cnt; $i++) {
+                    // If a cell is NULL, still export it to preserve the XML structure
+                    if (!isset($record[$i]) || is_null($record[$i])) {
+                        $record[$i] = 'NULL';
+                    }
+                    $buffer .= '            <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i])
+                            .  '</column>' . $crlf;
+                }
+                $buffer         .= '        </table>' . $crlf;
+
+                if (!PMA_exportOutputHandler($buffer)) {
+                    return false;
+                }
+            }
+            PMA_DBI_free_result($result);
+        }
+
+        return true;
+    } // end of the 'PMA_getTableXML()' function
+    }
 }
 ?>
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 26b19a9401..0ec1551208 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -31,139 +31,139 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    PMA_exportOutputHandler('...' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler('%YAML 1.1' . $GLOBALS['crlf'] . '---' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table in YAML format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        PMA_exportOutputHandler('...' . $GLOBALS['crlf']);
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
-        $record_cnt++;
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler('%YAML 1.1' . $GLOBALS['crlf'] . '---' . $GLOBALS['crlf']);
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer = '# ' . $db . '.' . $table . $crlf;
-            $buffer .= '-' . $crlf;
-        } else {
-            $buffer = '-' . $crlf;
-        }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in YAML format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
-            if (! isset($record[$i])) {
-                continue;
-            }
-
-            $column = $columns[$i];
-
-            if (is_null($record[$i])) {
-                $buffer .= '  ' . $column . ': null' . $crlf;
-                continue;
-            }
-
-            if (is_numeric($record[$i])) {
-                $buffer .= '  ' . $column . ': '  . $record[$i] . $crlf;
-                continue;
-            }
-
-            $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
-            $buffer .= '  ' . $column . ': "' . $record[$i] . '"' . $crlf;
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
         }
+        unset($i);
 
-        if (! PMA_exportOutputHandler($buffer)) {
-            return false;
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
+            $record_cnt++;
+
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer = '# ' . $db . '.' . $table . $crlf;
+                $buffer .= '-' . $crlf;
+            } else {
+                $buffer = '-' . $crlf;
+            }
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                if (! isset($record[$i])) {
+                    continue;
+                }
+
+                $column = $columns[$i];
+
+                if (is_null($record[$i])) {
+                    $buffer .= '  ' . $column . ': null' . $crlf;
+                    continue;
+                }
+
+                if (is_numeric($record[$i])) {
+                    $buffer .= '  ' . $column . ': '  . $record[$i] . $crlf;
+                    continue;
+                }
+
+                $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
+                $buffer .= '  ' . $column . ': "' . $record[$i] . '"' . $crlf;
+            }
+
+            if (! PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
         }
+        PMA_DBI_free_result($result);
+
+        return true;
     }
-    PMA_DBI_free_result($result);
-
-    return true;
-}
 
 }
 ?>
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 69885c7d69..e92015027f 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -9,9 +9,8 @@
 /**
  * Checks whether given link is valid
  *
- * @param string $url URL to check.
- *
- * @return boolean True if string can be used as link.
+ * @param string $url URL to check
+ * @return boolean True if string can be used as link
  */
 function PMA_checkLink($url)
 {
@@ -37,7 +36,6 @@ function PMA_checkLink($url)
  * Callback function for replacing [a@link@target] links in bb code.
  *
  * @param array $found Array of preg matches
- *
  * @return string Replaced string
  */
 function PMA_replaceBBLink($found)
@@ -82,10 +80,7 @@ function PMA_replaceBBLink($found)
  * @param string  $message the message
  * @param boolean $escape  whether to escape html in result
  * @param boolean $safe    whether string is safe (can keep < and > chars)
- *
  * @return  string   the sanitized message
- *
- * @access  public
  */
 function PMA_sanitize($message, $escape = false, $safe = false)
 {
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index fa77136674..b7b0455431 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2629,12 +2629,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                     break;
             } // end switch ($typearr[2])
 
-/*
+            /*
             if ($typearr[3] != 'punct_qualifier') {
                 $after             .= ' ';
             }
             $after                 .= "\n";
-*/
+            */
             $str .= $before;
             if ($mode=='color') {
                 $str .= PMA_SQP_formatHTML_colorize($arr[$i]);
@@ -2650,7 +2650,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             $indent--;
             $str .= ($mode != 'query_only' ? '</div>' : ' ');
         }
-       /* End possibly unclosed documentation link */
+        /* End possibly unclosed documentation link */
         if ($close_docu_link) {
             $str .= '</a>';
             $close_docu_link = false;
diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js
index 478bd829ce..7caeea93ab 100644
--- a/pmd/scripts/history.js
+++ b/pmd/scripts/history.js
@@ -6,7 +6,7 @@
   * @requires    moves.js
   * @version $Id$
   */
-  
+
 var history_array = []; // Global array to store history objects
 var select_field = [];  // Global array to store informaation for columns which are used in select clause
 var g_index;
@@ -14,12 +14,12 @@ var g_index;
 /**
  * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}.
  *
- * @param	index	has value 1 or 0,decides wheter to hide toggle_container on load. 
+ * @param index has value 1 or 0,decides wheter to hide toggle_container on load.
 **/
 
 function panel(index) {
     if (!index) {
-        $(".toggle_container").hide(); 
+        $(".toggle_container").hide();
     }
     $("h2.tiger").click(function(){
     $(this).toggleClass("active").next().slideToggle("slow");
@@ -31,18 +31,18 @@ function panel(index) {
  * clubbing all objects of same tables together
  * This function is called whenever changes are made in history_array[]
  *
- * @uses	and_or()
- * @uses	history_edit()
- * @uses	history_delete()
- * 	
- * @param {int}  init 	starting index of unsorted array   
- * @param {int}	final   last index of unsorted array
+ * @uses and_or()
+ * @uses history_edit()
+ * @uses history_delete()
+ *
+ * @param {int}  init starting index of unsorted array
+ * @param {int} final   last index of unsorted array
  *
 **/
 
 function display(init,final) {
     var str,i,j,k,sto;
-    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. 
+    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together.
     for (i = init;i < final;i++) {
         sto = history_array[i];
         var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS
@@ -60,7 +60,7 @@ function display(init,final) {
     str =''; // string to store Html code for history tab
     for ( var i=0; i < history_array.length; i++){
         var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN
-        str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';  				
+        str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';
         str += '<div class="toggle_container">\n';
         while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) {
             str +='<div class="block"> <table width ="250">';
@@ -76,7 +76,7 @@ function display(init,final) {
                 str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+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 +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>';
            }
            else {
-               str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+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 +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></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 align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+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 +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></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) {
@@ -91,9 +91,9 @@ function display(init,final) {
 }
 
 /**
- * To change And/Or relation in history tab 
- * 
- * @uses	panel()
+ * To change And/Or relation in history tab
+ *
+ * @uses panel()
  *
  * @param {int} index of history_array where change is to be made
  *
@@ -113,8 +113,8 @@ function and_or(index) {
 
 /**
  * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having)
- * 
- * @param	index	index of history_array where change is to be made
+ *
+ * @param index index of history_array where change is to be made
  *
 **/
 
@@ -152,16 +152,16 @@ function detail (index) {
 /**
  * Deletes entry in history_array
  *
- * @uses	panel()
- * @uses	display()
- * @param	index	index of history_array[] which is to be deleted
+ * @uses panel()
+ * @uses display()
+ * @param index index of history_array[] which is to be deleted
  *
 **/
 
 function history_delete(index) {
     for(var k =0 ;k < from_array.length;k++){
-        if(from_array[k] == history_array[index].get_tab()){ 
-            from_array.splice(k,1); 
+        if(from_array[k] == history_array[index].get_tab()){
+            from_array.splice(k,1);
             break;
         }
     }
@@ -173,8 +173,8 @@ function history_delete(index) {
 
 /**
  * To show where,rename,aggregate,having forms to edit a object
- * 
- * @param{int} index	index of history_array where change is to be made
+ *
+ * @param{int} index index of history_array where change is to be made
  *
 **/
 
@@ -219,10 +219,10 @@ function history_edit(index) {
 /**
  * Make changes in history_array when Edit button is clicked
  * checks for the type of object and then sets the new value
- * @uses	panel()
- * @uses	display()
+ * @uses panel()
+ * @uses display()
  *
- * @param	index	index of history_array where change is to be made
+ * @param index index of history_array where change is to be made
 **/
 
 function edit(type) {
@@ -261,13 +261,13 @@ function edit(type) {
 }
 
 /**
- * history object closure  
+ * history object closure
  *
- * @param	ncolumn_name	name of the column on which conditions are put
- * @param	nobj			object details(where,rename,orderby,groupby,aggregate)
- * @param	ntab			table name of the column on which conditions are applied
- * @param	nobj_no			object no used for inner join
- * @param	ntype			type of object
+ * @param ncolumn_name  name of the column on which conditions are put
+ * @param nobj          object details(where,rename,orderby,groupby,aggregate)
+ * @param ntab          table name of the column on which conditions are applied
+ * @param nobj_no       object no used for inner join
+ * @param ntype         type of object
  *
 **/
 
@@ -328,8 +328,8 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) {
 /**
  * where object closure, makes an object with all information of where
  *
- * @param	nrelation_operator	type of relation operator to be applied
- * @param	nquery				stores value of value/sub-query 
+ * @param nrelation_operator type of relation operator to be applied
+ * @param nquery             stores value of value/sub-query
  *
 **/
 
@@ -357,8 +357,8 @@ var where = function (nrelation_operator,nquery) {
 /**
  * Having object closure, makes an object with all information of where
  *
- * @param	nrelation_operator	type of relation operator to be applied
- * @param	nquery				stores value of value/sub-query 
+ * @param nrelation_operator type of relation operator to be applied
+ * @param nquery             stores value of value/sub-query
  *
 **/
 
@@ -392,7 +392,7 @@ var having = function (nrelation_operator,nquery,noperator) {
 /**
  * rename object closure,makes an object with all information of rename
  *
- * @param	nrename_to	new name information
+ * @param nrename_to new name information
  *
 **/
 
@@ -410,7 +410,7 @@ var rename = function(nrename_to) {
 /**
  * aggregate object closure
  *
- * @param	noperator	aggregte operator
+ * @param noperator aggregte operator
  *
 **/
 
@@ -435,10 +435,10 @@ var aggregate = function(noperator) {
 function unique(arrayName) {
     var newArray=new Array();
     label:for(var i=0; i<arrayName.length;i++ )
-    {  
+    {
         for(var j=0; j<newArray.length;j++ )
         {
-            if(newArray[j]==arrayName[i]) 
+            if(newArray[j]==arrayName[i])
                 continue label;
         }
         newArray[newArray.length] = arrayName[i];
@@ -453,27 +453,27 @@ function unique(arrayName) {
  * @param arrayName array
  * @param value  value which is to be searched in the array
  */
- 
+
 function found(arrayName,value) {
     for(var i=0; i<arrayName.length; i++) {
         if(arrayName[i] == value) { return 1;}
     }
     return -1;
 }
-		
+
 /**
  * This function is the main function for query building.
  * uses history object details for this.
  *
  * @ uses query_where()
  * @ uses query_groupby()
- * @ uses query_having() 
+ * @ uses query_having()
  * @ uses query_orderby()
- * 
+ *
  * @param formtitle title for the form
- * @param fadin      
+ * @param fadin
  */
- 
+
 function build_query(formtitle, fadin) {
     var q_select = "SELECT ";
     var temp;
@@ -486,19 +486,19 @@ function build_query(formtitle, fadin) {
         }
         else {
             temp = check_rename(select_field[i]);
-            q_select += select_field[i] + temp +","; 
+            q_select += select_field[i] + temp +",";
         }
     }
     q_select = q_select.substring(0,q_select.length - 1);
     q_select += " FROM " + query_from();
     if(query_where() != "") {
         q_select +="\n WHERE";
-		q_select += query_where();
+        q_select += query_where();
     }
     if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); }
     if(query_having() != "") { q_select += "\nHAVING " + query_having(); }
     if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); }
-    var box = document.getElementById('box'); 
+    var box = document.getElementById('box');
     document.getElementById('filter').style.display='block';
     var btitle = document.getElementById('boxtitle');
     btitle.innerHTML = 'SELECT';//formtitle;
@@ -506,21 +506,21 @@ function build_query(formtitle, fadin) {
         gradient("box", 0);
         fadein("box");
     }
-    else{ 	
+    else{
         box.style.display='block';
-    }  	
+    }
     document.getElementById('textSqlquery').innerHTML = q_select;
 }
  /**
   * This function builds from clause of query
   * makes automatic joins.
-  * 
+  *
   * @uses unique
   * @uses add_array
   * @uses remove_array
   *
   */
- 
+
 
 function query_from() {
     var i =0;
@@ -543,12 +543,12 @@ function query_from() {
     temp = tab_left.shift();
     quer = temp;
     tab_used.push(temp);
-    // if master table (key2) matches with tab used get all keys and check if tab_left matches 
-    //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . 
-	for( i =0; i<2 ; i++) {
+    // if master table (key2) matches with tab used get all keys and check if tab_left matches
+    //after this check if master table (key2) matches with tab left then check if any foriegn matches with master .
+    for( i =0; i<2 ; i++) {
         for (K in contr){
             for (key in contr[K]){// contr name
-	             for (key2 in contr[K][key]){// table name
+                 for (key2 in contr[K][key]){// table name
                     parts = key2.split(".");
                     if(found(tab_used,parts[1]) > 0)  {
                         for (key3 in contr[K][key][key2]) {
@@ -564,7 +564,7 @@ function query_from() {
                     }
                 }
             }
-        }	
+        }
         K = 0;
         t_tab_left = unique (t_tab_left);
         tab_used = add_array(t_tab_left,tab_used);
@@ -574,7 +574,7 @@ function query_from() {
              for (key in contr[K]) {
                  for (key2 in contr[K][key]){// table name
                      parts = key2.split(".");
-                         if(found(tab_left,parts[1]) > 0){	
+                         if(found(tab_left,parts[1]) > 0){
                            for (key3 in contr[K][key][key2]){
                                parts1 = contr[K][key][key2][key3][0].split(".");
                                if(found(tab_used,parts1[1]) > 0) {
@@ -601,9 +601,7 @@ function query_from() {
         from_array = t_array;
         return query;
 }
-				/*		document.write(key3+";"); //master_field
-							document.write(contr[K][key][key2][key3][0]+";"); // foreign_table
-							document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */
+
 /**
  * This function concatenates two array
  *
@@ -616,7 +614,7 @@ function add_array(add,arr){
     }
     return arr;
 }
- 
+
 /* This fucntion removes all elements present in one array from the other.
  *
  * @params rem array from which each element is removed from other array.
@@ -635,7 +633,7 @@ function remove_array(rem,arr){
  * This function builds the groupby clause from history object
  *
  */
- 
+
 function query_groupby() {
     var i = 0;
     var str = "";
@@ -658,7 +656,7 @@ function query_having() {
         if(history_array[i].get_type() == "Having") {
             if (history_array[i].get_obj().get_operator() != 'None') {
                 and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator();
-                and += " " + history_array[i].get_obj().getquery() + ", " ; 
+                and += " " + history_array[i].get_obj().getquery() + ", " ;
             }
             else {
                 and +=  history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", ";
@@ -707,11 +705,19 @@ function query_where(){
             }
         }
     }
-    if ( or != "(") {	or = or.substring(0,(or.length - 4 )) + ")"; }
-    else { or = "" ;}
-    if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; }
-    else {and = "" ;}
-    if ( or != "" ) { and = and + " OR " + or + " )"; }
+    if ( or != "(") {
+        or = or.substring(0,(or.length - 4 )) + ")";
+    } else {
+        or = "" ;
+    }
+    if (and !="(") {
+        and = and.substring(0,(and.length - 5)) + ")";
+    } else {
+        and = "" ;
+    }
+    if ( or != "" ) {
+        and = and + " OR " + or + " )";
+    }
     return and;
 }
 
@@ -749,7 +755,7 @@ function gradient(id, level)
 }
 
 
-function fadein(id) 
+function fadein(id)
 {
     var level = 0;
     while(level <= 1){
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 1ce18a17ba..71eb037209 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -26,20 +26,20 @@
         eval (hrefscript);
         return false;
     }).attr('href', '#');
-}); 
+});
 
 // Below is the function to bind onbeforeunload events with the content_frame as well as the top window.
 
  $(document).ready(function(){
     $(window).bind('beforeunload', function(){        // onbeforeunload for the frame window.
-        if (_change == 1 && _staying == 0) 
+        if (_change == 1 && _staying == 0)
             return PMA_messages['strLeavingDesigner'];
-        else if (_change == 1 && _staying == 1) 
+        else if (_change == 1 && _staying == 1)
             _staying = 0;
     });
     $(window).unload(function(){
         _change = 0;
-    });    
+    });
     window.top.onbeforeunload = function(){     // onbeforeunload for the browser main window.
         if (_change == 1 && _staying == 0){
             _staying = 1;                                                   //  Helps if the user stays on the page  as there
@@ -48,7 +48,7 @@
         }
     };
 });
- 
+
  function make_zero(){   // Function called if the user stays after seeing the confirmation prompt.
       _staying = 0;
 }
@@ -1015,7 +1015,7 @@ function getColorByTarget( target )
   return color;
 }
 
-function Click_option(id_this,column_name,table_name) 
+function Click_option(id_this,column_name,table_name)
 {
     var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1);
     document.getElementById(id_this).style.left = left + 'px';
@@ -1044,10 +1044,10 @@ function Select_all(id_this,owner)
                 parent.elements[i].checked = true;
                 parent.elements[i].disabled = true;
                 var temp = '`' + id_this.substring(owner.length +1) + '`.*';
-           }	
+           }
            else {
                parent.elements[i].checked = false;
-               parent.elements[i].disabled = false;	
+               parent.elements[i].disabled = false;
            }
         }
     }
@@ -1063,8 +1063,8 @@ function Select_all(id_this,owner)
             }
         }
         for(k =0 ;k < from_array.length;k++){
-            if(from_array[k] == id_this){ 
-                from_array.splice(k,1); 
+            if(from_array[k] == id_this){
+                from_array.splice(k,1);
                 break;
             }
         }
@@ -1096,7 +1096,7 @@ function store_column(id_this,owner,col) {
     var i = 0;
     var k = 0;
     if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) {
-        select_field.push('`' + id_this + '`.`' + col +'`');	
+        select_field.push('`' + id_this + '`.`' + col +'`');
         from_array.push(id_this);
     }
     else {
@@ -1107,9 +1107,9 @@ function store_column(id_this,owner,col) {
             }
         }
         for(k =0 ;k < from_array.length;k++){
-            if(from_array[k] == id_this){ 
-                from_array.splice(k,1); 
-			    break;
+            if(from_array[k] == id_this){
+                from_array.splice(k,1);
+                break;
             }
         }
      }
@@ -1119,13 +1119,13 @@ function store_column(id_this,owner,col) {
  * This function builds object and adds them to history_array
  * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby)
  * then a new history object is made and finally all these history objects are addded to history_array[]
- * 
- * @uses	where()
- * @uses	history()
- * @uses	aggregate()
- * @uses	rename()
- * @uses	panel()
- * @uses	display()
+ *
+ * @uses where()
+ * @uses history()
+ * @uses aggregate()
+ * @uses rename()
+ * @uses panel()
+ * @uses display()
 **/
 
 function add_object() {
@@ -1151,18 +1151,18 @@ function add_object() {
         sum = sum + 1;
         document.getElementById('new_name').value = "" ;
     }
-	if (document.getElementById('operator').value != '---') {
+    if (document.getElementById('operator').value != '---') {
         var aggregate_obj = new aggregate(document.getElementById('operator').value) ;
         history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate"));
         sum = sum + 1;
         document.getElementById('operator').value = '---';
-		//make aggregate operator
+        //make aggregate operator
     }
     if (document.getElementById('groupby').checked == true ) {
         history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy"));
         sum = sum + 1;
         document.getElementById('groupby').checked = false;
-	//make groupby
+        //make groupby
     }
     if (document.getElementById('h_rel_opt').value != '--') {
         if (document.getElementById('having').value == "") {
@@ -1182,11 +1182,11 @@ function add_object() {
         history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy"));
         sum = sum + 1;
         document.getElementById('orderby').checked = false;
-		//make orderby
+        //make orderby
     }
     document.getElementById('hint').innerHTML = sum + "object created" ;
     document.getElementById('hint').style.visibility = "visible";
-	//output sum new objects created
+    //output sum new objects created
     var existingDiv = document.getElementById('ab');
     existingDiv.innerHTML = display(init,history_array.length);
     Close_option();
diff --git a/po/de.po b/po/de.po
index ec26b35a51..2da471ebae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-29 13:44+0200\n"
-"Last-Translator:  <mrbendig@mrbendig.com>\n"
+"PO-Revision-Date: 2011-08-01 20:57+0200\n"
+"Last-Translator: Sven Strickroth <email@cs-ware.de>\n"
 "Language-Team: german <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1326,7 +1326,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Analysiere und Lade Protokolle. Dies kann eine Weile dauern."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1337,7 +1336,7 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Diese Spalte zeigt die Anzahl der identischen Abfragen an, die gruppiert "
-"wurden. Dennoch wird nur der SQL-Text verglichen, daher kann die Angabe von "
+"wurden. Jedoch wird nur der SQL-Text verglichen, daher kann die Angabe von "
 "anderen Werten der Abfrage, wie die Startzeit, unterschiedlich sein."
 
 #: js/messages.php:144
@@ -1360,12 +1359,11 @@ msgid "Jump to Log table"
 msgstr "Springe zur Protokoll-Tabelle"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
 msgstr ""
-"Protokoll wurde analysiert, es wurden jedoch keine Daten im angegebenen "
-"Zeitraum gefunden."
+"Das Protokoll wurde analysiert, es wurden jedoch keine Daten für den "
+"angegebenen Zeitraum gefunden."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -10008,7 +10006,6 @@ msgid "Monitor Instructions"
 msgstr "Einführung zur Überwachung"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10025,14 +10022,13 @@ msgid ""
 "increases server load by up to 15%"
 msgstr ""
 "Die phpMyAdmin-Überwachung kann Sie bei der Server-Konfiguration, und auch "
-"beim Aufspühren von zeitintensiven Abfragen unterstützen. Für das Letztere "
+"beim Aufspühren von zeitintensiven Abfragen unterstützen. Für Letzteres "
 "müssen Sie log_output auf 'TABLE' stellen und entweder slow_query_log oder "
 "general_log aktivieren. Beachten Sie aber, dass das Aktivieren der "
 "general_log viele Daten produzieren und die Serverauslastung um bis zu 15% "
 "erhöhen kann."
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10055,21 +10051,19 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>Verwendung der Überwachung:</b><br />\n"
-"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt "
-"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten "
-"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme "
-"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme "
-"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds "
-"verwenden.\n"
-"<p>Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, wählen Sie "
-"den entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die\n"
-"linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
-"Statistiken aus den Protokollen laden um Sie bei der Auffindung der \n"
+"<b>Verwendung der Überwachung:</b><br />OK, Sie sind bereit zum Starten! "
+"Sobald Sie 'Überwachung starten' angeklickt haben, wird Ihr Browser in "
+"regelmäßigen Intervallen alle angezeigten Diagramme aktualisieren. Unter "
+"'Einstellungen' können Sie Diagramme hinzufügen und das "
+"Aktualisierungsintervall ändern oder beliebige Diagramme entfernen, wenn Sie "
+"das Zahnrad-Icon des entsprechenden Schaubilds verwenden.<p>Wenn Sie eine "
+"plötzliche Spitze in der Aktivität feststellen, wählen Sie den "
+"entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die linke "
+"Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
+"Statistiken aus den Protokollen laden um Sie bei der Auffindung der "
 "Aktivitätsspitze zu unterstützen.</p>"
 
 #: server_status.php:1375
-#, fuzzy
 #| msgid ""
 #| "<b>Please note:</b>\n"
 #| "        Enabling the general_log may increase the server load by 5-15%. "
@@ -10085,12 +10079,10 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
-"<b>Bitte beachten Sie:</b>\n"
-"Das Aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien "
-"Sie sich bewusst, dass das Erzeugen von Statistiken aus den Logs ein \n"
-"sehr aufwändiger Prozess ist. Deshalb ist es ratsam, nur einen kleinen "
-"Zeitraum auszuwählen.\n"
-"        "
+"<b>Bitte beachten Sie:</b> Das Aktivieren des general_log kann die "
+"Serverlast um 5-15% steigern. Seien Sie sich bewusst, dass das Erzeugen von "
+"Statistiken aus den Logs ein sehr aufwändiger Prozess ist. Deshalb ist es "
+"ratsam, nur einen kleinen Zeitraum auszuwählen."
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/po/es.po b/po/es.po
index 2caea9824d..a3464a24f1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-27 16:54+0200\n"
+"PO-Revision-Date: 2011-08-01 18:53+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1326,7 +1326,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Analizando y cargando registros. Esto puede demorar."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1337,8 +1336,9 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Esta columna muestra la cantidad de consultas idénticas que fueron "
-"agrupadas. Sin embargo, sólo el texto SQL es comparado, por lo que los demás "
-"atributos de las consultas como el tiempo de inicio podría diferir."
+"agrupadas. Sin embargo, sólo la consulta SQL en sí es es utilizada para "
+"agrupar, por lo que los demás atributos de las consultas como el tiempo de "
+"inicio podría diferir."
 
 #: js/messages.php:144
 msgid ""
@@ -1360,11 +1360,11 @@ msgid "Jump to Log table"
 msgstr "Saltar a la tabla de registros"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
 msgstr ""
-"Registros analizados, pero no se encontraron datos en este período de tiempo."
+"Registros analizados, pero no se encontraron datos en este período de "
+"tiempo."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1381,10 +1381,9 @@ msgid "Filter queries by word/regexp:"
 msgstr "Filtrar consultas por palabra/expresión regular:"
 
 #: js/messages.php:155
-#, fuzzy
 #| msgid "Group queries, ignoring variable data in WHERE statements"
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE"
+msgstr "Agrupar consultas ignorando datos variables en sentencias WHERE"
 
 #: js/messages.php:156
 msgid "Sum of grouped rows:"
@@ -10061,7 +10060,6 @@ msgid "Monitor Instructions"
 msgstr "Instrucciones de monitorización"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10077,14 +10075,14 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
-"El monitorizador de phpMyAdmin puede asistir en la optimización de la "
+"El Monitorizador de phpMyAdmin puede asistir en la optimización de la "
 "configuración del servidor y rastrear consultas que toman mucho tiempo. Para "
 "esto último necesitará que «log_output» esté definido como 'TABLE' y tener "
-"activado «slow_query_log» o «general_log». Note, sin embargo, que «general_log» "
-"produce mucha información y aumenta la carga en el servidor hasta en un 15%"
+"activado «slow_query_log» o «general_log». Note, sin embargo, que "
+"«general_log» produce mucha información y aumenta la carga en el servidor "
+"hasta en un 15%"
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10107,19 +10105,17 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>Utilizando el monitorizador:</b><br />\n"
-"¡Ya estás listo! Una vez que pulses en 'Iniciar monitorización' el navegador "
-"actualizará a intervalos regulares todos los gráficos mostrados. Podría "
-"agregar gráficos y cambiar la velocidad de actualización en 'Configuración', "
-"o eliminar cualquier gráfico utilizando el icono de rueda dentada en cada "
-"gráfico.\n"
-"<p>Cuando vea un pico repentino de actividad, seleccione el intervalo de "
-"tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y "
-"arrastrando sobre el gráfico. Esto cargará las estadísticas de los "
-"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</p>"
+"<b>Utilizando el monitorizador:</b><br /> ¡Ya está listo! Una vez que pulse "
+"en 'Iniciar monitorización' el navegador actualizará a intervalos regulares "
+"todos los gráficos mostrados. Puede agregar gráficos y cambiar la velocidad "
+"de actualización en la sección 'Configuración' o eliminar cualquier gráfico "
+"utilizando el icono de rueda dentada en cada gráfico. <p>Cuando vea un pico "
+"repentino de actividad, seleccione el intervalo de tiempo relevante en el "
+"gráfico manteniendo pulsado el botón izquierdo y arrastrando sobre el "
+"gráfico. Esto cargará las estadísticas de los registros, lo que lo ayudará a "
+"encontrar la causa del pico de actividad.</p>"
 
 #: server_status.php:1375
-#, fuzzy
 #| msgid ""
 #| "<b>Please note:</b>\n"
 #| "        Enabling the general_log may increase the server load by 5-15%. "
@@ -10135,13 +10131,12 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
-"<b>Notar que:</b>\n"
-"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. "
-"También esté al tanto que generar estadísticas de los registros es una tarea "
-"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo "
-"más pequeño posible y desactivar «general_log» y vaciar sus tablas una vez "
-"que ya no se necesite monitorizar.\n"
-"        "
+"<b>Notar que:</b> Activar «general_log» puede aumentar la carga en el "
+"servidor hasta un 5-15%. También esté al tanto que generar estadísticas de "
+"los registros es una tarea muy intensiva por lo que se recomienda "
+"seleccionar un período de tiempo lo más pequeño posible y desactivar "
+"«general_log» y vaciar sus tablas una vez que ya no se necesite monitorizar. "
+"       "
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/po/fr.po b/po/fr.po
index 839fdec93a..b7488f0b56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-29 16:58+0200\n"
+"PO-Revision-Date: 2011-08-01 12:56+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1342,6 +1342,10 @@ msgid ""
 "However only the SQL query itself has been used as a grouping criteria, so "
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
+"Cette colonne montre le nombre de requêtes identiques qui sont regroupées. "
+"Cependant, seulement le texte SQL de la requête a été utilisé comme critère "
+"de regroupement, donc les autres propriétés des requêtes, comme l'heure de "
+"début, peuvent différer."
 
 #: js/messages.php:144
 msgid ""
@@ -9992,6 +9996,11 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
+"Le moniteur phpMyAdmin peut vous aider à optimiser la configuration serveur "
+"et à traquer les requêtes qui prennent beaucoup de temps. Pour ce faire vous "
+"devrez régler le paramètre log_output à 'TABLE' et activer le journal "
+"slow_query_log ou general_log. Cependant, general_log produit beaucoup de "
+"données et augmente jusqu'à 15% la charge du serveur"
 
 #: server_status.php:1371
 msgid ""
@@ -10004,6 +10013,15 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b>Utilisation de la surveillance :</b><br />Vous êtes maintenant prêt! "
+"Après avoir cliqué sur «Démarrer la surveillance», votre navigateur va "
+"rafraîchir les graphiques à intervalle régulier. Vous pouvez ajouter des "
+"graphiques et modifier le taux de rafraîchissement sous «Paramètres», ou "
+"supprimer tout graphique via l'cône de rouage.<p>Lorsque vous constatez un "
+"pic d'activité soudain, sélectionnez la portion de temps pertinent sur l'un "
+"des graphiques en tenant enfoncé le bouton gauche de la souris et en vous "
+"déplaçant sur le graphique. Ceci va charger les statistiques à partir des "
+"journaux et vous aidera à trouver la cause du pic dans l'activité.</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -10013,6 +10031,11 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>À noter :</b>Activer le journal general_log peut causer une augmentation "
+"de charge de 5 à 15%. Également, la génération des statistiques à partir des "
+"journaux est une tâche intensive, donc il est suggéré de ne sélectionner "
+"qu'une petite portion de temps et de désactiver general_log puis de vider la "
+"table correspondante lorsque la surveillance n'est plus requise."
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/po/ja.po b/po/ja.po
index 45da9a4aff..a6d0479401 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-27 12:14+0200\n"
+"PO-Revision-Date: 2011-08-02 16:09+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1201,27 +1201,27 @@ msgstr "モニタ一時中断"
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log および slow_query_log は有効です。"
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log は有効です。"
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log は有効です。"
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log および general_log は無効です。"
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output はテーブルに設定されていません。"
 
 #: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output はテーブルに設定されています。"
 
 #: js/messages.php:120
 #, php-format
@@ -1230,11 +1230,13 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log は有効になっていますが、サーバは %d "
+"秒より長くかかるクエリだけをログに記録します。お使いのシステムによっては、long_query_time を 0～2 秒に設定したほうがいいでしょう。"
 
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time は %d 秒に設定されています。"
 
 #: js/messages.php:122
 msgid ""
@@ -1246,10 +1248,10 @@ msgstr ""
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "出力をファイルに保存する"
+msgstr "%s に log_output を設定する"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
@@ -1267,7 +1269,7 @@ msgstr "%s を無効にする"
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "long_query_time を %d 秒に設定する"
 
 #: js/messages.php:131
 msgid ""
@@ -1311,7 +1313,7 @@ msgstr ""
 
 #: js/messages.php:142
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "ログの解析および読み込み中。すこし時間がかかることがあります。"
 
 #: js/messages.php:143
 msgid ""
@@ -1329,17 +1331,16 @@ msgstr ""
 
 #: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "ログデータを読み込みました。この期間に行われたクエリは以下の通りです。"
 
 #: js/messages.php:147
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "データベースに移動"
+msgstr "ログの表に移動する"
 
 #: js/messages.php:148
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "ログの解析を行いましたが、この期間のデータは見つかりませんでした。"
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1357,7 +1358,7 @@ msgstr ""
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "クエリをまとめる（WHERE 句内のデータ部（文字列や数値など）は同一として扱われます）"
 
 #: js/messages.php:156
 #, fuzzy
@@ -1366,10 +1367,9 @@ msgid "Sum of grouped rows:"
 msgstr "挿入する行数"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "合計"
+msgstr "合計:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -9782,10 +9782,9 @@ msgid "Start Monitor"
 msgstr "モニタ開始"
 
 #: server_status.php:1328
-#, fuzzy
 #| msgid "Introduction"
 msgid "Instructions/Setup"
-msgstr "はじめに"
+msgstr "使用方法／セットアップ"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
@@ -9812,13 +9811,11 @@ msgid "Clear monitor config"
 msgstr "モニタ設定のクリア"
 
 #: server_status.php:1363
-#, fuzzy
 #| msgid "Introduction"
 msgid "Monitor Instructions"
-msgstr "はじめに"
+msgstr "モニタの使用方法"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -9834,11 +9831,9 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
-"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡する"
-"ことができます。後者の場合には、テーブルに log_output を設定し、"
-"slow_query_log または general_log のいずれかを有効にする必要があります。な"
-"お、general_log を大量のデータを生成し、サーバの負荷を 15% 増加させますので、"
-"注意するようにしてください。"
+"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output "
+"を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log "
+"は大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。"
 
 #: server_status.php:1371
 msgid ""
@@ -9851,6 +9846,10 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b>モニタの使い方：</b><br/>「モニタ開始」をクリックすると、ブラウザは一定間隔で表示されている全てのグラフを更新します。「設定」のところより"
+"グラフを追加や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を行えます。<p>モニタリングしていてスパイク信号が見られることが"
+"あります。マウスの左ボタンを押したままグラフの上をドラッグするように移動させことで、グラフの任意の期間を選択できます。こうすることでログから統計の読み込"
+"みが行え、スパイク信号の原因を探ることができます。</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9860,6 +9859,9 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>注意事項：</b>general_log を有効にすると、5～15% サーバの負荷が増加することがあります。ログから生成される統計は、負荷が集中す"
+"る作業であることを認識しておいてください。ですから、テーブルのモニタで必要としないのであれば、しばらくの間 general_log "
+"を無効にして空にしておくのが望ましいです。"
 
 #: server_status.php:1385
 msgid "CPU Usage"
@@ -9916,26 +9918,23 @@ msgid "Series in Chart:"
 msgstr "グラフの系列"
 
 #: server_status.php:1445
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "読み込み中"
+msgstr "ログの読み込み"
 
 #: server_status.php:1448
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "統計を表示する"
+msgstr "ログの統計"
 
 #: server_status.php:1449
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "ページを選択してください"
+msgstr "選択期間："
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "SELECT、INSERT、UPDATE、DELETE 文のみ取得する"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
@@ -9945,7 +9944,7 @@ msgstr ""
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
-msgstr ""
+msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。"
 
 #: server_status.php:1465
 #, fuzzy
diff --git a/po/sv.po b/po/sv.po
index 0653cf8d6f..e014c8a295 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-31 18:29+0200\n"
+"PO-Revision-Date: 2011-07-31 21:19+0200\n"
 "Last-Translator:  <stefan@inkopsforum.se>\n"
 "Language-Team: swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -7119,28 +7119,24 @@ msgid "You must provide a trigger name"
 msgstr "Du måste ange ett triggernamn"
 
 #: libraries/rte/rte_triggers.lib.php:404
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a valid timing for the trigger"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange en giltig tidsgräns för triggern"
 
 #: libraries/rte/rte_triggers.lib.php:409
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid event for the trigger"
-msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
+msgstr "Du måste ange en giltig händelse för triggern"
 
 #: libraries/rte/rte_triggers.lib.php:415
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a valid table name"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange ett giltigt tabellnamn"
 
 #: libraries/rte/rte_triggers.lib.php:421
-#, fuzzy
 #| msgid "You must provide a routine definition."
 msgid "You must provide a trigger definition."
-msgstr "Du måste ange en rutindefinition."
+msgstr "Du måste ange en trigger definition."
 
 #: libraries/rte/rte_words.lib.php:18
 msgid "Add routine"
@@ -7152,16 +7148,14 @@ msgid "Export of routine %s"
 msgstr "Exportera rutin %s"
 
 #: libraries/rte/rte_words.lib.php:21
-#, fuzzy
 #| msgid "Routines"
 msgid "routine"
-msgstr "Rutiner"
+msgstr "Rutin"
 
 #: libraries/rte/rte_words.lib.php:22
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create a routine"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte den nödvändiga behörigheent att skapa en rutin"
 
 #: libraries/rte/rte_words.lib.php:23
 #, php-format
@@ -7173,10 +7167,9 @@ msgid "There are no routines to display."
 msgstr "Det finns inga rutiner att visa."
 
 #: libraries/rte/rte_words.lib.php:30
-#, fuzzy
 #| msgid "Add a trigger"
 msgid "Add trigger"
-msgstr "Lägg till en ny Trigger"
+msgstr "Lägg till trigger"
 
 #: libraries/rte/rte_words.lib.php:32
 #, php-format
@@ -7184,32 +7177,29 @@ msgid "Export of trigger %s"
 msgstr "Exportera trigger %s"
 
 #: libraries/rte/rte_words.lib.php:33
-#, fuzzy
 #| msgid "Triggers"
 msgid "trigger"
-msgstr "Trigger"
+msgstr "trigger"
 
 #: libraries/rte/rte_words.lib.php:34
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create a trigger"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte den nödvändiga behörigheten att skapa en trigger"
 
 #: libraries/rte/rte_words.lib.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "No routine with name %1$s found in database %2$s"
 msgid "No trigger with name %1$s found in database %2$s"
-msgstr "Ingen rutin med namnet %1$s finns i databasen %2$s"
+msgstr "Ingen trigger med namnet %1$s finns i databasen %2$s"
 
 #: libraries/rte/rte_words.lib.php:36
 msgid "There are no triggers to display."
 msgstr "Det finns inga triggers att visa"
 
 #: libraries/rte/rte_words.lib.php:42
-#, fuzzy
 #| msgid "Add an event"
 msgid "Add event"
-msgstr "Lägg till en ny händelse"
+msgstr "Lägg till händelse"
 
 #: libraries/rte/rte_words.lib.php:44
 #, php-format
@@ -7217,22 +7207,20 @@ msgid "Export of event %s"
 msgstr "Exportera händelse %s"
 
 #: libraries/rte/rte_words.lib.php:45
-#, fuzzy
 #| msgid "Event"
 msgid "event"
-msgstr "Händelse"
+msgstr "händelse"
 
 #: libraries/rte/rte_words.lib.php:46
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create an event"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte tillräcklig behörighet för att skapa en händelse"
 
 #: libraries/rte/rte_words.lib.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No event with name %s found in database %s"
 msgid "No event with name %1$s found in database %2$s"
-msgstr "Ingen händelse med namnet %s finns i databasen %s"
+msgstr "Ingen händelse med namnet %1$s hittades i databasen %2$s"
 
 #: libraries/rte/rte_words.lib.php:48
 msgid "There are no events to display."
@@ -9076,10 +9064,9 @@ msgstr "Alla statusvariabler"
 
 #: server_status.php:619
 msgid "Monitor"
-msgstr ""
+msgstr "Övervaka"
 
 #: server_status.php:629 server_status.php:651
-#, fuzzy
 #| msgid "Refresh rate:"
 msgid "Refresh rate: "
 msgstr "Uppdateringsfrekvens:"
@@ -9102,10 +9089,10 @@ msgstr "Liknande länkar:"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:738
-#, fuzzy, php-format
+#, php-format
 #| msgid "Network traffic since startup: %s"
 msgid "Questions since startup: %s"
-msgstr "Nätverkstrafik sedan start:%s"
+msgstr "Frågor sedan start: %s"
 
 #: server_status.php:744 server_status.php:779 server_status.php:895
 #: server_status.php:940
@@ -9135,10 +9122,10 @@ msgid "Network traffic since startup: %s"
 msgstr "Nätverkstrafik sedan start:%s"
 
 #: server_status.php:852
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "Denna MySQL-server har varit igång i %s. Den startade den %s."
+msgstr "Denna MySQL-servern har varit igång i %1$s. Den startade den %2$s."
 
 #: server_status.php:862
 msgid ""
@@ -9215,6 +9202,8 @@ msgid ""
 "The number of connections that were aborted because the client died without "
 "closing the connection properly."
 msgstr ""
+"Antalet anslutningar som avbröts eftersom klienten dog utan att stänga "
+"anslutningen ordentligt."
 
 #: server_status.php:1076
 msgid "The number of failed attempts to connect to the MySQL server."
@@ -9871,49 +9860,44 @@ msgid "The number of threads that are not sleeping."
 msgstr "Antalet trådar som inte är vilande."
 
 #: server_status.php:1320
-#, fuzzy
 #| msgid "Start row"
 msgid "Start Monitor"
-msgstr "Starta rad"
+msgstr "Starta Monitor"
 
 #: server_status.php:1328
 msgid "Instructions/Setup"
-msgstr ""
+msgstr "Instruktioner/Setup"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Klar ändra/editera diagram"
 
 #: server_status.php:1339
-#, fuzzy
 #| msgid "Add parameter"
 msgid "Add chart"
-msgstr "Lägg till parameter"
+msgstr "Lägg till diagram"
 
 #: server_status.php:1341
 msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Ordna/editera diagram"
 
 #: server_status.php:1343
 msgid "Refresh rate:"
 msgstr "Uppdateringsfrekvens:"
 
 #: server_status.php:1346
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns:"
-msgstr "Textarea kolumner"
+msgstr "Visa kolumner:"
 
 #: server_status.php:1360
-#, fuzzy
 #| msgid "User for config auth"
 msgid "Clear monitor config"
-msgstr "Användare för config auth"
+msgstr "Rensa monitor config"
 
 #: server_status.php:1363
-#, fuzzy
 msgid "Monitor Instructions"
-msgstr "Information"
+msgstr "Övervaka instruktioner"
 
 #: server_status.php:1364
 msgid ""
@@ -9923,6 +9907,11 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
+"phpMyAdmin Monitor hjälpa dig optimera server konfigurationen och spåra tid "
+"intensivt \\ icke intensiva frågor. För de senare måste du ställa log_output "
+"till \"TABLE\" och ha antingen slow_query_log eller general_log aktiverat. "
+"Observera att general_log producerar mycket data och ökar lasten på servern "
+"med upp till 15%"
 
 #: server_status.php:1371
 msgid ""
@@ -9935,6 +9924,17 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b> Använda monitorn: </b><br/>\n"
+"  Ok, du är klar stt sätta igång! När du klickar på \"Start monitor\" kommer "
+"webbläsaren uppdatera alla visade diagram \n"
+"  med jämna mellanrum. Du kan lägga till diagram och ändra "
+"uppdateringsfrekvensen under \"Inställningar\", eller ta bort diagram \n"
+"  med tyngdpunkten ikonen på respektive diagram. \n"
+"  <p> När du får en plötslig topp i akviviteten, ävlj önskad tidsperiod på "
+"önskadt diagram genom att hålla ner \n"
+"  vänster musknapp och panorera över diagrammet. Detta kommer ladda "
+"statistik från loggarna vilka hjälper dig att hitta vad som orsakade \n"
+"  aktivitetstopp. </ p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9942,112 +9942,109 @@ msgid ""
 "5-15%. Also be aware that generating statistics from the logs is a load "
 "intensive task, so it is advisable to select only a small time span and to "
 "disable the general_log and empty its table once monitoring is not required "
-"any more."
+"any more.\n"
 msgstr ""
+"<b>Observera:</b>\n"
+" Att aktivera general_log kan öka belastningen på servern med 5-15%. Var "
+"medveten om att generera statistik från loggarna är en \n"
+"belastningsintensiv uppgift, så det är klokt att välja en kort tidsperiod "
+"samt att inaktivera general_log och tömma tabellen när övervakningen inte "
+"behövs längre. \n"
 
 #: server_status.php:1385
-#, fuzzy
 #| msgid "Usage"
 msgid "CPU Usage"
-msgstr "Användning"
+msgstr "CPU Användning"
 
 #: server_status.php:1388
 msgid "Memory Usage"
-msgstr ""
+msgstr "Minnesanvändning"
 
 #: server_status.php:1391
-#, fuzzy
 #| msgid "Usage"
 msgid "Swap Usage"
-msgstr "Användning"
+msgstr "Swap användning"
 
 #: server_status.php:1394
-#, fuzzy
 #| msgid "All status variables"
 msgid "Status variable(s)"
 msgstr "Alla statusvariabler"
 
 #: server_status.php:1396
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select series:"
-msgstr "Välj tabeller"
+msgstr "Välj serier:"
 
 #: server_status.php:1398
 msgid "Commonly monitored"
-msgstr ""
+msgstr "Vanligen övervakade"
 
 #: server_status.php:1413
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "or type variable name:"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "eller skriv ett variabelnamn:"
 
 #: server_status.php:1417
 msgid "Display as differential value"
-msgstr ""
+msgstr "Visa som differensvärde"
 
 #: server_status.php:1419
 msgid "Apply a divisor"
-msgstr ""
+msgstr "Tillämpa en dividend"
 
 #: server_status.php:1426
 msgid "Append unit to data values"
-msgstr ""
+msgstr "Lägg till enhet till datavärdena"
 
 #: server_status.php:1432
-#, fuzzy
 #| msgid "Add a trigger"
 msgid "Add this series"
-msgstr "Lägg till en ny Trigger"
+msgstr "Lägg till denna serie"
 
 #: server_status.php:1434
 msgid "Clear series"
-msgstr ""
+msgstr "Rensa serier"
 
 #: server_status.php:1437
-#, fuzzy
 #| msgid "Series:"
 msgid "Series in Chart:"
-msgstr "Serie:"
+msgstr "Serier i diagram:"
 
 #: server_status.php:1445
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "Laddar"
+msgstr "Läser in loggar"
 
 #: server_status.php:1448
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "Visa statistik"
+msgstr "Logga statistik"
 
 #: server_status.php:1449
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "Välj sida"
+msgstr "Valt tidsintervall:"
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Hämta endast SELECT, INSERT, UPDATE och DELETE kommandon"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
-msgstr ""
+msgstr "Ta bort variabeldata med INSERT kommandon för bättre gruppering"
 
 #: server_status.php:1462
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
 msgstr ""
+"<p>Välj den logg du vill att statistiken ska genereras från. </p>Resultaten "
+"grupperas efter frågetexten."
 
 #: server_status.php:1465
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Fråge-typ"
+msgstr "Fråge analyserare"
 
 #: server_status.php:1501
 #, php-format
diff --git a/po/tr.po b/po/tr.po
index e81dc1fa0d..3e427ddc53 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-29 21:55+0200\n"
+"PO-Revision-Date: 2011-08-02 10:45+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1313,7 +1313,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Günlükler çözümleniyor ve yükleniyor. Bu biraz zaman alabilir."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1324,8 +1323,8 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Bu sütunlar birlikte gruplanmış özdeş sorguların miktarını gösterir. Ancak "
-"sadece SQL Metin karşılaştırılır, böylece başlama zamanı gibi sorgular diğer "
-"öznitelikler farklı olabilir."
+"sadece SQL Metnin kendisi gruplama kriteri olarak kullanılır, böylece "
+"başlama zamanı gibi, sorguların diğer öznitelikleri farklı olabilir."
 
 #: js/messages.php:144
 msgid ""
@@ -1346,10 +1345,9 @@ msgid "Jump to Log table"
 msgstr "Günlük tablosuna atla"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
-msgstr "Günlük çözümlendi, ama bu zaman aralığında bulunan veri yok."
+msgstr "Günlük çözümlendi, ama bu zaman aralığı içinde bulunan veri yok."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1363,13 +1361,12 @@ msgstr "Süzgeç"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr "Kelime/düzenli ifadeye göre sorguları süz"
+msgstr "Kelime/düzenli ifadeye göre sorguları süz:"
 
 #: js/messages.php:155
-#, fuzzy
 #| msgid "Group queries, ignoring variable data in WHERE statements"
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr "Sorguları grupla, WHERE ifadelerindeki değişken veri yoksayılıyor"
+msgstr "Grup sorguları, WHERE cümleciklerindeki değişken veri yoksayılıyor"
 
 #: js/messages.php:156
 msgid "Sum of grouped rows:"
@@ -9897,7 +9894,6 @@ msgid "Monitor Instructions"
 msgstr "İzleme Yönergeleri"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -9914,14 +9910,12 @@ msgid ""
 "increases server load by up to 15%"
 msgstr ""
 "phpMyAdmin İzleyici sunucu yapılandırmasını uyarlamada ve yoğun sorgularda "
-"iz sürme süresinde size yardımcı\n"
-"olabilir. Sonrası için log_output'u 'TABLE'a ayarlamanız gerekecektir ve ya "
-"slow_query_log ya da general_log etkinleştirilir.\n"
-"Ancak unutmayın, general_log çok fazla veri üretir ve sunucu yükünü %15'e "
-"kadar arttırır"
+"iz sürme süresinde size yardımcı olabilir. Sonrası için log_output'u "
+"'TABLE'a ayarlamanız gerekecektir ve ya slow_query_log ya da general_log "
+"etkinleştirilir. Ancak unutmayın, general_log çok fazla veri üretir ve "
+"sunucu yükünü %15'e kadar arttırır"
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -9944,17 +9938,14 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>İzleyici kullanımı:</b><br/>\n"
-"Tamam, ilerlemeye hazırsınız! Bir kere 'İzlemeyi başlat'a tıkladığınızda "
-"tarayıcınız tüm görüntülenen\n"
-"çizelgeleri düzenli aralıklarla yenileyecek. 'Ayarlar' altında çizelgeleri "
-"ekleyebilir ve yenileme oranını değiştirebilirsiniz\n"
-"veya her çizelgenin kendi dişli çark simgesini kullanarak herhangi bir "
-"çizelgeyi kaldırabilirsiniz.\n"
-"<p>Ani hareketlilik gördüğünüzde, herhangi bir çizlgede sol fare tuşunu "
-"basılı tutarak ve çizelge üzerinde kaydırarak\n"
-"ilgili zaman aralığını seçin. Bu, ani hareketlenmenin sebebini bulmanızda "
-"yardımcı olan istatistikleri günlükten\n"
+"<b>İzleyici kullanımı:</b><br/> Tamam, ilerlemeye hazırsınız! Bir kere "
+"'İzlemeyi başlat'a tıkladığınızda tarayıcınız tüm görüntülenen çizelgeleri "
+"düzenli aralıklarla yenileyecek. 'Ayarlar' altında çizelgeleri ekleyebilir "
+"ve yenileme oranını değiştirebilirsiniz veya her çizelgenin kendi dişli çark "
+"simgesini kullanarak herhangi bir çizelgeyi kaldırabilirsiniz. <p>Ani "
+"hareketlilik gördüğünüzde, herhangi bir çizlgede sol fare tuşunu basılı "
+"tutarak ve çizelge üzerinde kaydırarak ilgili zaman aralığını seçin. Bu, ani "
+"hareketlenmenin sebebini bulmanızda yardımcı olan istatistikleri günlükten "
 "yükleyecek.</p>"
 
 #: server_status.php:1375
@@ -9965,14 +9956,11 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
-"<b>Lütfen unutmayın:</b>\n"
-"        general_log'u etkinleştirmek sunucu yükünü %5-15 arttırabilir. Aynı "
-"zamanda günlükten oluşturulan istatistiklerin yoğun görev yükü olduğundan "
-"haberiniz olsun\n"
-"         bu yüzden sadece küçük zaman aralıkları seçmek ve general_log'u "
-"etkisizleştirmek tavsiye edilir ve tablolarını bir defa boşaltmak daha fazla "
-"izlemeyi gerektirmez.\n"
-"        "
+"<b>Lütfen unutmayın:</b> general_log'u etkinleştirmek sunucu yükünü %5-15 "
+"arttırabilir. Aynı zamanda günlükten oluşturulan istatistiklerin yoğun görev "
+"yükü olduğundan haberiniz olsun bu yüzden sadece küçük zaman aralıkları "
+"seçmek ve general_log'u etkisizleştirmek tavsiye edilir ve tablolarını bir "
+"defa boşaltmak daha fazla izlemeyi gerektirmez."
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/server_status.php b/server_status.php
index 7e4babdc34..e5bb06f1cb 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1055,7 +1055,19 @@ function printServerTraffic() {
         <td><?php echo $process['Command']; ?></td>
         <td class="value"><?php echo $process['Time']; ?></td>
         <td><?php echo (empty($process['State']) ? '---' : $process['State']); ?></td>
-        <td><?php echo (empty($process['Info']) ? '---' : PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']))); ?></td>
+        <td>
+        <?php
+        if (empty($process['Info'])) {
+            echo '---';
+        } else {
+            if (empty($_REQUEST['full']) && strlen($process['Info']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+                echo htmlspecialchars(substr($process['Info'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
+            } else {
+                echo PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']));
+            }
+        }
+        ?>
+        </td>
     </tr>
         <?php
         $odd_row = ! $odd_row;
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 9823cbd31e..334953f83f 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -115,14 +115,20 @@ function PMA_version_check()
             $data = curl_exec($ch);
             curl_close($ch);
         } else {
-            messages_set('error', $message_id, __('Version check'),
+            messages_set(
+                'error',
+                $message_id,
+                __('Version check'),
                 __('Neither URL wrapper nor CURL is available. Version check is not possible.'));
             return;
         }
     }
 
     if (empty($data)) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'));
         return;
     }
@@ -139,14 +145,20 @@ function PMA_version_check()
 
     $version_upstream = version_to_int($version);
     if ($version_upstream === false) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Got invalid version string from server'));
         return;
     }
 
     $version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION'));
     if ($version_local === false) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Unparsable version string'));
         return;
     }
@@ -154,14 +166,23 @@ function PMA_version_check()
     if ($version_upstream > $version_local) {
         $version = htmlspecialchars($version);
         $date = htmlspecialchars($date);
-        messages_set('notice', $message_id, __('Version check'),
+        messages_set(
+            'notice',
+            $message_id,
+            __('Version check'),
             sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date));
     } else {
         if ($version_local % 100 == 0) {
-            messages_set('notice', $message_id, __('Version check'),
+            messages_set(
+                'notice',
+                $message_id,
+                __('Version check'),
                 PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date)));
         } else {
-            messages_set('notice', $message_id, __('Version check'),
+            messages_set(
+                'notice',
+                $message_id,
+                __('Version check'),
                 __('No newer stable version is available'));
         }
     }
@@ -170,7 +191,7 @@ function PMA_version_check()
 /**
  * Calculates numerical equivalent of phpMyAdmin version string
  *
- * @param string  version
+ * @param string  $version
  * @return mixed  false on failure, integer on success
  */
 function version_to_int($version)
@@ -197,7 +218,10 @@ function version_to_int($version)
                 $added = 0;
                 break;
             default:
-                messages_set('notice', 'version_match', __('Version check'),
+                messages_set(
+                    'notice',
+                    'version_match',
+                    __('Version check'),
                     'Unknown version part: ' . htmlspecialchars($matches[6]));
                 $added = 0;
                 break;
@@ -292,7 +316,10 @@ function perform_config_checks()
         //
         if (!$cf->getValue("Servers/$i/ssl")) {
             $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/ssl", $title,
+            messages_set(
+                'notice',
+                "Servers/$i/ssl",
+                $title,
                 __('You should use SSL connections if your web server supports it.'));
         }
 
@@ -302,7 +329,10 @@ function perform_config_checks()
         //
         if ($cf->getValue("Servers/$i/extension") == 'mysql') {
             $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/extension", $title,
+            messages_set(
+                'notice',
+                "Servers/$i/extension",
+                $title,
                 __('You should use mysqli for performance reasons.'));
         }
 
@@ -314,9 +344,12 @@ function perform_config_checks()
                 && $cf->getValue("Servers/$i/user") != ''
                 && $cf->getValue("Servers/$i/password") != '') {
             $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/auth_type", $title,
-                    PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
-                            PMA_lang($strSecurityInfoMsg, $i));
+            messages_set(
+                'notice',
+                "Servers/$i/auth_type",
+                $title,
+                PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
+                    PMA_lang($strSecurityInfoMsg, $i));
         }
 
         //
@@ -327,9 +360,12 @@ function perform_config_checks()
         if ($cf->getValue("Servers/$i/AllowRoot")
                 && $cf->getValue("Servers/$i/AllowNoPassword")) {
             $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/AllowNoPassword", $title,
-                    __('You allow for connecting to the server without a password.') . ' ' .
-                            PMA_lang($strSecurityInfoMsg, $i));
+            messages_set(
+                'notice',
+                "Servers/$i/AllowNoPassword",
+                $title,
+                __('You allow for connecting to the server without a password.') . ' ' .
+                    PMA_lang($strSecurityInfoMsg, $i));
         }
     }
 
@@ -340,7 +376,9 @@ function perform_config_checks()
     if ($cookie_auth_used) {
         if ($blowfish_secret_set) {
             // 'cookie' auth used, blowfish_secret was generated
-            messages_set('notice', 'blowfish_secret_created',
+            messages_set(
+                'notice',
+                'blowfish_secret_created',
                 PMA_lang(PMA_lang_name('blowfish_secret')),
                 $strBlowfishSecretMsg);
         } else {
@@ -358,7 +396,9 @@ function perform_config_checks()
                 $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.'));
             }
             if (!empty($blowfish_warnings)) {
-                messages_set('error', 'blowfish_warnings' . count($blowfish_warnings),
+                messages_set(
+                    'error',
+                    'blowfish_warnings' . count($blowfish_warnings),
                     PMA_lang(PMA_lang_name('blowfish_secret')),
                     implode('<br />', $blowfish_warnings));
             }
@@ -370,7 +410,9 @@ function perform_config_checks()
     // should be enabled if possible
     //
     if (!$cf->getValue('ForceSSL')) {
-        messages_set('notice', 'ForceSSL',
+        messages_set(
+            'notice',
+            'ForceSSL',
             PMA_lang(PMA_lang_name('ForceSSL')),
             PMA_lang($strForceSSLNotice));
     }
@@ -380,7 +422,9 @@ function perform_config_checks()
     // should be disabled
     //
     if ($cf->getValue('AllowArbitraryServer')) {
-        messages_set('notice', 'AllowArbitraryServer',
+        messages_set(
+            'notice',
+            'AllowArbitraryServer',
             PMA_lang(PMA_lang_name('AllowArbitraryServer')),
             PMA_lang($strAllowArbitraryServerWarning));
     }
@@ -394,7 +438,9 @@ function perform_config_checks()
         $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')
             ? 'error'
             : 'notice';
-        messages_set($message_type, 'LoginCookieValidity',
+        messages_set(
+            $message_type,
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning));
     }
@@ -404,7 +450,9 @@ function perform_config_checks()
     // should be at most 1800 (30 min)
     //
     if ($cf->getValue('LoginCookieValidity') > 1800) {
-        messages_set('notice', 'LoginCookieValidity',
+        messages_set(
+            'notice',
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning2));
     }
@@ -415,7 +463,9 @@ function perform_config_checks()
     // LoginCookieValidity must be less or equal to LoginCookieStore
     //
     if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) {
-       messages_set('error', 'LoginCookieValidity',
+        messages_set(
+            'error',
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning3));
     }
@@ -425,7 +475,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('SaveDir') != '') {
-        messages_set('notice', 'SaveDir',
+        messages_set(
+            'notice',
+            'SaveDir',
             PMA_lang(PMA_lang_name('SaveDir')),
             PMA_lang($strDirectoryNotice));
     }
@@ -435,7 +487,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('TempDir') != '') {
-        messages_set('notice', 'TempDir',
+        messages_set(
+            'notice',
+            'TempDir',
             PMA_lang(PMA_lang_name('TempDir')),
             PMA_lang($strDirectoryNotice));
     }
@@ -446,7 +500,9 @@ function perform_config_checks()
     //
     if ($cf->getValue('GZipDump')
             && (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
-        messages_set('error', 'GZipDump',
+        messages_set(
+            'error',
+            'GZipDump',
             PMA_lang(PMA_lang_name('GZipDump')),
             PMA_lang($strGZipDumpWarning, 'gzencode'));
     }
@@ -463,7 +519,9 @@ function perform_config_checks()
         $functions .= @function_exists('bzcompress')
                 ? ''
                 : ($functions ? ', ' : '') . 'bzcompress';
-        messages_set('error', 'BZipDump',
+        messages_set(
+            'error',
+            'BZipDump',
             PMA_lang(PMA_lang_name('BZipDump')),
             PMA_lang($strBZipDumpWarning, $functions));
     }
@@ -473,7 +531,9 @@ function perform_config_checks()
     // requires zip_open in import
     //
     if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) {
-        messages_set('error', 'ZipDump_import',
+        messages_set(
+            'error',
+            'ZipDump_import',
             PMA_lang(PMA_lang_name('ZipDump')),
             PMA_lang($strZipDumpImportWarning, 'zip_open'));
     }
@@ -483,7 +543,9 @@ function perform_config_checks()
     // requires gzcompress in export
     //
     if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) {
-        messages_set('error', 'ZipDump_export',
+        messages_set(
+            'error',
+            'ZipDump_export',
             PMA_lang(PMA_lang_name('ZipDump')),
             PMA_lang($strZipDumpExportWarning, 'gzcompress'));
     }