From: Alan Knowles Date: Thu, 25 Jul 2019 03:18:58 +0000 (+0800) Subject: fix old style export X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=0aabc23ac14416b670b56c3df422de008c58c4fd fix old style export --- diff --git a/GnumericToExcel.php b/GnumericToExcel.php index d8da8da2..9927c456 100644 --- a/GnumericToExcel.php +++ b/GnumericToExcel.php @@ -34,7 +34,7 @@ class Pman_Core_GnumericToExcel extends Pman } 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'); @@ -55,9 +55,10 @@ class Pman_Core_GnumericToExcel extends Pman //$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???'); - if (!empty($_POST['format']) && $_POST['format']=='gnumeric') { + if (1) { // 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"'); } else { header('Content-type: text/xml'); } diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js index 2574bd27..1b9ad21e 100644 --- a/Pman.Gnumeric.js +++ b/Pman.Gnumeric.js @@ -1181,6 +1181,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { var content = this.doc.createElement('Content'); content.setAttribute('image-type', type ? type : 'jpeg'); content.setAttribute('size-bytes', size); + content.appendChild( this.doc.createTextNode(data)); soi.appendChild(content); objs.appendChild(soi); @@ -1218,6 +1219,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { * @param {Number} width image height * */ + writeImage : function (row, col, data, width, height, type) { @@ -1360,7 +1362,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { var content = this.doc.createElement('Content'); content.setAttribute('image-type', type ? type : 'jpeg'); content.setAttribute('size-bytes', size); - content.textContent = data; + content.appendChild( this.doc.createTextNode(data)); soi.appendChild(content); objs.appendChild(soi); @@ -1416,6 +1418,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { var content = this.doc.createElement('Content'); content.setAttribute('image-type', type ? type : 'jpeg'); content.setAttribute('name', name); + soi.appendChild(content); objs.appendChild(soi);