projects / Pman.Base / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 462a2b5)
Pman.php
authoredward <edward@roojs.com>
Thu, 17 Mar 2016 04:06:32 +0000 (12:06 +0800)
committeredward <edward@roojs.com>
Thu, 17 Mar 2016 04:06:32 +0000 (12:06 +0800)
Pman.php patch | blob | history

diff --git a/Pman.php b/Pman.php
index e2c7431..83ffed9 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -566,10 +566,18 @@ class Pman extends HTML_FlexyFramework_Page
         require_once 'Services/JSON.php';
         $json = new Services_JSON();
         
-        if (!empty($_REQUEST['returnHTML']) || 
-            (isset($_SERVER['CONTENT_TYPE']) && preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']))
+        $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
+                preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
         
-        ) {
+        if ($retHTML){
+            if (isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] == 'NO') {
+                $retHTML = false;
+            }
+        } else {
+            $retHTML = isset($_REQUEST['returnHTML']) && $_REQUEST['returnHTML'] !='NO';
+        }
+        
+        if ($retHTML) {
             header('Content-type: text/html');
             echo "<HTML><HEAD></HEAD><BODY>";
             // encode html characters so they can be read..
Pman (Base Files)