projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PHP7 fix
[Pman.Core]
/
GnumericToExcel.php
diff --git
a/GnumericToExcel.php
b/GnumericToExcel.php
index
4271af3
..
cae4037
100644
(file)
--- a/
GnumericToExcel.php
+++ b/
GnumericToExcel.php
@@
-28,13
+28,13
@@
class Pman_Core_GnumericToExcel extends Pman
return true;
}
return true;
}
- function get()
+ function get(
$v, $opts=array()
)
{
}
function post($fname) {
{
}
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');
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'];
die("Missing XML attribute");
}
$xml = $_POST['xml'];
- print_R($xml);exit;
+
$xml = iconv("UTF-8", "UTF-8//IGNORE", $xml);
//$xml = str_replace('�', 'e', $xml);
$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'] : '???');
//$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');
if (empty($_POST['debug'])) {
header('Content-type: application/x-gnumeric');
+ header('Content-Disposition: attachment; filename="' .addslashes($fname). '.gnumeric"');
} else {
header('Content-type: text/xml');
}
} else {
header('Content-type: text/xml');
}
@@
-73,8
+74,10
@@
class Pman_Core_GnumericToExcel extends Pman
require_once 'System.php';
require_once 'System.php';
+ $xvfb = System::which('xvfb-run');
+
$ss = System::which('ssconvert');
$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';
" --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
}
}
-
+
}
}