projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
GnumericToExcel.php
diff --git
a/GnumericToExcel.php
b/GnumericToExcel.php
index
527e103
..
feb940c
100644
(file)
--- a/
GnumericToExcel.php
+++ b/
GnumericToExcel.php
@@
-30,7
+30,7
@@
class Pman_Core_GnumericToExcel extends Pman
function get($v, $opts=array())
{
function get($v, $opts=array())
{
-
+
}
function post($fname) {
}
function post($fname) {
@@
-66,10
+66,13
@@
class Pman_Core_GnumericToExcel extends Pman
exit;
}
exit;
}
- $ext = '
.
xls';
+ $ext = 'xls';
$outfmt = 'Gnumeric_Excel:excel_biff8';
$mime = 'application/vnd.ms-excel';
$outfmt = 'Gnumeric_Excel:excel_biff8';
$mime = 'application/vnd.ms-excel';
- /* if (!empty($_POST['format']) && $_POST['format']=='xlsx') {
+
+ /*
+ // 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';
$outfmt = 'Gnumeric_Excel:xlsx';
$ext = 'xlsx';
$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
@@
-95,7
+98,7
@@
class Pman_Core_GnumericToExcel extends Pman
" --export-type={$outfmt} " .
$srcTmp . ' ' . $targetTmp . ' 2>&1';
// echo $cmd;
" --export-type={$outfmt} " .
$srcTmp . ' ' . $targetTmp . ' 2>&1';
// echo $cmd;
- //passthru($cmd);exit;
+ //passthru($cmd);exit;
//exit;
$out = `$cmd`;
clearstatcache();
//exit;
$out = `$cmd`;
clearstatcache();
@@
-104,26
+107,35
@@
class Pman_Core_GnumericToExcel extends Pman
header("HTTP/1.0 400 Internal Server Error - Convert error");
die("ERROR CONVERTING?:" . $cmd ."\n<BR><BR> OUTPUT:". htmlspecialchars($out));
}
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');
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');
$targetTmp = $cc->convert('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
- $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
- $ext = ".xlsx";
+ if (empty($targetTmp)) {
+ $this->jerr("convert to xlsx failed");
+ }
+
+ $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+ $ext = "xlsx";
}
}
-
-
-
-
-
-
- // unlink($srcTmp);
if (empty($fname)) {
$fname = basename($targetTmp);
}
$fname .= preg_match('/\.' . $ext . '/i', $fname) ? '' : ('.' . $ext); // make sure it ends in xls..
if (empty($fname)) {
$fname = basename($targetTmp);
}
$fname .= preg_match('/\.' . $ext . '/i', $fname) ? '' : ('.' . $ext); // make sure it ends in xls..
+
+ DB_DataObject::factory('Events')->addFile(array(
+ 'tmp_name' => $targetTmp,
+ 'name' => $fname,
+ 'type' => $mime,
+ 'size' => filesize($targetTmp)
+ ));
+
+ $this->addEvent("DOWNLOAD", false, $fname );
+
+ // unlink($srcTmp);
+
header('Content-type: ' . $mime);
header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');
header('Content-length: '. filesize($targetTmp));
header('Content-type: ' . $mime);
header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');
header('Content-length: '. filesize($targetTmp));