projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Process/Php7.php
[Pman.Core]
/
GnumericToExcel.php
diff --git
a/GnumericToExcel.php
b/GnumericToExcel.php
index
bc26dc7
..
bcf1a63
100644
(file)
--- a/
GnumericToExcel.php
+++ b/
GnumericToExcel.php
@@
-28,7
+28,7
@@
class Pman_Core_GnumericToExcel extends Pman
return true;
}
return true;
}
- function get()
+ function get(
$v, $opts=array()
)
{
}
{
}
@@
-48,9
+48,9
@@
class Pman_Core_GnumericToExcel extends Pman
$xml = iconv("UTF-8", "UTF-8//IGNORE", $xml);
$xml = iconv("UTF-8", "UTF-8//IGNORE", $xml);
- //$xml = str_replace('
é
', 'e', $xml);
+ //$xml = str_replace('
�
', 'e', $xml);
//$xml = str_replace("\xA0", ' ', $xml);
//$xml = str_replace("\xA0", ' ', $xml);
- //$xml = str_replace("
Ø
", 'dia.',$xml);
+ //$xml = str_replace("
�
", 'dia.',$xml);
//$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???');
//$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???');
@@
-89,7
+89,10
@@
class Pman_Core_GnumericToExcel extends Pman
die("ERROR CONVERTING?:" . $cmd ."\n<BR><BR> OUTPUT:". htmlspecialchars($out));
}
// unlink($srcTmp);
die("ERROR CONVERTING?:" . $cmd ."\n<BR><BR> OUTPUT:". htmlspecialchars($out));
}
// unlink($srcTmp);
- // $fname .= preg_match('/\.xls/i', $fname) ? '' : '.xls'; // make sure it ends in xls..
+ if (empty($fname)) {
+ $fname = basename($targetTmp);
+ }
+ $fname .= preg_match('/\.xls/i', $fname) ? '' : '.xls'; // make sure it ends in xls..
header('Content-type: application/vnd.ms-excel');
header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');
header('Content-type: application/vnd.ms-excel');
header('Content-Disposition: attachment; filename="' .addslashes($fname). '"');