From bff031d29931905f420dd22ac664ce66b59d283c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Thu, 6 Sep 2001 07:15:33 +0000
Subject: [PATCH] improved the patch Marc commited about headers send to
 enforce download of dump files

---
 ChangeLog     |  1 +
 tbl_dump.php3 | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 813352e7e..c4fb85e9c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $Source$
 	* lang/galician.inc.php3: updated thanks to
 	  Xosé Calvo <xosecalvo at terra.es>.
 	* lib.inc.php3: fixed a bug with the browse table headers sorting feature.
+	* tbl_dump.php3: improved the patch Marc commited.
 
 2001-09-05  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lib.inc.php3:
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index 0cc5aadf1..f87a1a84f 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -1,6 +1,7 @@
 <?php
 /* $Id$ */
 
+
 /**
  * Formats the INSERT statements depending on the target (screen/file) of the
  * sql dump
@@ -114,13 +115,18 @@ else {
         $mime_type = 'text/x-csv';
     } else {
         $ext       = 'sql';
-        $mime_type = 'application/octetstream';
+        // loic1: 'application/octet-stream' is the registered IANA type but
+        //        MSIE and Opera seems to prefer 'application/octetstream'
+        $mime_type = (USR_BROWSER_AGENT == 'IE' || USR_BROWSER_AGENT == 'OPERA')
+                   ? 'application/octetstream'
+                   : 'application/octet-stream';
     }
 
     // Send headers
-    // we need "inline" instead of "attachment" for IE 5.5
     header('Content-Type: ' . $mime_type);
-    header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"');
+    // lem9: we need "inline" instead of "attachment" for IE 5.5
+    $content_disp = (USR_BROWSER_AGENT == 'IE') ? 'inline' : 'attachment';
+    header('Content-Disposition:  ' . $content_disp . '; filename="' . $filename . '.' . $ext . '"');
     header('Pragma: no-cache');
     header('Expires: 0');
 } // end download