From f9948b6848a666e77f966df9cb860bd12590358f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 2 Apr 2007 20:33:18 +0000
Subject: [PATCH] [export] Native Excel (Spreadsheet_Excel_Writer) improvements

---
 ChangeLog                |  2 ++
 libraries/export/xls.php | 67 +++++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22cfcbdce..d47656d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [querywindow] store sql history in session
 + [querywindow] sql history now without db too
 + [querywindow] tweaks in sql history view
++ [export] Native Excel (Spreadsheet_Excel_Writer) improvements,
+   thanks to Christian Schmidt 
 
 2.10.1.0 (not released yet)
 =====================
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 65b6daafd..c9ec6ca5b 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -31,7 +31,7 @@ if ($xls) {
             'force_file' => true,
             'options' => array(
                 array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
-                array('type' => 'text', 'name' => 'columns', 'text' => 'strPutColNames'),
+                array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
                 array('type' => 'hidden', 'name' => 'data'),
                 ),
             'options_text' => 'strOptions',
@@ -160,40 +160,51 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     global $what;
     global $workbook;
 
-    $worksheet =& $workbook->addWorksheet($table);
     $workbook->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
 
     // Gets the data from the database
     $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
     $fields_cnt  = PMA_DBI_num_fields($result);
-    $col         = 0;
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns'] == 'yes') {
-        $schema_insert = '';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $worksheet->write(0, $i, stripslashes(PMA_DBI_field_name($result, $i)));
-        } // end for
-        $col++;
-    } // end if
+    $row = PMA_DBI_fetch_row($result);
+    for ($sheetIndex = 0; ; $sheetIndex++) {
+        // Maximum sheet name length is 31 chars - leave 2 for numeric index
+        $sheetName = substr($table, 0, 29) . ($sheetIndex > 0 ? $sheetIndex : '');
+        $worksheet =& $workbook->addWorksheet($sheetName);
+        $rowIndex = 0;
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $schema_insert = '';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
-                $worksheet->write($col, $j, $GLOBALS['xls_null']);
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                /**
-                 * @todo we should somehow handle character set here!
-                 */
-                $worksheet->write($col, $j, $row[$j]);
-            } else {
-                $worksheet->write($col, $j, '');
-            }
-        } // end for
-        $col++;
-    } // end while
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) {
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $worksheet->write(0, $i, stripslashes(PMA_DBI_field_name($result, $i)));
+            } // end for
+            $worksheet->repeatRows($rowIndex);
+            $worksheet->freezePanes(array($rowIndex + 1, 0, $rowIndex + 1, 0));
+            $rowIndex++;
+        } // end if
+
+        // Format the data (max 65536 rows per worksheet)
+        while ($rowIndex < 65536 && $row) {
+            set_time_limit(0);
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $worksheet->write($rowIndex, $j, $GLOBALS['xls_null']);
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    /**
+                     * @todo we should somehow handle character set here!
+                     */
+                    $worksheet->write($rowIndex, $j, $row[$j]);
+                } else {
+                    $worksheet->write($rowIndex, $j, '');
+                }
+            } // end for
+            $rowIndex++;
+            $row = PMA_DBI_fetch_row($result);
+        } // end while
+        if (!$row) {
+            break;
+        }
+    } // end for
     PMA_DBI_free_result($result);
 
     return TRUE;