PHP7 fix

[Pman.Core] / GnumericToExcel.php

diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index 9927c45..cae4037 100644 (file)
--- 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';