From d8cd66c50665893c3fd1db1d2a5fc8b2e5bf965c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Mon, 20 Aug 2001 10:22:33 +0000
Subject: [PATCH] fixed some bugs with CSV exportations

---
 ChangeLog           |  8 +++++++-
 lib.inc.php3        | 34 +++++++++++++++++++++++++++++-----
 tbl_dump.php3       | 10 ++++++----
 tbl_properties.php3 |  4 ++++
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33e60c0a6..ab4db0ee6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-20  Loïc Chapeaux  <lolo@phpheaven.net>
+	* tbl_properties.php3; tbl_dump.php3; lib.inc.php3; lang/*: fixed some bugs
+	  with CSV exportations and added a Ms Excel CSV specific choice (because
+	  we know Excel does not support <cr> in data). Thanks to
+	  François <outils@altern.org>.
+
 2001-08-19  Olivier Müller  <om@omnis.ch>
 	* db_readdump.php3: if file contains mutiple queries, only show this line:
 	  "Your SQL-query has been executed successfully: The content of your file
@@ -40,7 +46,7 @@ $Source$
 	  netscape3) and an other one with netscape 3 thanks to
 	  François <outils@altern.org>.
 	* left.php3; lang/*: checks if databases from $cfgServers[1]['only_db']
-	  exits before displaying them at the left frame and take into account
+	  exists before displaying them at the left frame and take into account
 	  the case where there is no usable databases.
 	* Documentation.html: various updates.
 
diff --git a/lib.inc.php3 b/lib.inc.php3
index 14a0dcb8b..3bd8563ec 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -191,7 +191,7 @@ if (!defined('__LIB_INC__')){
     else if (isset($cfgServers[$server])) {
         $cfgServer = $cfgServers[$server];
 
-        // The user can work with only one database
+        // The user can work with only some databases
         if (isset($cfgServer['only_db']) && !empty($cfgServer['only_db'])) {
             if (is_array($cfgServer['only_db'])) {
                 $dblist   = $cfgServer['only_db'];
@@ -1539,16 +1539,22 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
      * @param   string   the table name
      * @param   integer  the offset on this table
      * @param   integer  the last row to get
-     * @param   string   the separation string
+     * @param   string   the field separator character
+     * @param   string   the optionnal "enclosed by" character
      * @param   string   the handler (function) to call. It must accept one
      *                   parameter ($sql_insert)
      *
+     * @global  string   whether to obtain an excel compatible csv format or a
+     *                   simple csv one
+     *
      * @return  boolean always true
      */
-    function get_table_csv($db, $table, $limit_from = 0, $limit_to = 0, $sep, $handler)
+    function get_table_csv($db, $table, $limit_from = 0, $limit_to = 0, $sep, $enc_by, $handler)
     {
-        // Handles the separator character
-        if (empty($sep)) {
+        global $what;
+
+        // Handles the "separator" and the optionnal "enclosed by" characters
+        if (empty($sep) || $what == 'excel') {
             $sep     = ';';
         }
         else {
@@ -1557,6 +1563,15 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
             }
             $sep     = str_replace('\\t', "\011", $sep);
         }
+        if (empty($enc_by) || $what == 'excel') {
+            $enc_by     = '"';
+        }
+        else {
+            if (get_magic_quotes_gpc()) {
+                $enc_by = stripslashes($enc_by);
+            }
+            $enc_by     = str_replace('&quot;', '"', $enc_by);
+        }
 
         // Defines the offsets to use
         if ($limit_from > 0) {
@@ -1584,6 +1599,15 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
                     $schema_insert .= 'NULL';
                 }
                 else if ($row[$j] != '') {
+                    if ($what == 'excel') {
+                        $row[$j]     = ereg_replace("\015(\012)?", "\012", $row[$j]);                          
+                        $re_test     = "$enc_by|$sep|\012";
+                    } else {
+                        $re_test     = "[$enc_by$sep]";
+                    }
+                    if (ereg($re_test, $row[$j])) {
+                        $row[$j] = $enc_by . str_replace($enc_by, $enc_by . $enc_by, $row[$j]) . $enc_by;
+                    }
                     $schema_insert .= $row[$j];
                 }
                 else {
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index 43e6fc8d2..77a71d6c8 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -44,7 +44,9 @@ function my_csvhandler($sql_insert)
     global $tmp_buffer;
 
     // Handles the EOL character
-    if (empty($add_character)) {
+    if ($GLOBALS['what'] == 'excel') {
+        $add_character = "\r\n";
+    } else if (empty($add_character)) {
         $add_character = $GLOBALS['crlf'];
     } else {
         if (get_magic_quotes_gpc()) {
@@ -118,7 +120,7 @@ else {
         $ext = 'bz2';
     } else if (isset($gzip) && $gzip == 'gzip') {
         $ext = 'gz';
-    } else if ($what == 'csv') {
+    } else if ($what == 'csv' || $what == 'excel') {
         $ext = 'csv';
     } else {
         $ext = 'sql';
@@ -151,7 +153,7 @@ if ($num_tables == 0) {
 // At least on table -> do the work
 else {
     // No csv format -> add some comments at the top
-    if ($what != 'csv') {
+    if ($what != 'csv' &&  $what != 'excel') {
         $dump_buffer       .= '# phpMyAdmin MySQL-Dump' . $crlf
                            .  '# version ' . PHPMYADMIN_VERSION . $crlf
                            .  '# http://phpwizard.net/phpMyAdmin/' . $crlf
@@ -216,7 +218,7 @@ else {
     // 'csv' case
     else {
         $tmp_buffer = '';
-        get_table_csv($db, $table, $limit_from, $limit_to, $separator, 'my_csvhandler');
+        get_table_csv($db, $table, $limit_from, $limit_to, $separator, $enclosed, 'my_csvhandler');
         $dump_buffer .= $tmp_buffer;
     } // end 'csv case
 } // end building the dump
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 8f5ce940b..28453f387 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -675,8 +675,12 @@ echo "\n";
                     <?php echo $strStrucData; ?>&nbsp;&nbsp;<br />
                     <input type="radio" name="what" value="dataonly" />
                     <?php echo $strDataOnly; ?>&nbsp;&nbsp;<br />
+                    <input type="radio" name="what" value="excel" />
+                    <?php echo $strStrucExcelCSV; ?>&nbsp;&nbsp;<br />
                     <input type="radio" name="what" value="csv" />
                     <?php echo $strStrucCSV;?>&nbsp;:<br />
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFields . ' '. $strEnclosedBy; ?>&nbsp;
+                    <input type="text" name="enclosed" size="1" value="&quot;" />&nbsp;&nbsp;<br />
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFields . ' '. $strTerminatedBy; ?>&nbsp;
                     <input type="text" name="separator" size="2" value=";" />&nbsp;&nbsp;<br />
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strLines . ' '. $strTerminatedBy; ?>&nbsp;