X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=GnumericToExcel.php;h=cae40372bb5c48e2a25c625e80288fe3aa3c2e80;hp=4271af3302f0e2a7554249b7eddb9b06e6a96ec1;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=cb25fd6968258066c36c1843116f5ee0d3fc0b55 diff --git a/GnumericToExcel.php b/GnumericToExcel.php index 4271af33..cae40372 100644 --- a/GnumericToExcel.php +++ b/GnumericToExcel.php @@ -28,13 +28,13 @@ class Pman_Core_GnumericToExcel extends Pman return true; } - function get() + function get($v, $opts=array()) { } function post($fname) { - $ml = (int) ini_get('suhosin.post.max_value_length'); + $ml = (int) ini_get('suhosin.post.max_value_length'); if (empty($_POST['xml'])) { header("HTTP/1.0 400 Internal Server Error"); die( $ml ? "Suhosin Patch enabled - try and disable it!!!" : 'no XML sent'); @@ -45,7 +45,7 @@ class Pman_Core_GnumericToExcel extends Pman die("Missing XML attribute"); } $xml = $_POST['xml']; - print_R($xml);exit; + $xml = iconv("UTF-8", "UTF-8//IGNORE", $xml); //$xml = str_replace('�', 'e', $xml); @@ -55,9 +55,10 @@ class Pman_Core_GnumericToExcel extends Pman //$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???'); - if (!empty($_POST['format']) && $_POST['format']=='gnumeric') { + if (!empty($_POST['format']) && $_POST['format']=='gnumeric') { if (empty($_POST['debug'])) { header('Content-type: application/x-gnumeric'); + header('Content-Disposition: attachment; filename="' .addslashes($fname). '.gnumeric"'); } else { header('Content-type: text/xml'); } @@ -73,8 +74,10 @@ class Pman_Core_GnumericToExcel extends Pman require_once 'System.php'; + $xvfb = System::which('xvfb-run'); + $ss = System::which('ssconvert'); - $cmd = $ss. + $cmd = $xvfb . " -a " . $ss. " --import-encoding=Gnumeric_XmlIO:sax" . " --export-type=Gnumeric_Excel:excel_biff8 " . $srcTmp . ' ' . $targetTmp . ' 2>&1'; @@ -111,5 +114,5 @@ class Pman_Core_GnumericToExcel extends Pman } - + }