fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 22:33:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2596 add a js callback method.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11774 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-18 07:55:57 +00:00
parent 3c79a21e67
commit fcee2600f1
3 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/context/Context.class.php
View file

@ -794,7 +794,7 @@ class Context {
function setResponseMethod($method='HTML') {
is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1);
$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1, 'JS_CALLBACK' => 1);
$self->response_method = isset($methods[$method]) ? $method : 'HTML';
}
@ -809,7 +809,7 @@ class Context {
if($self->response_method) return $self->response_method;
$method = $self->getRequestMethod();
$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1);
$methods = array('HTML'=>1, 'XMLRPC'=>1, 'JSON'=>1, 'JS_CALLBACK' => 1);
return isset($methods[$method]) ? $method : 'HTML';
}
@ -823,9 +823,12 @@ class Context {
function setRequestMethod($type='') {
is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
$xe_js_callback = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
($type && $self->request_method=$type) or
(strpos($_SERVER['CONTENT_TYPE'],'json') && $self->request_method='JSON') or
($GLOBALS['HTTP_RAW_POST_DATA'] && $self->request_method='XMLRPC') or
($xe_js_callback && $self->request_method='JS_CALLBACK') or
($self->request_method = $_SERVER['REQUEST_METHOD']);
}