X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GnumericToExcel.php;h=bcf1a63d020a8ffce79c24b21cb28058b1a2b801;hb=b341a92085a9d4a5cfb1d2043e599420472aa6c8;hp=ed9436c36d83d44b09e0a83d2fb1794646f43a7d;hpb=b9a8bac42e7d92994860c3203550641b77c3e304;p=Pman.Core
diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index ed9436c3..bcf1a63d 100644
--- a/GnumericToExcel.php
+++ b/GnumericToExcel.php
@@ -28,7 +28,7 @@ class Pman_Core_GnumericToExcel extends Pman
return true;
}
- function get()
+ function get($v, $opts=array())
{
}
@@ -48,9 +48,9 @@ class Pman_Core_GnumericToExcel extends Pman
$xml = iconv("UTF-8", "UTF-8//IGNORE", $xml);
- //$xml = str_replace('é', 'e', $xml);
+ //$xml = str_replace('�', 'e', $xml);
//$xml = str_replace("\xA0", ' ', $xml);
- //$xml = str_replace("Ø", 'dia.',$xml);
+ //$xml = str_replace("�", 'dia.',$xml);
//$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???');
@@ -89,13 +89,23 @@ class Pman_Core_GnumericToExcel extends Pman
die("ERROR CONVERTING?:" . $cmd ."\n
OUTPUT:". htmlspecialchars($out));
}
// unlink($srcTmp);
- $fname = preg_match('/\.xls/i', $fname) ? $fname : ($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;