fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-20 19:02:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support XE-compatible rewrite rules

Browse source
This commit is contained in:
Kijin Sung 2020-06-12 14:16:36 +09:00
parent 1cd3cfc7d9
commit baddbd3cba
5 changed files with 81 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,7 @@ class Context
// Set information about the current request.
self::_checkGlobalVars();
self::setRequestMethod();
self::setRequestArguments();
self::setRequestArguments(Rhymix\Framework\Router::getRequestArguments());
self::setUploadInfo();
// Load system configuration.
@ -1185,9 +1185,9 @@ class Context
*
* @return void
*/
public static function setRequestArguments()
public static function setRequestArguments($router_args = [])
{
foreach($_REQUEST as $key => $val)
foreach($router_args ?: $_REQUEST as $key => $val)
{
if($val === '' || isset(self::$_reserved_keys[$key]) || self::get($key))
{
@ -1211,7 +1211,7 @@ class Context
}
// Set deprecated request parameters.
if(!$_POST && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
if($_SERVER['REQUEST_METHOD'] === 'POST' && !$_POST && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
{
if(self::getRequestMethod() === 'XMLRPC')
{
@ -1231,6 +1231,10 @@ class Context
foreach((array)$params as $key => $val)
{
if (isset($router_args[$key]))
{
continue;
}
$key = escape($key);
$val = self::_filterXmlVars($key, $val);
self::set($key, $val, true);
@ -1242,6 +1246,10 @@ class Context
parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
foreach($params as $key => $val)
{
if (isset($router_args[$key]))
{
continue;
}
$key = escape($key);
$val = self::_filterRequestVar($key, $val);
self::set($key, $val, true);