export rework

ChangeLog

@@ -7,6 +7,17 @@ $Source$
 
 2003-06-10 Michal Cihar  <nijel@users.sourceforge.net>
     * scripts/create-release.sh: Set correct permissions before releasing.
+    * Documentation, config.inc.php3, db_details_export.php3, export.php3,
+      main.php3, server_export.php3, server_links.inc.php3, tbl_dump.php3,
+      tbl_move_copy.php3, tbl_properties_export.php3, lang/*,
+      libraries/build_dump.lib.php3, libraries/config_import.lib.php3,
+      libraries/display_export.lib.php3, libraries/export/*: Reworked export,
+      changes:
+        - support for exporting selected databases
+        - if not needed buffering, output is send directly
+        - unifies all export, so there is now more common code
+        - sql export can contain relations and mime types in comments
+        - configurable defaults for export.
 
 2003-06-09 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: Display Full/Partial text links for

Documentation.html

@@ -1571,6 +1571,14 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
         <br /><br />
     </dd>
 
+    <dt><b>$cfg['Export'] </b>array</dt>
+    <dd>
+        In this array are defined default parameters for export, names of
+        items are simmilar to texts seen on export page, so you can easily
+        identify what they mean.
+        <br /><br />
+    </dd>
+
     <dt><b>$cfg['RepeatCells'] </b>integer</dt>
     <dd>
         Repeat the headers every X cells, or 0 to deactivate.

Documentation.txt

@@ -14,8 +14,8 @@
           + Version history: ChangeLog
           + General notes: README
           + License: LICENSE
-     * Documentation version: $Id: Documentation.html,v 1.454 2003/06/02
-       08:07:47 rabus Exp $
+     * Documentation version: $Id: Documentation.html,v 1.459 2003/06/08
+       12:55:39 lem9 Exp $
 
 Requirements
 
@@ -435,11 +435,14 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           + display in an optional tool-tip the "display field" when
             browsing the master table, if you move the mouse to a column
             containing a foreign key (use also the 'table_info' table);
+            (see FAQ 6.7)
+          + in edit/insert mode, display a drop-down list of possible
+            foreign keys (key value and "display field" are shown)
+            (see FAQ 6.21)
           + display links on the table properties page, to check
             referential integrity (display missing foreign keys) for each
             described key;
-          + in query-by-example, create automatic joins (see an example
-            in the FAQ, section "Using phpMyAdmin");
+          + in query-by-example, create automatic joins (see FAQ 6.6)
           + enable you to get a PDF schema of your database (also uses
             the table_coords table).
 
@@ -975,7 +978,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           Enable Ctrl+Arrows moving between fields when editing?
 
    $cfg['LimitChars'] integer
-          Maximal number of Chars showed in a TEXT OR a BLOB field on
+          Maximal number of Chars showed in any non-numeric field on
           browse view. Can be turned off by a toggle button on the browse
           page.
 
@@ -1038,6 +1041,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           must be owned by the same user as the owner of the phpMyAdmin
           scripts.
 
+   $cfg['Export'] array
+          In this array are defined default parameters for export, names
+          of items are simmilar to texts seen on export page, so you can
+          easily identify what they mean.
+
    $cfg['RepeatCells'] integer
           Repeat the headers every X cells, or 0 to deactivate.
 
@@ -1070,7 +1078,17 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           window is opened they remain saved.
           When using the JavaScript based query window, it will always
           get updated when you click on a new table/db to browse and will
-          focus if you click on "Edit SQL" after using a query.
+          focus if you click on "Edit SQL" after using a query. You can
+          suppress updating the query window by checking the box "Do not
+          overwrite this query from outside the window" below the query
+          textarea. Then you can browse tables/databases in the
+          background without losing the contents of the textarea, so this
+          is especially useful when composing a query with tables you
+          first have to look in. The checkbox will get automatically
+          checked whenever you change the contents of the textarea.
+          Please uncheck the button whenever you definitely want the
+          query window to get updated even though you have made
+          alterations.
           If $cfg['QueryHistoryDB'] is set to TRUE you can specify the
           amount of saved history items using $cfg['QueryHistoryMax'].
           The query window also has a custom tabbed look to group the
@@ -2038,6 +2056,8 @@ FAQ - Frequently Asked Questions
    Starting from the previous example, create the PMA_table_info as
    explained in the configuration section, then browse your persons
    table, and move the mouse over a town code or country code.
+   See also FAQ 6.21 for an additionnal feature that "display field"
+   enables: drop-down list of possible values.
 
     [6.8] How can I produce a PDF schema of my database?
 
@@ -2207,6 +2227,23 @@ FAQ - Frequently Asked Questions
 
 \end{document}
 
+    [6.20] In MySQL 4, I see a lot of databases which are not mine, and cannot
+    access them.
+
+   Upgrading to MySQL 4 usually gives users a global privilege: CREATE
+   TEMPORARY TABLES. This privilege also enables users to see all the
+   database names. See this bug report.
+   So if your users do not need this privilege, you can remove it and
+   their databases list will shorten.
+
+    [6.21] In edit/insert mode, how can I see a list of possible values for a
+    field, based on some foreign table?
+
+   You have to setup appropriate links between the tables, and also setup
+   the "display field" in the foreign table. See FAQ 6.6 for an example.
+   Then, if there are 200 values or less in the foreign table, a
+   drop-down list of values will be available.
+
   [7. phpMyAdmin project]
 
     [7.1] I have found a bug. How do I inform developers?

config.inc.php3

@@ -270,6 +270,44 @@ $cfg['DefaultTabTable']       = 'tbl_properties_structure.php3';
                                    // 'tbl_select.php3 = select page
                                    // 'tbl_change.php3 = insert row page
 
+/**
+ * Export defaults
+ */
+
+$cfg['Export']['format']                    = 'sql';  // sql/latex/excel/csv/xml
+$cfg['Export']['compression']               = 'none'; // none/zip/gzip/bzip2
+
+$cfg['Export']['asfile']                    = FALSE;
+$cfg['Export']['onserver']                  = FALSE;
+$cfg['Export']['onserver_overwrite']        = FALSE;
+$cfg['Export']['remember_file_template']    = TRUE;
+
+$cfg['Export']['csv_columns']               = FALSE;
+$cfg['Export']['csv_null']                  = 'NULL';
+$cfg['Export']['csv_separator']             = ';';
+$cfg['Export']['csv_enclosed']              = '"';
+$cfg['Export']['csv_escaped']               = '\\';
+$cfg['Export']['csv_terminated']            = 'AUTO';
+$cfg['Export']['excel_null']                = 'NULL';
+
+$cfg['Export']['latex_structure']           = TRUE;
+$cfg['Export']['latex_data']                = TRUE;
+$cfg['Export']['latex_columns']             = TRUE;
+$cfg['Export']['latex_relation']            = TRUE;
+$cfg['Export']['latex_comments']            = TRUE;
+$cfg['Export']['latex_mime']                = TRUE;
+$cfg['Export']['latex_null']                = '\textit{NULL}';
+
+$cfg['Export']['sql_structure']             = TRUE;
+$cfg['Export']['sql_data']                  = TRUE;
+$cfg['Export']['sql_drop_database']         = FALSE;
+$cfg['Export']['sql_drop_table']            = FALSE;
+$cfg['Export']['sql_backquotes']            = TRUE;
+$cfg['Export']['sql_relation']              = FALSE;
+$cfg['Export']['sql_columns']               = FALSE;
+$cfg['Export']['sql_extended']              = FALSE;
+$cfg['Export']['sql_comments']              = FALSE;
+$cfg['Export']['sql_mime']                  = FALSE;
 
 /**
  * Link to the official MySQL documentation.

db_details_export.php3

@@ -16,15 +16,15 @@ require('./db_details_db_info.php3');
  */
 ?>
 <h2>
-    <?php echo $strViewDumpDB; ?>
+    <?php echo $strViewDumpDB . "\n"; ?>
 </h2>
 
 <?php
