From: edward Date: Wed, 30 Mar 2016 10:27:21 +0000 (+0800) Subject: RooTrait.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=50e7c3bf7f3378aa977d39a43125dabba4a70b56 RooTrait.php --- diff --git a/RooTrait.php b/RooTrait.php index c859cdf5..47bd73fd 100644 --- a/RooTrait.php +++ b/RooTrait.php @@ -141,7 +141,40 @@ trait Pman_Core_RooTrait { $this->transObj->query( connection_aborted() ? 'ROLLBACK' : 'COMMIT'); } - return parent::jok($str); + $cli = HTML_FlexyFramework::get()->cli; + + if ($cli) { + echo "OK: " .$str . "\n"; + exit; + } + require_once 'Services/JSON.php'; + $json = new Services_JSON(); + + $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 ""; + // encode html characters so they can be read.. + echo str_replace(array('<','>'), array('\u003c','\u003e'), + $json->encodeUnsafe(array('success'=> true, 'data' => $str))); + echo ""; + exit; + } + + + echo $json->encode(array('success'=> true, 'data' => $str)); + + exit; }