From 2e1965b5c77aac8ba7127940ccb0351a24d4cc1a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 6 Jul 2004 18:05:52 +0000
Subject: [PATCH] error trapping, realpath

---
 ChangeLog          |  7 +++++++
 Documentation.html | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 269cdb8f7..5d84bc6ce 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/export/xls.php: enable user to specify './tmp' as the
+      TempDir (use realpath() to find the complete path. Add error trap
+      in case OLE cannot write to directory. Add setTempDir() to enable OLE
+      write in this directory.
+    * Documentation.html: document the TempDir creation
+ 
 2004-07-05 Marc Delisle  <lem9@users.sourceforge.net>
     * footer.inc.php, index.php, queryframe.php: bug 981939, database
       selection in left frame under Opera, and problems with dropdown
diff --git a/Documentation.html b/Documentation.html
index f2b6f6d57..6e637afdd 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -3627,7 +3627,8 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     You can either export as CSV suitable for MS Excel, what works out of the
     box or you can try native <b>experimental</b> MS Excel exporter. For
     enabling this you need to set $cfg['TempDir'] to place where web server
-    user can write and install PEAR module Spreadsheet_Excel_Writer into php
+    user can write (for example <tt>'./tmp'</tt>)
+    and install PEAR module Spreadsheet_Excel_Writer into php
     include path. The installation can be done by following command:
 </p>
 <pre>
@@ -3638,7 +3639,14 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     (no stable version available yet) and then we tell pear we want to satisfy
     dependencies.
 </p>
-
+<p>
+    To create the temporary directory on a UNIX-based system, you can do:
+</p>
+<pre>
+    cd phpMyAdmin
+    mkdir tmp
+    chmod o+rwx tmp 
+</pre>
 <a name="faqproject"></a><br />
 <h3>[7. phpMyAdmin project]</h3>