From c9c87fa2f246bd6a282b5a8d0a1dd9de5173c4b2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 28 Dec 2013 07:37:33 -0500
Subject: [PATCH 1/3] Remove unnecessary code

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 export.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/export.php b/export.php
index f1210c669b..16f63f8cfb 100644
--- a/export.php
+++ b/export.php
@@ -334,9 +334,6 @@ if (!defined('TESTSUITE')) {
                     exit();
                 }
             }
-            $backup_cfgServer = $cfg['Server'];
-            $cfg['Server'] = $backup_cfgServer;
-            unset($backup_cfgServer);
             echo "\n" . '<div style="text-align: ' . $cell_align_left . '">' . "\n";
             //echo '    <pre>' . "\n";
 

From 706e69e3535a532f587badd3bcce1857de288018 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 28 Dec 2013 07:59:35 -0500
Subject: [PATCH 2/3] Refactor: new PMA_getHtmlForDisplayedExportHeader()

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 export.php               | 39 +++++---------------------------
 libraries/export.lib.php | 48 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/export.php b/export.php
index 16f63f8cfb..44c49892e5 100644
--- a/export.php
+++ b/export.php
@@ -334,40 +334,11 @@ if (!defined('TESTSUITE')) {
                     exit();
                 }
             }
-            echo "\n" . '<div style="text-align: ' . $cell_align_left . '">' . "\n";
-            //echo '    <pre>' . "\n";
-
-            /**
-             * Displays a back button with all the $_REQUEST data in the URL
-             * (store in a variable to also display after the textarea)
-             */
-            $back_button = '<p>[ <a href="';
-            if ($export_type == 'server') {
-                $back_button .= 'server_export.php?' . PMA_URL_getCommon();
-            } elseif ($export_type == 'database') {
-                $back_button .= 'db_export.php?' . PMA_URL_getCommon($db);
-            } else {
-                $back_button .= 'tbl_export.php?' . PMA_URL_getCommon($db, $table);
-            }
-
-            // Convert the multiple select elements from an array to a string
-            if ($export_type == 'server' && isset($_REQUEST['db_select'])) {
-                $_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
-            } elseif ($export_type == 'database'
-                && isset($_REQUEST['table_select'])
-            ) {
-                $_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
-            }
-
-            foreach ($_REQUEST as $name => $value) {
-                $back_button .= '&amp;' . urlencode($name) . '=' . urlencode($value);
-            }
-            $back_button .= '&amp;repopulate=1">Back</a> ]</p>';
-
-            echo $back_button;
-            echo '<form name="nofunction">' . "\n";
-            echo '<textarea name="sqldump" cols="50" rows="30" '
-                . 'id="textSQLDUMP" wrap="OFF">' . "\n";
+            list($html, $back_button) = PMA_getHtmlForDisplayedExportHeader(
+                $export_type, $db, $table
+            );
+            echo $html;
+            unset($html);
         } // end download
     }
 
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index cb93ff176c..d6ce543ca8 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -397,4 +397,52 @@ function PMA_compressExport($dump_buffer, $compression)
     }
     return $dump_buffer;
 }
+
+/**
+ * Returns HTML containing the header for a displayed export
+ *
+ * @param string $export_type the export type
+ * @param string $db          the database name
+ * @param string $table       the table name
+ *
+ * @return array the generated HTML and back button
+ */
+function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
+{
+    $html = '<div style="text-align: ' . $GLOBALS['cell_align_left'] . '">';
+
+    /**
+     * Displays a back button with all the $_REQUEST data in the URL
+     * (store in a variable to also display after the textarea)
+     */
+    $back_button = '<p>[ <a href="';
+    if ($export_type == 'server') {
+        $back_button .= 'server_export.php?' . PMA_URL_getCommon();
+    } elseif ($export_type == 'database') {
+        $back_button .= 'db_export.php?' . PMA_URL_getCommon($db);
+    } else {
+        $back_button .= 'tbl_export.php?' . PMA_URL_getCommon($db, $table);
+    }
+
+    // Convert the multiple select elements from an array to a string
+    if ($export_type == 'server' && isset($_REQUEST['db_select'])) {
+        $_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
+    } elseif ($export_type == 'database'
+        && isset($_REQUEST['table_select'])
+    ) {
+        $_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
+    }
+
+    foreach ($_REQUEST as $name => $value) {
+        $back_button .= '&amp;' . urlencode($name) . '=' . urlencode($value);
+    }
+    $back_button .= '&amp;repopulate=1">Back</a> ]</p>';
+
+    $html .= $back_button
+        . '<form name="nofunction">'
+        . '<textarea name="sqldump" cols="50" rows="30" '
+        . 'id="textSQLDUMP" wrap="OFF">';
+
+    return array($html, $back_button);
+}
 ?>

From 59e89eb49e7d53f4a6469e504c74aca47fe4b916 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 28 Dec 2013 08:01:24 -0500
Subject: [PATCH 3/3] Missing localization

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/export.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index d6ce543ca8..3332ad41bb 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -436,7 +436,7 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
     foreach ($_REQUEST as $name => $value) {
         $back_button .= '&amp;' . urlencode($name) . '=' . urlencode($value);
     }
-    $back_button .= '&amp;repopulate=1">Back</a> ]</p>';
+    $back_button .= '&amp;repopulate=1">' . __('Back') . '</a> ]</p>';
 
     $html .= $back_button
         . '<form name="nofunction">'