-$multi_tables = '';
+$multi_values = '';
 if ($num_tables > 1) {
 
-    $multi_tables = '<div align="center"><select name="table_select[]" size="6" multiple="multiple">';
-    $multi_tables .= "\n";
+    $multi_values = '<div align="center"><select name="table_select[]" size="6" multiple="multiple">';
+    $multi_values .= "\n";
     
     $i = 0;
     while ($i < $num_tables) {
@@ -35,25 +35,28 @@ if ($num_tables > 1) {
             $is_selected = '';
         }
         $table   = htmlspecialchars($table);
-        $multi_tables .= '                <option value="' . $table . '"' . $is_selected . '>' . $table . '</option>' . "\n";
+        $multi_values .= '                <option value="' . $table . '"' . $is_selected . '>' . $table . '</option>' . "\n";
         $i++;
     } // end while
-    $multi_tables .= "\n";
-    $multi_tables .= '</select></div>';
+    $multi_values .= "\n";
+    $multi_values .= '</select></div>';
 
     $checkall_url = 'db_details_export.php3?' 
                   . PMA_generate_common_url($db)
                   . '&amp;goto=db_details_export.php3';
     
-    $multi_tables .= '<br />
-            <a href="' . $checkall_url . '&amp;selectall=1#dumpdb" onclick="setSelectOptions(\'db_dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
+    $multi_values .= '<br />
+            <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
             &nbsp;/&nbsp;
-            <a href="' . $checkall_url . '#dumpdb" onclick="setSelectOptions(\'db_dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>
+            <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>
             <br /><br />';
-}  // end if
-echo "\n";
+} elseif ($num_tables == 0) {
+    echo $strDatabaseNoTable;
+    include('./footer.inc.php3');
+    exit;
+} // end if
 
