//$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"');
echo $xml;
exit;
}
- $srcTmp = ini_get('session.save_path') . '/' .uniqid('gnumeric_').'.gnumeric';
- $targetTmp = ini_get('session.save_path') . '/' .uniqid('gnumeric_').'.xls';
+
+ $ext = '.xls';
+ $outfmt = 'Gnumeric_Excel:excel_biff8';
+ $mime = 'application/vnd.ms-excel';
+
+ /*
+ // ssconvert results in bad images
+ if (!empty($_POST['format']) && $_POST['format']=='xlsx') {
+ $outfmt = 'Gnumeric_Excel:xlsx';
+ $ext = 'xlsx';
+ $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+ }
+ */
+
+
+
+ $srcTmp = $this->tempName('gnumeric');
+ $targetTmp = $this->tempName($ext);
// write the gnumeric file...
$fh = fopen($srcTmp,'w');
fwrite($fh, $xml);
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 " .
+ " --export-type={$outfmt} " .
$srcTmp . ' ' . $targetTmp . ' 2>&1';
// echo $cmd;
//passthru($cmd);exit;
header("HTTP/1.0 400 Internal Server Error - Convert error");
die("ERROR CONVERTING?:" . $cmd ."\n<BR><BR> OUTPUT:". htmlspecialchars($out));
}
+
+ if (!empty($_POST['format']) && $_POST['format']=='xlsx') {
+ require_once 'File/Convert.php';
+ $cc = new File_Convert($targetTmp,'application/vnd.ms-excel');
+
+ $targetTmp = $cc->convert('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+ $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+ $ext = "xlsx";
+ }
+
+
+
+
+
+
// unlink($srcTmp);
if (empty($fname)) {
$fname = basename($targetTmp);
}
- $fname .= preg_match('/\.xls/i', $fname) ? '' : '.xls'; // make sure it ends in xls..
+ $fname .= preg_match('/\.' . $ext . '/i', $fname) ? '' : ('.' . $ext); // make sure it ends in xls..
- header('Content-type: application/vnd.ms-excel');
+ header('Content-type: ' . $mime);
header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');
header('Content-length: '. filesize($targetTmp));
header("Content-Transfer-Encoding: binary");