From 0e3f37648fbaee593427840010ff9659995ed429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 5 Aug 2003 14:08:23 +0000
Subject: [PATCH] Allow column headers for Excel export (bug #771299).

---
 ChangeLog                         | 3 +++
 config.inc.php3                   | 1 +
 libraries/config_import.lib.php3  | 9 ++++++---
 libraries/display_export.lib.php3 | 2 ++
 libraries/export/csv.php3         | 3 +++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 368b888cf..56ced6cae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ $Source$
     * sql.php3: Fixed regular expression.
     * libraries/export/latex.php3: Use "table (field)" instead of 
       "table -> field" when dumping relations into LaTeX (bug #776957).
+    * libraries/display_export.lib.php3, libraries/export/csv.php3,
+      libraries/config_import.lib.php3, config.inc.php3: Allow column headers
+      for Excel export (bug #771299).
 
 2003-08-05 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.data.php3: bug 779453, wrong count
diff --git a/config.inc.php3 b/config.inc.php3
index ceb7cfdd3..02b9cd194 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -303,6 +303,7 @@ $cfg['Export']['csv_separator']             = ';';
 $cfg['Export']['csv_enclosed']              = '&quot;';
 $cfg['Export']['csv_escaped']               = '\\';
 $cfg['Export']['csv_terminated']            = 'AUTO';
+$cfg['Export']['excel_columns']             = FALSE;
 $cfg['Export']['excel_null']                = 'NULL';
 
 $cfg['Export']['latex_structure']           = TRUE;
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 7a3bb1ded..629dd51cc 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -1134,15 +1134,18 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
     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']['csv_columns'])) {
+        $cfg['Export']['csv_columns'] = FALSE;
+    }
     if (!isset($cfg['Export']['excel_null'])) {
         $cfg['Export']['excel_null']                = 'NULL';
     }
+    if (!isset($cfg['Export']['excel_columns'])) {
+        $cfg['Export']['excel_columns'] = FALSE;
+    }
     if (!isset($cfg['Export']['latex_null'])) {
         $cfg['Export']['latex_null']                = '\textit{NULL}';
     }
diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3
index f61109bd8..201c1f233 100644
--- a/libraries/display_export.lib.php3
+++ b/libraries/display_export.lib.php3
@@ -300,6 +300,8 @@ if ($cfgRelation['mimework']) {
                         </td>
                     </tr>
                 </table>
+                <input type="checkbox" name="showexcelnames" value="yes" id="checkbox_dump_showexcelnames" <?php PMA_exportCheckboxCheck('excel_columns'); ?> />
+                <label for="checkbox_dump_showexcelnames"><?php echo $strPutColNames; ?></label>
             </fieldset>
 
             <fieldset id="none_options">
diff --git a/libraries/export/csv.php3 b/libraries/export/csv.php3
index 60123eb1c..80961b3b7 100644
--- a/libraries/export/csv.php3
+++ b/libraries/export/csv.php3
@@ -37,6 +37,9 @@ function PMA_exportHeader() {
         $separator          = ',';
         $enclosed           = '"';
         $escaped            = '"';
+        if (isset($GLOBALS['showexcelnames']) && $GLOBALS['showexcelnames'] == 'yes') {
+            $GLOBALS['showcsvnames'] = 'yes';
+        }
     } else {
         if (empty($add_character)) {
             $add_character  = $GLOBALS['crlf'];