-$tbl_dump_form_name = 'db_dump';
+$export_type = 'database';
 require('./libraries/display_export.lib.php3');
 
 /**

export.php3

@@ -0,0 +1,446 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Get the variables sent or posted to this script and a core script
+ */
+require('./libraries/grab_globals.lib.php3');
+require('./libraries/common.lib.php3');
+require('./libraries/zip.lib.php3');
+
+// What type of export are we doing?
+if ($what == 'excel') {
+    $type = 'csv';
+} else {
+    $type = $what;
+}
+
+/**
+ * Defines the url to return to in case of error in a sql statement
+ */
+require('./libraries/export/' . $type . '.php3');
+
+// Generate error url
+if ($export_type == 'server') {
+    $err_url = 'server_export.php3?' . PMA_generate_common_url();
+} elseif ($export_type == 'database') {
+    $err_url = 'db_details_export.php3?' . PMA_generate_common_url($db);
+} else {
+    $err_url = 'tbl_properties_export.php3?' . PMA_generate_common_url($db, $table);
+}
+
+/**
+ * Increase time limit for script execution and initializes some variables
+ */
+@set_time_limit($cfg['ExecTimeLimit']);
+
+// Start with empty buffer
+$dump_buffer = '';
+
+// We send fake headers to avoid browser timeout when buffering
+$time_start = time();
+
+
+/**
+ * Output handler for all exports, if needed buffering, it stores data into
+ * $dump_buffer, otherwise it prints thems out.
+ *
+ * @param   string  the insert statement
+ *
+ * @return  bool    Whether output suceeded
+ */
+function PMA_exportOutputHandler($line)
+{
+    global $time_start;
+
+    // Kanji encoding convert feature
+    if (function_exists('PMA_kanji_str_conv')) {
+        $line = PMA_kanji_str_conv($line, $GLOBALS['knjenc'], isset($GLOBALS['xkana']) ? $GLOBALS['xkana'] : '');
+    }
+    // If we have to buffer data, we will perform everything at once at the end
+    if ($GLOBALS['buffer_needed']) {
+        $GLOBALS['dump_buffer'] .= $line;
+
+        $time_now = time();
+        if ($time_start >= $time_now + 30) {
+            $time_start = $time_now;
+            header('X-pmaPing: Pong');
+        } // end if
+    } else {
+        if ($GLOBALS['asfile']) {
+            if ($GLOBALS['save_on_server']) {
+                $write_result = @fwrite($GLOBALS['file_handle'], $line);
+                if (!$write_result || ($write_result != strlen($line))) {
+                    $GLOBALS['message'] = sprintf($GLOBALS['strNoSpace'], $save_filename);
+                    return FALSE;
+                }
+                $time_now = time();
+                if ($time_start >= $time_now + 30) {
+                    $time_start = $time_now;
+                    header('X-pmaPing: Pong');
+                } // end if
+            } else {
+                // We export as file - output normally
+                if ($GLOBALS['output_charset_conversion']) {
+                    $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line);
+                }
+                echo $line;
+            }
+        } else {
+            // We export as html - replace special chars
+            echo htmlspecialchars($line);
+        }
+    }
+    return TRUE;
+} // end of the 'PMA_exportOutputHandler()' function
+
+// Will we save dump on server?
+$save_on_server = isset($cfg['SaveDir']) && !empty($cfg['SaveDir']) && !empty($onserver);
+
+// Ensure compressed formats are associated with the download feature
+if (empty($asfile)) {
+    if ($save_on_server) {
+        $asfile = TRUE;
+    } elseif (isset($compression) && ($compression == 'zip' | $compression == 'gzip' | $compression == 'bzip')) {
+        $asfile = TRUE;
+    } else {
+        $asfile = FALSE;
+    }
+} else {
+    $asfile = TRUE;
+}
+
+// Defines the default <CR><LF> format
+$crlf = PMA_whichCrlf();
+
+// Do we need to convert charset?
+$output_charset_conversion = $asfile && 
+    $cfg['AllowAnywhereRecoding'] && $allow_recoding
+    && isset($charset_of_file) && $charset_of_file != $charset;
+
+// Set whether we will need buffering
+$buffer_needed = isset($compression) && ($compression == 'zip' | $compression == 'gzip' | $compression == 'bzip');
+
+// Generate filename and mime type if needed
+if ($asfile) {
+    $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']);
+    if ($export_type == 'server') {
+        if (isset($remember_template)) {
+            setcookie('pma_server_filename_template', $filename_template , 0, 
+                substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), 
+                '', ($pma_uri_parts['scheme'] == 'https'));
+        }
+        $filename = str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template));
+    } elseif ($export_type == 'database') {
+        if (isset($remember_template)) {
+            setcookie('pma_db_filename_template', $filename_template , 0, 
+                substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), 
+                '', ($pma_uri_parts['scheme'] == 'https'));
+        }
+        $filename = str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)));
+    } else {
+        if (isset($remember_template)) {
+            setcookie('pma_table_filename_template', $filename_template , 0, 
+                substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')), 
+                '', ($pma_uri_parts['scheme'] == 'https'));
+        }
+        $filename = str_replace('__TABLE__', $table, str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template))));
+    }
+
+    // convert filename to iso-8859-1, it is safer
+    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
+        $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
+    } else {
+        $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
+    }
+
+    // Generate basic dump extension
+    if ($type == 'csv') {
+        $filename  .= '.csv';
+        $mime_type = 'text/x-csv';
+    } else if ($type == 'xml') {
+        $filename  .= '.xml';
+        $mime_type = 'text/xml';
+    } else if ($type == 'latex') {
+        $filename  .= '.tex';
+        $mime_type = 'application/x-tex';
+    } else {
+        $filename  .= '.sql';
+        // loic1: 'application/octet-stream' is the registered IANA type but
+        //        MSIE and Opera seems to prefer 'application/octetstream'
+        $mime_type = (PMA_USR_BROWSER_AGENT == 'IE' || PMA_USR_BROWSER_AGENT == 'OPERA')
+                   ? 'application/octetstream'
+                   : 'application/octet-stream';
+    }
+
+    // If dump is going to be compressed, set correct mime_type and add
+    // compression to extension
+    if (isset($compression) && $compression == 'bzip') {
+        $filename  .= '.bz2';
+        $mime_type = 'application/x-bzip';
+    } else if (isset($compression) && $compression == 'gzip') {
+        $filename  .= '.gz';
+        $mime_type = 'application/x-gzip';
+    } else if (isset($compression) && $compression == 'zip') {
+        $filename  .= '.zip';
+        $mime_type = 'application/x-zip';
+    }
+}
+
+// Open file on server if needed
+if ($save_on_server) {
+    $save_filename = $cfg['SaveDir'] . ereg_replace('[/\\]','_',$filename);
+    unset($message);
+    if (file_exists($save_filename) && empty($onserverover)) {
+        $message = sprintf($strFileAlreadyExists, $save_filename);
+    } else {
+        if (is_file($save_filename) && !is_writable($save_filename)) {
+            $message = sprintf($strNoPermission, $save_filename);
+        } else {
+            if (!$file_handle = @fopen($save_filename, 'w')) {
+                $message = sprintf($strNoPermission, $save_filename);
+            }
+        }
+    }
+    if (isset($message)) {
+        $js_to_run = 'functions.js';
+        include('./header.inc.php3');
+        if ($export_type == 'server') {
+            $active_page = 'server_export.php3';
+            include('./server_export.php3');
+        } elseif ($export_type == 'database') {
+            $active_page = 'db_details_export.php3';
+            include('./db_details_export.php3');
+        } else {
+            $active_page = 'tbl_properties_export.php3';
+            include('./tbl_properties_export.php3');
+        }
+        exit();
+    }
+}
+
+/**
+ * Send headers depending on whether the user chose to download a dump file
+ * or not
+ */
+if (!$save_on_server) {
+    if ($asfile ) {
+        // Download
+        header('Content-Type: ' . $mime_type);
+        header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        // lem9 & loic1: IE need specific headers
+        if (PMA_USR_BROWSER_AGENT == 'IE') {
+            header('Content-Disposition: inline; filename="' . $filename . '"');
+            header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+            header('Pragma: public');
+        } else {
+            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Pragma: no-cache');
+        }
+    } else {
+        // HTML
+        $backup_cfgServer = $cfg['Server'];
+        include('./header.inc.php3');
+        $cfg['Server'] = $backup_cfgServer;
+        unset($backup_cfgServer);
+        echo '<div align="' . $cell_align_left . '">' . "\n";
+        echo '    <pre>' . "\n";
+    } // end download
+}
+
+// Check if we have something to export
+if ($export_type == 'database') {
+    $tables     = PMA_mysql_list_tables($db);
+    $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+    if ($num_tables == 0) {
+        $message = $strNoTablesFound;
+        $js_to_run = 'functions.js';
+        include('./header.inc.php3');
+        if ($export_type == 'server') {
+            $active_page = 'server_export.php3';
+            include('./server_export.php3');
+        } elseif ($export_type == 'database') {
+            $active_page = 'db_details_export.php3';
+            include('./db_details_export.php3');
+        } else {
+            $active_page = 'tbl_properties_export.php3';
+            include('./tbl_properties_export.php3');
+        }
+        exit();
+    }
+}
+
+// Add possibly some comments to export
+PMA_exportHeader();
+
+// Will we need relation & co. setup?
+$do_relation = isset($GLOBALS[$what . '_relation']);
+$do_comments = isset($GLOBALS[$what . '_comments']);
+$do_mime     = isset($GLOBALS[$what . '_mime']);
+if ($do_relation || $do_comments || $do_mime) {
+    require('./libraries/relation.lib.php3');
+    $cfgRelation = PMA_getRelationsParam();
+}
+if ($do_mime) {
+    require('./libraries/transformations.lib.php3');
+}
+
+/**
+ * Builds the dump
+ */
+// Gets the number of tables if a dump of a database has been required
+if ($export_type == 'server') {
+    /**
+     * Gets the databases list - if it has not been built yet
+     */
+    if ($server > 0 && empty($dblist)) {
+        PMA_availableDatabases();
+    }
+    
+    if (isset($db_select)) {
+        $tmp_select = implode($db_select, '|');
+        $tmp_select = '|' . $tmp_select . '|';
+    }
+    // Walk over databases
+    reset($dblist);
+    while (list(, $current_db) = each($dblist)) {
+        if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
+            || !isset($tmp_select)) {
+            PMA_exportDBHeader($current_db);
+            PMA_exportDBCreate($current_db);
+            $tables     = PMA_mysql_list_tables($current_db);
+            $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+            $i = 0;
+            while ($i < $num_tables) {
+                $table = PMA_mysql_tablename($tables, $i);
+                $local_query  = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
+                if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime);
+                if (isset($GLOBALS[$what . '_data'])) PMA_exportData($current_db, $table, $crlf, $err_url, $local_query);
+                $i++;
+            }
+            PMA_exportDBFooter($current_db);
+        }
+    }
+} elseif ($export_type == 'database') {
+    PMA_exportDBHeader($db);
+    if (isset($table_select)) {
+        $tmp_select = implode($table_select, '|');
+        $tmp_select = '|' . $tmp_select . '|';
+    }
+    $i = 0;
+    while ($i < $num_tables) {
+        $table = PMA_mysql_tablename($tables, $i);
+        $local_query  = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
+        if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))
+            || !isset($tmp_select)) {
+
+            if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime);
+            if (isset($GLOBALS[$what . '_data'])) PMA_exportData($db, $table, $crlf, $err_url, $local_query);
+        }
+        $i++;
+    }
+    PMA_exportDBFooter($db);
+} else {
+    PMA_exportDBHeader($db);
+    // We export just one table
+
+    if ($limit_to > 0 && $limit_from >= 0) {
+        $add_query  = ' LIMIT '
+                    . (($limit_from > 0) ? $limit_from . ', ' : '')
+                    . $limit_to;
+    } else {
+        $add_query  = '';
+    }
+
+    if (!empty($sql_query)) {
+        $local_query = $sql_query . $add_query;
+        PMA_mysql_select_db($db);
+    } else {
+        $local_query  = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
+    }
+
+    if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime);
+    if (isset($GLOBALS[$what . '_data'])) PMA_exportData($db, $table, $crlf, $err_url, $local_query);
+    PMA_exportDBFooter($db);
+}
+
+/**
+ * Send the dump as a file...
+ */
+if (!empty($asfile)) {
+    // Convert the charset if required.
+    if ($output_charset_conversion) {
+        $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer);
+    }
+
+    // Do the compression
+    // 1. as a gzipped file
+    if (isset($compression) && $compression == 'zip') {
+        if (PMA_PHP_INT_VERSION >= 40000 && @function_exists('gzcompress')) {
+            if ($type == 'csv' ) {
+                $extbis = '.csv';
+            } else if ($type == 'xml') {
+                $extbis = '.xml';
+            } else {
+                $extbis = '.sql';
+            }
+            $zipfile = new zipfile();
+            $zipfile -> addFile($dump_buffer, $filename . $extbis);
+            echo $zipfile -> file();
+        }
+    }
+    // 2. as a bzipped file
+    else if (isset($compression) && $compression == 'bzip') {
+        if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress')) {
+            echo bzcompress($dump_buffer);
+            // nijel: eval in next line is because otherwise === causes syntax error on php3
+            if (eval('return($dump_buffer === -8);')) {
+                include('./header.inc.php3');
+                echo sprintf($strBzError, '<a href="http://bugs.php.net/bug.php?id=17300" target="_blank">17300</a>');
+                include('./footer.inc.php3');
+                exit;
+            }
+        }
+    }
+    // 3. as a gzipped file
+    else if (isset($compression) && $compression == 'gzip') {
+        if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode')) {
+            // without the optional parameter level because it bug
+            echo gzencode($dump_buffer);
+        }
+    }
+
+    /* If ve saved on server, we have to close file now */
+    if ($save_on_server) {
+        fclose($file_handle);
+        $message = sprintf($strDumpSaved, $save_filename);
+
+        $js_to_run = 'functions.js';
+        include('./header.inc.php3');
+        if ($export_type == 'server') {
+            $active_page = 'server_export.php3';
+            include('./server_export.php3');
+        } elseif ($export_type == 'database') {
+            $active_page = 'db_details_export.php3';
+            include('./db_details_export.php3');
+        } else {
+            $active_page = 'tbl_properties_export.php3';
+            include('./tbl_properties_export.php3');
+        }
+        exit();
+    }
+}
+/**
+ * Displays the dump...
+ */
+else {
+    /**
+     * Close the html tags and add the footers in dump is displayed on screen
+     */
+    echo '    </pre>' . "\n";
+    echo '</div>' . "\n";
+    echo "\n";
+    include('./footer.inc.php3');
+} // end if
+?>

lang/afrikaans-iso-8859-1.inc.php3

@@ -657,4 +657,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/afrikaans-utf-8.inc.php3

@@ -658,4 +658,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/albanian-iso-8859-1.inc.php3

@@ -649,4 +649,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/albanian-utf-8.inc.php3

@@ -650,4 +650,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/arabic-utf-8.inc.php3

@@ -672,4 +672,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/arabic-windows-1256.inc.php3

@@ -671,4 +671,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/brazilian_portuguese-iso-8859-1.inc.php3

@@ -671,4 +671,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php3

@@ -672,4 +672,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/bulgarian-koi8-r.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/bulgarian-utf-8.inc.php3

@@ -652,4 +652,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/bulgarian-windows-1251.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/catalan-iso-8859-1.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/catalan-utf-8.inc.php3

@@ -646,4 +646,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/chinese_big5-utf-8.inc.php3

@@ -671,4 +671,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/chinese_big5.inc.php3

@@ -670,4 +670,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/chinese_gb-utf-8.inc.php3

@@ -647,4 +647,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/chinese_gb.inc.php3

