[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12968-gbffad98

[Michal Čihař]

The branch, master has been updated
       via  bffad989158bcf15409399ee5623d3611fb2f128 (commit)
      from  6c92b02f81c2296382d60bd66653d296628e926e (commit)


- Log -----------------------------------------------------------------
commit bffad989158bcf15409399ee5623d3611fb2f128
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Aug 4 15:19:29 2011 +0200

    Separate data decoding from output

-----------------------------------------------------------------------

Summary of changes:
 file_echo.php |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/file_echo.php b/file_echo.php
index 2add078..2756209 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -39,16 +39,20 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
         $filename = $_REQUEST['filename'];
     }
 
-    /* Send download header */
-    PMA_download_header($filename, $_REQUEST['type']);
-
-    /* Send data */
+    /* Decode data */
     if ($extension != 'svg') {
-        echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1));
+        $data = substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1);
+        $data = base64_decode($data);
     } else {
-        echo $_REQUEST['image'];
+        $data = $_REQUEST['image'];
     }
 
+    /* Send download header */
+    PMA_download_header($filename, $_REQUEST['type'], strlen($data));
+
+    /* Send data */
+    echo $data;
+
 } else if (isset($_REQUEST['monitorconfig'])) {
     PMA_download_header('monitor.cfg', 'application/force-download');
     echo urldecode($_REQUEST['monitorconfig']);


hooks/post-receive
-- 
phpMyAdmin