X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GnumericToExcel.php;h=d8da8da207ab80e0d0ca68e9eb870c1db07d9f0c;hb=e39d2ef242655925971dc44404b4d5ce287424a2;hp=76c3ac31b537afe344702526678259a4819945fb;hpb=141fdefa8b905b24684665083703577e96728a92;p=Pman.Core diff --git a/GnumericToExcel.php b/GnumericToExcel.php index 76c3ac31..d8da8da2 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,6 +89,9 @@ class Pman_Core_GnumericToExcel extends Pman die("ERROR CONVERTING?:" . $cmd ."\n

OUTPUT:". htmlspecialchars($out)); } // unlink($srcTmp); + 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'); @@ -108,5 +111,5 @@ class Pman_Core_GnumericToExcel extends Pman } - + }