@@ -647,4 +647,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/croatian-iso-8859-2.inc.php3

@@ -670,4 +670,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/croatian-utf-8.inc.php3

@@ -671,4 +671,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/croatian-windows-1250.inc.php3

@@ -670,4 +670,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/czech-iso-8859-2.inc.php3

@@ -30,6 +30,8 @@ $strAccessDenied = 'P
 $strAction = 'Akce';
 $strAddDeleteColumn = 'P<>idat/Smazat sloupec';
 $strAddDeleteRow = 'P<>idat/Smazat <20><>dek s&nbsp;podm<64>nkou';
+$strAddDropDatabase = 'P<>idat DROP DATABASE';
+$strAddIntoComments = 'P<>idat do koment<6E><74><EFBFBD>';
 $strAddNewField = 'P<>idat nov<6F> sloupec';
 $strAddPriv = 'P<>idat nov<6F> privilegium';
 $strAddPrivMessage = 'Opr<70>vn<76>n<EFBFBD> bylo p<>id<69>no.';
@@ -145,7 +147,9 @@ $strData = 'Data';
 $strDataDict = 'Datov<6F> slovn<76>k';
 $strDataOnly = ' Jen data';
 $strDatabase = 'Datab<61>ze ';
+$strDatabaseExportOptions = 'Nastaven<65> exportu datab<61>z<EFBFBD>';
 $strDatabaseHasBeenDropped = 'Datab<61>ze %s byla zru<72>ena.';
+$strDatabaseNoTable = 'Tato datab<61>ze neobsahuje <20><>dn<64> tabulky!';
 $strDatabaseWildcard = 'Datab<61>ze (z<>stupn<70> znaky povoleny):';
 $strDatabases = 'Datab<61>ze';
 $strDatabasesDropped = '%s datab<61>ze byla <20>sp<73><70>n<EFBFBD> zru<72>ena.';
@@ -630,8 +634,9 @@ $strValidateSQL = 'Zkontrolovat SQL';
 $strValidatorError = 'SQL validator nemohl b<>t inicializov<6F>n. Pros<6F>m zkontrolujte jestli m<>te nainstalovan<61> pot<6F>ebn<62> roz<6F><7A><EFBFBD>en<65> php, jak je pops<70>no v&nbsp;%sdokumentaci%s.';
 $strValue = 'Hodnota';
 $strVar = 'Prom<6F>nn<6E>';
-$strViewDump = 'Zobrazit v<>pis (dump) tabulky';
-$strViewDumpDB = 'Zobrazit v<>pis (dump) datab<61>ze';
+$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export datab<61>ze';
+$strViewDumpDatabases = 'Export datab<61>z<EFBFBD>';
 
 $strWebServerUploadDirectory = 'soubor z&nbsp;adres<65><73>e pro upload';
 $strWebServerUploadDirectoryError = 'Adres<65><73> ur<75>en<65> pro upload soubor<6F> nemohl b<>t otev<65>en';

lang/czech-utf-8.inc.php3

@@ -31,6 +31,8 @@ $strAccessDenied = 'Přístup odepřen';
 $strAction = 'Akce';
 $strAddDeleteColumn = 'Přidat/Smazat sloupec';
 $strAddDeleteRow = 'Přidat/Smazat řádek s podmínkou';
+$strAddDropDatabase = 'Přidat DROP DATABASE';
+$strAddIntoComments = 'Přidat do komentářů';
 $strAddNewField = 'Přidat nový sloupec';
 $strAddPriv = 'Přidat nové privilegium';
 $strAddPrivMessage = 'Oprávnění bylo přidáno.';
@@ -146,7 +148,9 @@ $strData = 'Data';
 $strDataDict = 'Datový slovník';
 $strDataOnly = ' Jen data';
 $strDatabase = 'Databáze ';
+$strDatabaseExportOptions = 'Nastavení exportu databází';
 $strDatabaseHasBeenDropped = 'Databáze %s byla zrušena.';
+$strDatabaseNoTable = 'Tato databáze neobsahuje žádné tabulky!';
 $strDatabaseWildcard = 'Databáze (zástupné znaky povoleny):';
 $strDatabases = 'Databáze';
 $strDatabasesDropped = '%s databáze byla úspěšně zrušena.';
@@ -631,8 +635,9 @@ $strValidateSQL = 'Zkontrolovat SQL';
 $strValidatorError = 'SQL validator nemohl být inicializován. Prosím zkontrolujte jestli máte nainstalované potřebné rozšíření php, jak je popsáno v %sdokumentaci%s.';
 $strValue = 'Hodnota';
 $strVar = 'Proměnná';
-$strViewDump = 'Zobrazit výpis (dump) tabulky';
-$strViewDumpDB = 'Zobrazit výpis (dump) databáze';
+$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export databáze';
+$strViewDumpDatabases = 'Export databází';
 
 $strWebServerUploadDirectory = 'soubor z adresáře pro upload';
 $strWebServerUploadDirectoryError = 'Adresář určený pro upload souborů nemohl být otevřen';

lang/czech-windows-1250.inc.php3

@@ -30,6 +30,8 @@ $strAccessDenied = 'P
 $strAction = 'Akce';
 $strAddDeleteColumn = 'P<>idat/Smazat sloupec';
 $strAddDeleteRow = 'P<>idat/Smazat <20><>dek s&nbsp;podm<64>nkou';
+$strAddDropDatabase = 'P<>idat DROP DATABASE';
+$strAddIntoComments = 'P<>idat do koment<6E><74><EFBFBD>';
 $strAddNewField = 'P<>idat nov<6F> sloupec';
 $strAddPriv = 'P<>idat nov<6F> privilegium';
 $strAddPrivMessage = 'Opr<70>vn<76>n<EFBFBD> bylo p<>id<69>no.';
@@ -145,7 +147,9 @@ $strData = 'Data';
 $strDataDict = 'Datov<6F> slovn<76>k';
 $strDataOnly = ' Jen data';
 $strDatabase = 'Datab<61>ze ';
+$strDatabaseExportOptions = 'Nastaven<65> exportu datab<61>z<EFBFBD>';
 $strDatabaseHasBeenDropped = 'Datab<61>ze %s byla zru<72>ena.';
+$strDatabaseNoTable = 'Tato datab<61>ze neobsahuje <20><>dn<64> tabulky!';
 $strDatabaseWildcard = 'Datab<61>ze (z<>stupn<70> znaky povoleny):';
 $strDatabases = 'Datab<61>ze';
 $strDatabasesDropped = '%s datab<61>ze byla <20>sp<73><70>n<EFBFBD> zru<72>ena.';
@@ -630,8 +634,9 @@ $strValidateSQL = 'Zkontrolovat SQL';
 $strValidatorError = 'SQL validator nemohl b<>t inicializov<6F>n. Pros<6F>m zkontrolujte jestli m<>te nainstalovan<61> pot<6F>ebn<62> roz<6F><7A><EFBFBD>en<65> php, jak je pops<70>no v&nbsp;%sdokumentaci%s.';
 $strValue = 'Hodnota';
 $strVar = 'Prom<6F>nn<6E>';
-$strViewDump = 'Zobrazit v<>pis (dump) tabulky';
-$strViewDumpDB = 'Zobrazit v<>pis (dump) datab<61>ze';
+$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export datab<61>ze';
+$strViewDumpDatabases = 'Export datab<61>z<EFBFBD>';
 
 $strWebServerUploadDirectory = 'soubor z&nbsp;adres<65><73>e pro upload';
 $strWebServerUploadDirectoryError = 'Adres<65><73> ur<75>en<65> pro upload soubor<6F> nemohl b<>t otev<65>en';

lang/danish-iso-8859-1.inc.php3

@@ -665,4 +665,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/danish-utf-8.inc.php3

@@ -666,4 +666,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/dutch-iso-8859-1.inc.php3

@@ -660,4 +660,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/dutch-utf-8.inc.php3

@@ -661,4 +661,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/english-iso-8859-1.inc.php3

@@ -643,4 +643,9 @@ $strZip = '"zipped"';
 
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/english-utf-8.inc.php3

@@ -644,4 +644,9 @@ $strZip = '"zipped"';
 
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/estonian-iso-8859-1.inc.php3

@@ -644,4 +644,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/estonian-utf-8.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/finnish-iso-8859-1.inc.php3

@@ -667,4 +667,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/finnish-utf-8.inc.php3

@@ -668,4 +668,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/french-iso-8859-1.inc.php3

@@ -645,4 +645,9 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enl
 $strZip = '"zipp<70>"';
 // To translate
 
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/french-utf-8.inc.php3

