X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GnumericToExcel.php;h=bcf1a63d020a8ffce79c24b21cb28058b1a2b801;hb=403d1007772e7e24fc54bbb386911c22dbb5b47f;hp=bc26dc703c6e7bc2a1413855d8255832a41552b5;hpb=ac868dbed2b7015a67bc217cf507c61bbb959cac;p=Pman.Core
diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index bc26dc70..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,7 +89,10 @@ class Pman_Core_GnumericToExcel extends Pman
die("ERROR CONVERTING?:" . $cmd ."\n
OUTPUT:". htmlspecialchars($out));
}
// unlink($srcTmp);
- // $fname .= preg_match('/\.xls/i', $fname) ? '' : '.xls'; // make sure it ends in xls..
+ 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). '"');