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

XMLRPC 요청을 무시하는 문제 수정

Browse source
This commit is contained in:
conory 2018-03-10 23:34:37 +09:00
parent 5fa2dec9db
commit 4d0cfabfb7
1 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1122,21 +1122,12 @@ class Context
*/
public static function setRequestMethod($type = '')
{
self::$_instance->js_callback_func = self::getJSCallbackFunc();
if ($type)
{
self::$_instance->request_method = $type;
return;
}
elseif (strpos($_SERVER['HTTP_ACCEPT'], 'json') !== false || strpos($_SERVER['CONTENT_TYPE'], 'json') !== false || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') !== false)
{
self::$_instance->request_method = 'JSON';
}
elseif ($GLOBALS['HTTP_RAW_POST_DATA'])
{
self::$_instance->request_method = 'XMLRPC';
}
elseif (self::$_instance->js_callback_func)
elseif (self::$_instance->js_callback_func = self::getJSCallbackFunc())
{
self::$_instance->request_method = 'JS_CALLBACK';
}
@ -1144,6 +1135,36 @@ class Context
{
self::$_instance->request_method = $_SERVER['REQUEST_METHOD'];
}
// Check POST data
if(self::$_instance->request_method == 'POST')
{
if(!isset($GLOBALS['HTTP_RAW_POST_DATA']))
{
$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
}
// JSON or XMLRPC
if ($GLOBALS['HTTP_RAW_POST_DATA'] && !$_POST)
{
foreach(array($_SERVER['HTTP_ACCEPT'], $_SERVER['HTTP_CONTENT_TYPE'], $_SERVER['CONTENT_TYPE']) as $header)
{
if(strpos($header, 'json') !== false)
{
$json_request = true;
break;
}
}
self::$_instance->request_method = isset($json_request) ? 'JSON' : 'XMLRPC';
}
}
// Pretend that this request is XMLRPC for compatibility with XE third-party.
if(isset($_POST['_rx_ajax_compat']) && $_POST['_rx_ajax_compat'] === 'XMLRPC')
{
self::$_instance->request_method = 'XMLRPC';
}
}
/**
@ -1156,18 +1177,6 @@ class Context
// Get the request method.
$request_method = self::getRequestMethod();
// Fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above.
if($request_method !== 'GET' && !isset($GLOBALS['HTTP_RAW_POST_DATA']) && !count($_FILES) && version_compare(PHP_VERSION, '5.6.0', '>='))
{
$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
// If content is not XML or JSON, unset
if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === false && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === false)
{
unset($GLOBALS['HTTP_RAW_POST_DATA']);
}
}
// Handle XMLRPC request parameters (Deprecated).
if ($request_method === 'XMLRPC')
{
@ -1190,7 +1199,7 @@ class Context
{
foreach($params as $key => $val)
{
self::set($key, $this->_filterXmlVars($key, $val), true);
self::set($key, self::_filterXmlVars($key, $val), true);
}
}
}
@ -1243,13 +1252,6 @@ class Context
self::set($key, $val, $set_to_vars);
}
}
// Pretend that this request is XMLRPC for compatibility with XE third-party.
if(isset($_POST['_rx_ajax_compat']) && $_POST['_rx_ajax_compat'] === 'XMLRPC')
{
self::$_instance->request_method = 'XMLRPC';
self::$_instance->response_method = 'XMLRPC';
}
}
/**