fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 12:32:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix priority detection when priority is 0

Browse source
This commit is contained in:
Kijin Sung 2020-06-16 21:36:54 +09:00
parent a2bd361737
commit 1f11dbe41f
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/framework/router.php
View file

@ -14,14 +14,17 @@ class Router
'$mid' => array( '$mid' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/?$#', 'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/?$#',
'vars' => ['mid' => 'any'], 'vars' => ['mid' => 'any'],
'priority' => 0,
), ),
'$act' => array( '$act' => array(
'regexp' => '#^(?<act>rss|atom)$#', 'regexp' => '#^(?<act>rss|atom)$#',
'vars' => ['act' => 'word'], 'vars' => ['act' => 'word'],
'priority' => 0,
), ),
'$document_srl' => array( '$document_srl' => array(
'regexp' => '#^(?<document_srl>[0-9]+)$#', 'regexp' => '#^(?<document_srl>[0-9]+)$#',
'vars' => ['document_srl' => 'int'], 'vars' => ['document_srl' => 'int'],
'priority' => 0,
), ),
'$mid/$document_srl' => array( '$mid/$document_srl' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/(?<document_srl>[0-9]+)$#', 'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/(?<document_srl>[0-9]+)$#',
@ -36,6 +39,7 @@ class Router
'$mid/entry/$entry' => array( '$mid/entry/$entry' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/entry/(?<entry>[^/]+)$#', 'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/entry/(?<entry>[^/]+)$#',
'vars' => ['mid' => 'any', 'entry' => 'any'], 'vars' => ['mid' => 'any', 'entry' => 'any'],
'priority' => 0,
), ),
'$mid/$act' => array( '$mid/$act' => array(
'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/(?<act>rss|atom|api)$#', 'regexp' => '#^(?<mid>[a-zA-Z0-9_-]+)/(?<act>rss|atom|api)$#',
@ -46,6 +50,7 @@ class Router
'regexp' => '#^files/download/(?<file_srl>[0-9]+)/(?<file_key>[a-zA-Z0-9_-]+)/(?<filename>[^/]+)$#', 'regexp' => '#^files/download/(?<file_srl>[0-9]+)/(?<file_key>[a-zA-Z0-9_-]+)/(?<filename>[^/]+)$#',
'vars' => ['file_srl' => 'int', 'file_key' => 'any', 'filename' => 'any'], 'vars' => ['file_srl' => 'int', 'file_key' => 'any', 'filename' => 'any'],
'extra_vars' => ['act' => 'procFileOutput'], 'extra_vars' => ['act' => 'procFileOutput'],
'priority' => 0,
), ),
); );
@ -312,7 +317,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'] ?: count($matched_arguments);
} }
} }
if (!count($reordered_routes)) if (!count($reordered_routes))