X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=GnumericToExcel.php;h=cae40372bb5c48e2a25c625e80288fe3aa3c2e80;hp=9927c456ac85a949b57f2ea4772fef6c6d9bd023;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=0aabc23ac14416b670b56c3df422de008c58c4fd diff --git a/GnumericToExcel.php b/GnumericToExcel.php index 9927c456..cae40372 100644 --- a/GnumericToExcel.php +++ b/GnumericToExcel.php @@ -55,7 +55,7 @@ class Pman_Core_GnumericToExcel extends Pman //$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???'); - if (1) { // 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"'); @@ -74,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';