@@ -646,4 +646,9 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
 $strZip = '"zippé"';
 // To translate
 
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/galician-iso-8859-1.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/galician-utf-8.inc.php3

@@ -652,4 +652,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/georgian-utf-8.inc.php3

@@ -670,4 +670,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/german-iso-8859-1.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/german-utf-8.inc.php3

@@ -652,4 +652,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/greek-iso-8859-7.inc.php3

@@ -669,4 +669,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/greek-utf-8.inc.php3

@@ -670,4 +670,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/hebrew-iso-8859-8-i.inc.php3

@@ -667,4 +667,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/hindi-utf-8.inc.php3

@@ -681,4 +681,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/hungarian-iso-8859-2.inc.php3

@@ -655,4 +655,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/hungarian-utf-8.inc.php3

@@ -656,4 +656,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/indonesian-iso-8859-1.inc.php3

@@ -644,4 +644,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/indonesian-utf-8.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/italian-iso-8859-1.inc.php3

@@ -649,4 +649,16 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.';
 $strZip = '"compresso con zip"';
 // To translate
 
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+
+$strPaperSize = 'Paper size';  //to translate
+
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
+
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+
 ?>

lang/italian-utf-8.inc.php3

@@ -650,4 +650,16 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.';
 $strZip = '"compresso con zip"';
 // To translate
 
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+
+$strPaperSize = 'Paper size';  //to translate
+
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
+
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+
 ?>

lang/japanese-euc.inc.php3

@@ -655,4 +655,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/japanese-sjis.inc.php3

@@ -655,4 +655,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/japanese-utf-8.inc.php3

@@ -656,4 +656,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/korean-ks_c_5601-1987.inc.php3

@@ -665,4 +665,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/latvian-utf-8.inc.php3

@@ -649,4 +649,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/latvian-windows-1257.inc.php3

@@ -648,4 +648,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/lithuanian-utf-8.inc.php3

@@ -646,4 +646,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/lithuanian-windows-1257.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/malay-iso-8859-1.inc.php3

@@ -666,4 +666,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/malay-utf-8.inc.php3

@@ -667,4 +667,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/norwegian-iso-8859-1.inc.php3

@@ -648,4 +648,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/norwegian-utf-8.inc.php3

@@ -649,4 +649,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/polish-iso-8859-2.inc.php3

@@ -644,4 +644,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/polish-utf-8.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/portuguese-iso-8859-1.inc.php3

@@ -666,4 +666,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/portuguese-utf-8.inc.php3

@@ -667,4 +667,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/romanian-iso-8859-1.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/romanian-utf-8.inc.php3

@@ -646,4 +646,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/russian-dos-866.inc.php3

@@ -653,4 +653,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/russian-koi8-r.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/russian-utf-8.inc.php3

@@ -652,4 +652,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/russian-windows-1251.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/serbian-utf-8.inc.php3

@@ -673,4 +673,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/serbian-windows-1250.inc.php3

@@ -672,4 +672,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovak-iso-8859-2.inc.php3

@@ -646,4 +646,9 @@ $strZip = '"zo zipovan
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovak-utf-8.inc.php3

@@ -647,4 +647,9 @@ $strZip = '"zo zipované"';
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovak-windows-1250.inc.php3

@@ -646,4 +646,9 @@ $strZip = '"zo zipovan
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovenian-iso-8859-2.inc.php3

@@ -650,4 +650,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovenian-utf-8.inc.php3

@@ -651,4 +651,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/slovenian-windows-1250.inc.php3

@@ -650,4 +650,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/spanish-iso-8859-1.inc.php3

@@ -648,4 +648,9 @@ $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strUpdComTab = 'Please see Documentation on how to update your Column_comments Table'; //to translate
 
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/spanish-utf-8.inc.php3

@@ -649,4 +649,9 @@ $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strUpdComTab = 'Please see Documentation on how to update your Column_comments Table'; //to translate
 
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/swedish-iso-8859-1.inc.php3

@@ -644,4 +644,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/swedish-utf-8.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/thai-tis-620.inc.php3

@@ -655,4 +655,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/thai-utf-8.inc.php3

@@ -656,4 +656,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/turkish-iso-8859-9.inc.php3

@@ -666,4 +666,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/turkish-utf-8.inc.php3

@@ -667,4 +667,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/ukrainian-utf-8.inc.php3

@@ -646,4 +646,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

lang/ukrainian-windows-1251.inc.php3

@@ -645,4 +645,9 @@ $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
 $strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 $strPaperSize = 'Paper size';  //to translate
+$strDatabaseNoTable = 'This database contains no table!';//to translate
+$strViewDumpDatabases = 'View dump (schema) of databases';//to translate
+$strAddIntoComments = 'Add into comments';//to translate
+$strDatabaseExportOptions = 'Database export options';//to translate
+$strAddDropDatabase = 'Add DROP DATABASE';//to translate
 ?>

libraries/config_import.lib.php3

@@ -1080,6 +1080,100 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         $cfg['CtrlArrowsMoving'] = TRUE;
     }
 
