fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Reorganize rules and conditions

Browse source
This commit is contained in:
Kijin Sung 2020-06-14 20:24:31 +09:00
parent d582b712db
commit d0b0790beb
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/framework/router.php
View file

@ -11,6 +11,10 @@ class Router
* List of XE-compatible global routes.
*/
protected static $_global_routes = array(
'$mid' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/?$#',
'vars' => ['mid' => 'any'],
),
'$act' => array(
'regexp' => '#^(?<act>rss|atom)$#',
'vars' => ['act' => 'word'],
@ -19,10 +23,6 @@ class Router
'regexp' => '#^(?<document_srl>[0-9]+)$#',
'vars' => ['document_srl' => 'int'],
),
'$mid' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/?$#',
'vars' => ['mid' => 'any'],
),
'$mid/$document_srl' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/(?<document_srl>[0-9]+)$#',
'vars' => ['mid' => 'any', 'document_srl' => 'int'],
@ -44,11 +44,6 @@ class Router
'vars' => ['file_srl' => 'int', 'file_key' => 'any', 'filename' => 'any'],
'extra_vars' => ['act' => 'procFileOutput'],
),
'admin' => array(
'regexp' => '#^admin$#',
'vars' => [],
'extra_vars' => ['module' => 'admin'],
),
);
/**
@ -183,13 +178,13 @@ class Router
}
// If there is only one argument, try either $mid or $document_srl.
if ($count == 1 && ($keys[0] === 'mid' || $keys[0] === 'document_srl'))
if ($rewrite_level >= 1 && $count == 1 && ($keys[0] === 'mid' || $keys[0] === 'document_srl'))
{
return urlencode($args[$keys[0]]);
}
// If $mid exists, try routes defined in the module.
if (isset($args['mid']) && $rewrite_level == 2)
if ($rewrite_level >= 2 && isset($args['mid']))
{
// Remove $mid from arguments and work with the remainder.
$args2 = $args; unset($args2['mid'], $args2['act']);
@ -212,7 +207,7 @@ class Router
}
// Check XE-compatible routes that start with $mid and contain no $act.
if (!isset($args['act']))
if (!isset($args['act']) || ($args['act'] === 'rss' || $args['act'] === 'atom' || $args['act'] === 'api'))
{
$result = self::_insertRouteVars(self::_getRearrangedGlobalRoutes(), $args2);
if ($result !== false)
@ -226,6 +221,14 @@ class Router
}
// Try XE-compatible global routes.
if ($rewrite_level >= 1)
{
$result = self::_insertRouteVars(self::_getRearrangedGlobalRoutes(), $args);
if ($result !== false)
{
return $result;
}
}
// If no route matches, just create a query string.
return 'index.php?' . http_build_query($args);
@ -284,10 +287,7 @@ class Router
{
foreach (self::$_global_routes as $route_name => $route_info)
{
if (!strncmp($route_name, '$mid/', 5))
{
self::$_rearranged_global_routes[$route_name] = $route_info['vars'];
}
self::$_rearranged_global_routes[$route_name] = $route_info['vars'];
}
}