DataObjects/Core_person_signup.php

[Pman.Core] / GnumericToExcel.php

diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index eabf244..25f2ff3 100644 (file)
--- a/GnumericToExcel.php
+++ b/GnumericToExcel.php
@@ -89,13 +89,23 @@ class Pman_Core_GnumericToExcel extends Pman
             die("ERROR CONVERTING?:" . $cmd ."\n<BR><BR> OUTPUT:". htmlspecialchars($out));
         }
        // unlink($srcTmp);
-        $fname .= preg_match('/\.xls/i', $fname) ? ' :  '.xls'; // make sure it ends in xls..
-        $fh = fopen($targetTmp, 'r');
+        if (empty($fname)) {
+           $fname = basename($targetTmp);
+        }
+        $fname .= preg_match('/\.xls/i', $fname) ? '' :  '.xls'; // make sure it ends in xls..
+       
         header('Content-type: application/vnd.ms-excel');
         header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');
-         
-        // will not work on IE... - needs while/fget..
-        fpassthru($fh);
+        header('Content-length: '. filesize($targetTmp));   
+        header("Content-Transfer-Encoding: binary");
+        if ($file = fopen($targetTmp, 'rb')) {
+            while(!feof($file) and (connection_status()==0)) {
+                print(fread($file, 1024*8));
+                flush();
+            }
+            fclose($file);
+        }
+       
         unlink($targetTmp);
         exit;