fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 08:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Improve parsing of route definitions and deleted vars

Browse source
This commit is contained in:
Kijin Sung 2020-06-17 12:33:21 +09:00
parent bb3d1f08a1
commit a814b4e334
3 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/framework/parsers/moduleactionparser.php
View file

@ -18,6 +18,7 @@ class ModuleActionParser
'hex' => '[0-9a-f]+', 'hex' => '[0-9a-f]+',
'word' => '[a-zA-Z0-9_]+', 'word' => '[a-zA-Z0-9_]+',
'any' => '[^/]+', 'any' => '[^/]+',
'delete' => '[^/]+',
); );
/** /**
@ -194,7 +195,7 @@ class ModuleActionParser
} }
else else
{ {
$var_type = ends_with('_srl', $match[1]) ? 'number' : 'any'; $var_type = ends_with('_srl', $match[1]) ? 'int' : 'any';
$var_pattern = self::$_shortcuts[$var_type]; $var_pattern = self::$_shortcuts[$var_type];
} }
$named_group = '(?P<' . $match[1] . '>' . $var_pattern . ')'; $named_group = '(?P<' . $match[1] . '>' . $var_pattern . ')';
@ -207,7 +208,9 @@ class ModuleActionParser
// Return the regexp and variable list. // Return the regexp and variable list.
$result = new \stdClass; $result = new \stdClass;
$result->route = preg_replace($var_regexp, '\\$$1', $route['route']); $result->route = preg_replace_callback($var_regexp, function($match) {
return '$' . ((isset($match[2]) && $match[2] === 'delete') ? ($match[1] . ':' . $match[2]) : $match[1]);
}, $route['route']);
$result->priority = $route['priority'] ?: 0; $result->priority = $route['priority'] ?: 0;
$result->regexp = $regexp; $result->regexp = $regexp;
$result->vars = $vars; $result->vars = $vars;

3
common/framework/router.php
View file

@ -120,7 +120,6 @@ class Router
// Separate the prefix and the internal part of the URL. // Separate the prefix and the internal part of the URL.
$prefix = $matches[1]; $prefix = $matches[1];
$internal_url = $matches[2] ?? ''; $internal_url = $matches[2] ?? '';
// Find the module associated with this prefix. // Find the module associated with this prefix.
$action_info = self::_getActionInfoByPrefix($prefix); $action_info = self::_getActionInfoByPrefix($prefix);
if ($action_info) if ($action_info)
@ -372,7 +371,7 @@ class Router
$matched_arguments = array_intersect_key($route_vars['vars'], $vars); $matched_arguments = array_intersect_key($route_vars['vars'], $vars);
if (count($matched_arguments) === count($route_vars['vars'])) if (count($matched_arguments) === count($route_vars['vars']))
{ {
$reordered_routes[$route] = $route_vars['priority'] ?: count($matched_arguments); $reordered_routes[$route] = ($route_vars['priority'] * 1000) + count($matched_arguments);
} }
} }
if (!count($reordered_routes)) if (!count($reordered_routes))

34
modules/board/conf/module.xml
View file

@ -57,25 +57,35 @@
</grants> </grants>
<actions> <actions>
<action name="dispBoardContent" type="view" permission="list" standalone="false" index="true"> <action name="dispBoardContent" type="view" permission="list" standalone="false" index="true">
<route route="$document_srl:int" priority="51" /> <route route="$document_srl:int" priority="100" />
<route route="$document_srl:int/page/$page:int" priority="52" /> <route route="$document_srl:int/comment/$comment_srl:int" priority="100" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="41" /> <route route="$document_srl:int/page/$page:int" priority="100" />
<route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="42" /> <route route="category/$category:int/search/$search_target:word/$search_keyword:any" priority="60" />
<route route="search/$search_target:word/$search_keyword:any" priority="31" /> <route route="category/$category:int/search/$search_target:word/$search_keyword:any/page/$page:int" priority="60" />
<route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="32" /> <route route="search/$search_target:word/$search_keyword:any" priority="50" />
<route route="category/$category:int" priority="21" /> <route route="search/$search_target:word/$search_keyword:any/page/$page:int" priority="50" />
<route route="category/$category:int/page/$page:int" priority="22" /> <route route="category/$category:int" priority="40" />
<route route="category/$category:int/page/$page:int" priority="40" />
<route route="page/$page:int" priority="10" /> <route route="page/$page:int" priority="10" />
</action> </action>
<action name="dispBoardWrite" type="view" permission="write_document" standalone="false" meta-noindex="true"> <action name="dispBoardWrite" type="view" permission="write_document" standalone="false" meta-noindex="true">
<route route="write" /> <route route="write" />
<route route="$document_srl:int/edit" /> <route route="$document_srl/edit" />
</action> </action>
<action name="dispBoardDelete" type="view" permission="write_document" standalone="false" meta-noindex="true" route="$document_srl/delete" /> <action name="dispBoardDelete" type="view" permission="write_document" standalone="false" meta-noindex="true" route="$document_srl/delete" />
<action name="dispBoardWriteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" route="$document_srl/comment" /> <action name="dispBoardWriteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" route="$document_srl/comment" />
<action name="dispBoardReplyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" route="comment/$comment_srl/reply"/> <action name="dispBoardReplyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true">
<action name="dispBoardModifyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" route="comment/$comment_srl/edit" /> <route route="comment/$comment_srl/reply" />
<action name="dispBoardDeleteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true" route="comment/$comment_srl/delete" /> <route route="comment/$comment_srl/reply$document_srl:delete" />
</action>
<action name="dispBoardModifyComment" type="view" permission="write_comment" standalone="false" meta-noindex="true">
<route route="comment/$comment_srl/edit" />
<route route="comment/$comment_srl/edit$document_srl:delete" />
</action>
<action name="dispBoardDeleteComment" type="view" permission="write_comment" standalone="false" meta-noindex="true">
<route route="comment/$comment_srl/delete" />
<route route="comment/$comment_srl/delete$document_srl:delete" />
</action>
<action name="dispBoardDeleteTrackback" type="view" permission="list,view" standalone="false" meta-noindex="true" /> <action name="dispBoardDeleteTrackback" type="view" permission="list,view" standalone="false" meta-noindex="true" />
<action name="dispBoardContentList" type="view" permission="list" standalone="false" /> <action name="dispBoardContentList" type="view" permission="list" standalone="false" />
<action name="dispBoardContentView" type="view" permission="view" standalone="false" /> <action name="dispBoardContentView" type="view" permission="view" standalone="false" />