+    if (!isset($cfg['Export']['format'])) {
+        $cfg['Export']['format'] = 'sql';
+    } // sql/latex/excel/csv/xml
+    if (!isset($cfg['Export']['compression'])) {
+        $cfg['Export']['compression'] = 'none';
+    } // none/zip/gzip/bzip2
+
+    if (!isset($cfg['Export']['asfile'])) {
+        $cfg['Export']['asfile'] = FALSE;
+    }
+    if (!isset($cfg['Export']['onserver'])) {
+        $cfg['Export']['onserver'] = FALSE;
+    }
+    if (!isset($cfg['Export']['onserver_overwrite'])) {
+        $cfg['Export']['onserver_overwrite'] = FALSE;
+    }
+    if (!isset($cfg['Export']['remember_file_template'])) {
+        $cfg['Export']['remember_file_template'] = TRUE;
+    }
+    if (!isset($cfg['Export']['csv_columns'])) {
+        $cfg['Export']['csv_columns'] = FALSE;
+    }
+    if (!isset($cfg['Export']['csv_null'])) {
+        $cfg['Export']['csv_null']                  = 'NULL';
+    }
+    if (!isset($cfg['Export']['excel_null'])) {
+        $cfg['Export']['excel_null']                = 'NULL';
+    }
+    if (!isset($cfg['Export']['latex_null'])) {
+        $cfg['Export']['latex_null']                = '\textit{NULL}';
+    }
+    if (!isset($cfg['Export']['csv_separator'])) {
+        $cfg['Export']['csv_separator'] = ';';
+    }
+    if (!isset($cfg['Export']['csv_enclosed'])) {
+        $cfg['Export']['csv_enclosed'] = '"';
+    }
+    if (!isset($cfg['Export']['csv_escaped'])) {
+        $cfg['Export']['csv_escaped'] = '\\';
+    }
+    if (!isset($cfg['Export']['csv_terminated'])) {
+        $cfg['Export']['csv_terminated'] = 'AUTO';
+    }
+
+    if (!isset($cfg['Export']['latex_structure'])) {
+        $cfg['Export']['latex_structure'] = TRUE;
+    }
+    if (!isset($cfg['Export']['latex_data'])) {
+        $cfg['Export']['latex_data'] = TRUE;
+    }
+    if (!isset($cfg['Export']['latex_columns'])) {
+        $cfg['Export']['latex_columns'] = TRUE;
+    }
+    if (!isset($cfg['Export']['latex_relation'])) {
+        $cfg['Export']['latex_relation'] = TRUE;
+    }
+    if (!isset($cfg['Export']['latex_comments'])) {
+        $cfg['Export']['latex_comments'] = TRUE;
+    }
+    if (!isset($cfg['Export']['latex_mime'])) {
+        $cfg['Export']['latex_mime'] = TRUE;
+    }
+
+    if (!isset($cfg['Export']['sql_drop_database'])) {
+        $cfg['Export']['sql_drop_database'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_drop_table'])) {
+        $cfg['Export']['sql_drop_table'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_structure'])) {
+        $cfg['Export']['sql_structure'] = TRUE;
+    }
+    if (!isset($cfg['Export']['sql_data'])) {
+        $cfg['Export']['sql_data'] = TRUE;
+    }
+    if (!isset($cfg['Export']['sql_backquotes'])) {
+        $cfg['Export']['sql_backquotes'] = TRUE;
+    }
+    if (!isset($cfg['Export']['sql_relation'])) {
+        $cfg['Export']['sql_relation'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_columns'])) {
+        $cfg['Export']['sql_columns'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_extended'])) {
+        $cfg['Export']['sql_extended'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_comments'])) {
+        $cfg['Export']['sql_comments'] = FALSE;
+    }
+    if (!isset($cfg['Export']['sql_mime'])) {
+        $cfg['Export']['sql_mime'] = FALSE;
+    }
+
 } // $__PMA_CONFIG_IMPORT_LIB__
 
 ?>

libraries/display_export.lib.php3

@@ -2,22 +2,36 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-/*
- * Whether we export single table or more
- */
-$export_single = (!isset($multi_tables) || $multi_tables == '') && (isset($table));
-?>
+// Get relations & co. status 
+require('./libraries/relation.lib.php3');
+$cfgRelation = PMA_getRelationsParam();
 
-<form method="post" action="tbl_dump.php3" name="<?php echo $tbl_dump_form_name; ?>">
-    <?php 
-if ($export_single) {
-    echo '    ' . PMA_generate_common_hidden_inputs($db, $table);
-} else {
-    echo '    ' . PMA_generate_common_hidden_inputs($db);
+function PMA_exportCheckboxCheck($str) {
+    if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
+        echo ' checked="checked"';
+    }
 }
 
+function PMA_exportIsActive($what, $val) {
+    if (isset($GLOBALS['cfg']['Export'][$what]) &&  $GLOBALS['cfg']['Export'][$what] == $val) {
+        echo ' checked="checked"';
+    }
+}
+
+?>
+<form method="post" action="export.php3" name="dump">
+<?php 
+if ($export_type == 'server') {
+    echo PMA_generate_common_hidden_inputs('', '', 1);
+} elseif ($export_type == 'database') {
+    echo PMA_generate_common_hidden_inputs($db, '', 1);
+} else {
+    echo PMA_generate_common_hidden_inputs($db, $table, 1);
+}
+echo '    <input type="hidden" name="export_type" value="' . $export_type . '" />';
+
 if (isset($sql_query)) {
-    echo '    <input type="hidden" name="sql_query" value="' . urlencode($sql_query) . '" />';
+    echo '    <input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />';
 }
     ?>
 
@@ -38,36 +52,36 @@ if (isset($sql_query)) {
 
         <!-- Formats to export to -->
         <td nowrap="nowrap" valign="top">
-            <fieldset <?php echo ((!isset($multi_tables) || isset($multi_tables) && $multi_tables == '') ? 'style="height: 220px;"' : ''); ?>>
+            <fieldset <?php echo ((!isset($multi_values) || isset($multi_values) && $multi_values == '') ? 'style="height: 220px;"' : ''); ?>>
             <legend><?php echo $strExport; ?></legend>
             <br>
             <?php
-            if (isset($multi_tables) && $multi_tables != '') {
-                echo $multi_tables;
+            if (isset($multi_values) && $multi_values != '') {
+                echo $multi_values;
             }
             ?>
             
             <!-- SQL -->
-            <input type="radio" name="what" value="sql" id="radio_dump_sql" checked="checked" onclick="if(this.checked) { hide_them_all(); getElement('sql_options').style.display = 'block'; }; return true" />
+            <input type="radio" name="what" value="sql" id="radio_dump_sql" onclick="if(this.checked) { hide_them_all(); getElement('sql_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'sql'); ?> />
             <label for="radio_dump_sql"><?php echo $strSQL; ?></label>
             <br /><br />
 
             <!-- LaTeX table -->
-            <input type="radio" name="what" value="latex" id="radio_dump_latex"  onclick="if(this.checked) { hide_them_all(); getElement('latex_options').style.display = 'block'; }; return true" />
+            <input type="radio" name="what" value="latex" id="radio_dump_latex"  onclick="if(this.checked) { hide_them_all(); getElement('latex_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'latex'); ?> />
             <label for="radio_dump_latex"><?php echo $strLaTeX; ?></label>
             <br /><br />
 
             <!-- Excel CSV -->
-            <input type="radio" name="what" value="excel" id="radio_dump_excel"  onclick="if(this.checked) { hide_them_all(); getElement('excel_options').style.display = 'block'; }; return true" />
+            <input type="radio" name="what" value="excel" id="radio_dump_excel"  onclick="if(this.checked) { hide_them_all(); getElement('excel_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'excel'); ?> />
             <label for="radio_dump_excel"><?php echo $strStrucExcelCSV; ?></label>
             <br /><br />
             <!-- General CSV -->
-            <input type="radio" name="what" value="csv" id="radio_dump_csv"  onclick="if(this.checked) { hide_them_all(); getElement('csv_options').style.display = 'block'; }; return true" />
+            <input type="radio" name="what" value="csv" id="radio_dump_csv"  onclick="if(this.checked) { hide_them_all(); getElement('csv_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'csv'); ?> />
             <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>
             <br /><br />
 
             <!-- XML -->
-            <input type="radio" name="what" value="xml" id="radio_dump_xml" onclick="if(this.checked) { hide_them_all(); getElement('none_options').style.display = 'block'; }; return true" />
+            <input type="radio" name="what" value="xml" id="radio_dump_xml" onclick="if(this.checked) { hide_them_all(); getElement('none_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'xml'); ?> />
             <label for="radio_dump_xml"><?php echo $strXML; ?></label>&nbsp;&nbsp;
             </fieldset>
         </td>
@@ -77,48 +91,73 @@ if (isset($sql_query)) {
             <!-- SQL options -->
             <fieldset id="sql_options">
                 <legend><?php echo $strSQLOptions; ?> (<a href="./Documentation.html#faqexport" target="documentation"><?php echo $strDocu; ?></a>)</legend>
-
+<?php
+if ($export_type == 'server') {
+?>
+                <!-- For databases -->
+                <fieldset>
+                    <legend>
+                        <?php echo $strDatabaseExportOptions; ?>
+                    </legend>
+                    <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" <?php PMA_exportCheckboxCheck('sql_drop_database'); ?> />
+                    <label for="checkbox_drop_database"><?php echo $strAddDropDatabase; ?></label><br />
+                </fieldset>
+<?php
+}
+?>
                 <!-- For structure -->
                 <fieldset>
                     <legend>
-                        <input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked="checked" onclick="if(!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" />
+                        <input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" <?php PMA_exportCheckboxCheck('sql_structure'); ?> onclick="if(!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" />
                         <label for="checkbox_sql_structure"><?php echo $strStructure; ?></label><br />
                     </legend>
-                    <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" />
+                    <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" <?php PMA_exportCheckboxCheck('sql_drop_table'); ?> />
                     <label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label><br />
 <?php
 // Add backquotes checkbox
 if (PMA_MYSQL_INT_VERSION >= 32306) {
     ?>
-                    <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" checked="checked" />
+                    <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" <?php PMA_exportCheckboxCheck('sql_backquotes'); ?> />
                     <label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br />
     <?php
 } // end backquotes feature
-echo "\n";
-
-// garvin: whether to show column comments
-require('./libraries/relation.lib.php3');
-$cfgRelation = PMA_getRelationsParam();
-
-if ($cfgRelation['commwork']) {
-    ?>
-                    <input type="checkbox" name="use_comments" value="1" id="checkbox_dump_use_comments" />
-                    <label for="checkbox_dump_use_comments"><?php echo $strDumpComments; ?></label><br />
-    <?php
-} // end dump comments
-echo "\n";
 ?>
+                    <fieldset>
+                        <legend><?php echo $strAddIntoComments; ?></legend>
+<?php                 
+if (!empty($cfgRelation['relation'])) {
+?>
+                        <input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> />
+                        <label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br />
+<?php
+ } // end relation
+ 
+if ($cfgRelation['commwork']) {
+     ?>
+                        <input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> />
+                        <label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br />
+<?php
+} // end comments
+ 
+if ($cfgRelation['mimework']) {
+     ?>
+                        <input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> />
+                        <label for="checkbox_sql_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br />
+<?php
+} // end MIME
+?>
+                     </fieldset>
                 </fieldset>
 
                 <!-- For data -->
                 <fieldset>
                     <legend>
-                        <input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked="checked" onclick="if(!this.checked && !getElement('checkbox_sql_structure').checked) return false; else return true;" />
+                        <input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" <?php PMA_exportCheckboxCheck('sql_data'); ?> onclick="if(!this.checked && !getElement('checkbox_sql_structure').checked) return false; else return true;" />
                         <label for="checkbox_sql_data"><?php echo $strData; ?></label><br />
                     </legend>
-                    <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" />
+                    <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" <?php PMA_exportCheckboxCheck('sql_columns'); ?> />
                     <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br />
-                    <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
+                    <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" <?php PMA_exportCheckboxCheck('sql_extended'); ?> />
                     <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
                 </fieldset>
             </fieldset>
@@ -130,54 +169,48 @@ echo "\n";
                  <!-- For structure -->
                  <fieldset>
                      <legend>
-                         <input type="checkbox" name="ltx_structure" value="structure" id="checkbox_ltx_structure" checked="checked" onclick="if(!this.checked && !getElement('checkbox_ltx_data').checked) return false; else return true;" />
-                         <label for="checkbox_ltx_structure"><?php echo $strStructure; ?></label><br />
+                         <input type="checkbox" name="latex_structure" value="structure" id="checkbox_latex_structure" <?php PMA_exportCheckboxCheck('latex_structure'); ?> onclick="if(!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" />
+                         <label for="checkbox_latex_structure"><?php echo $strStructure; ?></label><br />
                      </legend>
- <?php
- 
- // garvin: whether to show column comments
- require('./libraries/relation.lib.php3');
- $cfgRelation = PMA_getRelationsParam();
- 
- if (!empty($cfgRelation['relation'])) {
-     ?>
-                     <input type="checkbox" name="ltx_relation" value="yes" id="checkbox_ltx_use_relation" checked="checked" />
-                     <label for="checkbox_ltx_use_relation"><?php echo $strRelations; ?></label><br />
-     <?php
+<?php
+if (!empty($cfgRelation['relation'])) {
+?>
+                     <input type="checkbox" name="latex_relation" value="yes" id="checkbox_latex_use_relation" <?php PMA_exportCheckboxCheck('latex_relation'); ?> />
+                     <label for="checkbox_latex_use_relation"><?php echo $strRelations; ?></label><br />
+<?php
  } // end relation
  
- if ($cfgRelation['commwork']) {
+if ($cfgRelation['commwork']) {
      ?>
-                     <input type="checkbox" name="ltx_comments" value="yes" id="checkbox_ltx_use_comments" checked="checked" />
-                     <label for="checkbox_ltx_use_comments"><?php echo $strComments; ?></label><br />
-     <?php
- } // end comments
+                     <input type="checkbox" name="latex_comments" value="yes" id="checkbox_latex_use_comments" <?php PMA_exportCheckboxCheck('latex_comments'); ?> />
+                     <label for="checkbox_latex_use_comments"><?php echo $strComments; ?></label><br />
+<?php
+} // end comments
  
- if ($cfgRelation['mimework']) {
+if ($cfgRelation['mimework']) {
      ?>
-                     <input type="checkbox" name="ltx_mime" value="yes" id="checkbox_ltx_use_mime" checked="checked" />
-                     <label for="checkbox_ltx_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br />
-     <?php
- } // end MIME
- echo "\n";
- ?>
+                     <input type="checkbox" name="latex_mime" value="yes" id="checkbox_latex_use_mime" <?php PMA_exportCheckboxCheck('latex_mime'); ?> />
+                     <label for="checkbox_latex_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br />
+<?php
+} // end MIME
+?>
                  </fieldset>
  
                  <!-- For data -->
                  <fieldset>
                      <legend>
-                         <input type="checkbox" name="ltx_data" value="data" id="checkbox_ltx_data" checked="checked" onclick="if(!this.checked && !getElement('checkbox_ltx_structure').checked) return false; else return true;" />
-                         <label for="checkbox_ltx_data"><?php echo $strData; ?></label><br />
+                         <input type="checkbox" name="latex_data" value="data" id="checkbox_latex_data" <?php PMA_exportCheckboxCheck('latex_data'); ?> onclick="if(!this.checked && !getElement('checkbox_latex_structure').checked) return false; else return true;" />
+                         <label for="checkbox_latex_data"><?php echo $strData; ?></label><br />
                      </legend>
-                     <input type="checkbox" name="ltx_showcolumns" value="yes" id="ch_ltx_showcolumns" checked="checked" />
-                     <label for="ch_ltx_showcolumns"><?php echo $strColumnNames; ?></label><br />
+                     <input type="checkbox" name="latex_showcolumns" value="yes" id="ch_latex_showcolumns" <?php PMA_exportCheckboxCheck('latex_columns'); ?> />
+                     <label for="ch_latex_showcolumns"><?php echo $strColumnNames; ?></label><br />
                     <table border="0" cellspacing="1" cellpadding="0">
                         <tr>
                             <td>
                                 <?php echo $strReplaceNULLBy; ?>&nbsp;
                             </td>
                             <td>
-                                <input type="text" name="ltx_replace_null" size="20" value="\textit{NULL}" class="textfield" />
+                                <input type="text" name="latex_replace_null" size="20" value="<?php echo $cfg['Export']['latex_null']; ?>" class="textfield" />
                             </td>
                         </tr>
                     </table>
@@ -187,13 +220,14 @@ echo "\n";
              <!-- CSV options -->
             <fieldset id="csv_options">
                 <legend><?php echo $strCSVOptions; ?></legend>
+                <input type="hidden" name="csv_data" value="csv_data" />
                 <table border="0" cellspacing="1" cellpadding="0">
                     <tr>
                         <td>
                             <?php echo $strFieldsTerminatedBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="separator" size="2" value=";" class="textfield" />
+                            <input type="text" name="separator" size="2" value="<?php echo $cfg['Export']['csv_separator']; ?>" class="textfield" />
                         </td>
                     </tr>
                     <tr>
@@ -201,7 +235,7 @@ echo "\n";
                             <?php echo $strFieldsEnclosedBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="enclosed" size="2" value="&quot;" class="textfield" />
+                            <input type="text" name="enclosed" size="2" value="<?php echo $cfg['Export']['csv_enclosed']; ?>" class="textfield" />
                         </td>
                     </tr>
                     <tr>
@@ -209,7 +243,7 @@ echo "\n";
                             <?php echo $strFieldsEscapedBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="escaped" size="2" value="\" class="textfield" />
+                            <input type="text" name="escaped" size="2" value="<?php echo $cfg['Export']['csv_escaped']; ?>" class="textfield" />
                         </td>
                     </tr>
                     <tr>
@@ -217,7 +251,7 @@ echo "\n";
                             <?php echo $strFieldsTerminatedBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="add_character" size="2" value="<?php echo ((PMA_whichCrlf() == "\n") ? '\n' : '\r\n'); ?>" class="textfield" />
+                            <input type="text" name="add_character" size="2" value="<?php if ($cfg['Export']['csv_terminated'] == 'AUTO') echo ((PMA_whichCrlf() == "\n") ? '\n' : '\r\n'); else echo $cfg['Export']['csv_terminated']; ?>" class="textfield" />
                         </td>
                     </tr>
                     <tr>
@@ -225,24 +259,25 @@ echo "\n";
                             <?php echo $strReplaceNULLBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="csv_replace_null" size="20" value="NULL" class="textfield" />
+                            <input type="text" name="csv_replace_null" size="20" value="<?php echo $cfg['Export']['csv_null']; ?>" class="textfield" />
                         </td>
                     </tr>
                 </table>
-                <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" />
+                <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" <?php PMA_exportCheckboxCheck('csv_columns'); ?> />
                 <label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label>
             </fieldset>
             
             <!-- Excel options -->
             <fieldset id="excel_options">
                 <legend><?php echo $strExcelOptions; ?></legend>
+                <input type="hidden" name="excel_data" value="excel_data" />
                 <table border="0" cellspacing="1" cellpadding="0">
                     <tr>
                         <td>
                             <?php echo $strReplaceNULLBy; ?>&nbsp;
                         </td>
                         <td>
-                            <input type="text" name="excel_replace_null" size="20" value="NULL" class="textfield" />
+                            <input type="text" name="excel_replace_null" size="20" value="<?php echo $cfg['Export']['excel_null']; ?>" class="textfield" />
                         </td>
                     </tr>
                 </table>
@@ -250,6 +285,7 @@ echo "\n";
             
             <fieldset id="none_options">
                 <legend><?php echo $strNoOptions; ?></legend>
+                <input type="hidden" name="xml_data" value="xml_data" />
             </fieldset>
 
             <script type="text/javascript">
@@ -290,14 +326,14 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
         <td colspan="2">
             <fieldset>
                 <legend>
-                    <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" />
+                    <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> />
                     <label for="checkbox_dump_asfile"><?php echo $strSend; ?></label>
                 </legend>
                 
                 <?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?>
-                <input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver"  onclick="getElement('checkbox_dump_asfile').checked = true;" />
+                <input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver"  onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver'); ?> />
                 <label for="checkbox_dump_onserver"><?php echo sprintf($strSaveOnServer, htmlspecialchars($cfg['SaveDir'])); ?></label>,
-                <input type="checkbox" name="onserverover" value="saveitover" id="checkbox_dump_onserverover"  onclick="getElement('checkbox_dump_onserver').checked = true;getElement('checkbox_dump_asfile').checked = true;" />
+                <input type="checkbox" name="onserverover" value="saveitover" id="checkbox_dump_onserverover"  onclick="getElement('checkbox_dump_onserver').checked = true;getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> />
                 <label for="checkbox_dump_onserverover"><?php echo $strOverwriteExisting; ?></label>
                 <br />
                 <?php } ?>
@@ -306,7 +342,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
                 <input type="text" name="filename_template"
                 <?php 
                     echo ' value="';
-                    if (!$export_single) {
+                    if ($export_type == 'database') {
                         if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
                             echo $_COOKIE['pma_db_filename_template'];
                         } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_db_filename_template'])) {
@@ -314,7 +350,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
                         } else {
                             echo '__DB__'; 
                         }
-                    } else {
+                    } elseif ($export_type == 'table') {
                         if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
                             echo $_COOKIE['pma_table_filename_template'];
                         } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_table_filename_template'])) {
@@ -322,12 +358,20 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
                         } else {
                             echo '__TABLE__'; 
                         }
+                    } else {
+                        if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) {
+                            echo $_COOKIE['pma_server_filename_template'];
+                        } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_server_filename_template'])) {
+                            echo $HTTP_COOKIE_VARS['pma_server_filename_template'];
+                        } else {
+                            echo '__SERVER__'; 
+                        }
                     }
                     echo '" ';
                 ?>
                 />
                 (
-                <input type="checkbox" name="remember_template" checked="checked" id="checkbox_remember_template" />
+                <input type="checkbox" name="remember_template" id="checkbox_remember_template" <?php PMA_exportCheckboxCheck('remember_file_template'); ?> />
                 <label for="checkbox_remember_template"><?php echo $strFileNameTemplateRemember; ?></label>
                 )*
 
@@ -359,7 +403,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
                 <fieldset>
                     <legend><?php echo $strCompression; ?></legend>
 
-                    <input type="radio" name="compression" value="none" id="radio_compression_none" checked="checked" onclick="getElement('checkbox_dump_asfile').checked = true;" />
+                    <input type="radio" name="compression" value="none" id="radio_compression_none" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportIsActive('compression', 'none'); ?> />
                     <label for="radio_compression_none"><?php echo $strNone; ?></label>&nbsp;
 
 <?php
@@ -372,21 +416,21 @@ if (PMA_PHP_INT_VERSION >= 40004) {
     if ($is_zip || $is_gzip || $is_bzip) {
         if ($is_zip) {
             ?>
-                    <input type="radio" name="compression" value="zip" id="radio_compression_zip" onclick="getElement('checkbox_dump_asfile').checked = true;" />
+                    <input type="radio" name="compression" value="zip" id="radio_compression_zip" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportIsActive('compression', 'zip'); ?> />
                     <label for="radio_compression_zip"><?php echo $strZip; ?></label><?php echo (($is_gzip || $is_bzip) ? '&nbsp;' : ''); ?>
             <?php
         }
         if ($is_gzip) {
             echo "\n"
             ?>
-                    <input type="radio" name="compression" value="gzip" id="radio_compression_gzip" onclick="getElement('checkbox_dump_asfile').checked = true;" />
+                    <input type="radio" name="compression" value="gzip" id="radio_compression_gzip" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportIsActive('compression', 'gzip'); ?> />
                     <label for="radio_compression_gzip"><?php echo $strGzip; ?></label><?php echo ($is_bzip ? '&nbsp;' : ''); ?>
             <?php
         }
         if ($is_bzip) {
             echo "\n"
             ?>
-                    <input type="radio" name="compression" value="bzip" id="radio_compression_bzip" onclick="getElement('checkbox_dump_asfile').checked = true;" />
+                    <input type="radio" name="compression" value="bzip" id="radio_compression_bzip" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportIsActive('compression', 'bzip'); ?> />
                     <label for="radio_compression_bzip"><?php echo $strBzip; ?></label>
             <?php
         }

libraries/export/csv.php3

@@ -0,0 +1,172 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Set of functions used to build CSV dumps of tables
+ */
+
+/**
+ * Outputs comment
+ *
+ * @param   string      Text of comment
+ *
+ * @return  bool        Whether it suceeded
+ */
+function PMA_exportComment($text) {
+    return TRUE;
+}
+
+/**
+ * Outputs export header
+ *
+ * @return  bool        Whether it suceeded
+ *
+ * @access  public
+ */
+function PMA_exportHeader() {
+    global $what;
+    global $add_character;
+    global $separator;
+    global $enclosed;
+    global $escaped;
+
+    // Here we just prepare some values for export
+    if ($what == 'excel') {
+        $add_character      = "\015\012";
+        $separator          = ',';
+        $enclosed           = '"';
+        $escaped            = '"';
+    } else {
+        if (empty($add_character)) {
+            $add_character  = $GLOBALS['crlf'];
+        } else {
+            $add_character  = str_replace('\\r', "\015", $add_character);
+            $add_character  = str_replace('\\n', "\012", $add_character);
+            $add_character  = str_replace('\\t', "\011", $add_character);
+        } // end if
+        $separator          = str_replace('\\t', "\011", $separator);
+    }
+    return TRUE;
+}
+
+/**
+ * Outputs database header
+ *
+ * @param   string      Database name
+ *
+ * @return  bool        Whether it suceeded
+ *
+ * @access  public
+ */
+function PMA_exportDBHeader($db) {
+    return TRUE;
+}
+
+/**
+ * Outputs database footer
+ *
+ * @param   string      Database name
+ *
+ * @return  bool        Whether it suceeded
+ *
+ * @access  public
+ */
+function PMA_exportDBFooter($db) {
+    return TRUE;
+}
+
+/**
+ * Outputs create database database
+ *
+ * @param   string      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      the database name
+ * @param   string      the table name
+ * @param   string      the end of line sequence
+ * @param   string      the url to go back in case of error
+ * @param   string      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 $add_character;
+    global $separator;
+    global $enclosed;
+    global $escaped;
+
+
+    // If required, get fields name at the first line
+    if (isset($GLOBALS['showcsvnames']) && $GLOBALS['showcsvnames'] == 'yes') {
+        $schema_insert = '';
+        $local_query   = 'SHOW COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db);
+        $result        = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url);
+        while ($row = PMA_mysql_fetch_array($result)) {
+            if ($enc_by == '') {
+                $schema_insert .= $row['Field'];
+            } else {
+                $schema_insert .= $enc_by
+                               . str_replace($enc_by, $esc_by . $enc_by, $row['Field'])
+                               . $enc_by;
+            }
+            $schema_insert     .= $sep;
+        } // end while
+        $schema_insert  =trim(substr($schema_insert, 0, -1));
+        if (!PMA_exportOutputHandler($schema_insert . $add_character)) return FALSE;
+    } // end if
+
+    // Gets the data from the database
+    $result      = PMA_mysql_query($sql_query) or PMA_mysqlDie('', $sql_query, '', $error_url);
+    $fields_cnt  = mysql_num_fields($result);
+
+    // Format the data
+    $i = 0;
+    while ($row = PMA_mysql_fetch_row($result)) {
+        $schema_insert = '';
+        for ($j = 0; $j < $fields_cnt; $j++) {
+            if (!isset($row[$j])) {
+                $schema_insert .= $GLOBALS[$what . '_replace_null'];
+            }
+            else if ($row[$j] == '0' || $row[$j] != '') {
+                // loic1 : always enclose fields
+                if ($what == 'excel') {
+                    $row[$j]       = ereg_replace("\015(\012)?", "\012", $row[$j]);
+                }
+                if ($enclosed == '') {
+                    $schema_insert .= $row[$j];
+                } else {
+                    $schema_insert .= $enclosed
+                                   . str_replace($enclosed, $escaped . $enclosed, $row[$j])
+                                   . $enclosed;
+                }
+            }
+            else {
+                $schema_insert .= '';
+            }
+            if ($j < $fields_cnt-1) {
+                $schema_insert .= $separator;
+            }
+        } // end for
+        $schema_insert  =trim($schema_insert);
+        if (!PMA_exportOutputHandler($schema_insert . $add_character)) return FALSE;
+        $i++;
+    } // end while
+    mysql_free_result($result);
+
+    return TRUE;
+} // end of the 'PMA_getTableCsv()' function
+?>