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

Display 404 error if a route cannot be found

Browse source
This commit is contained in:
Kijin Sung 2020-06-18 13:25:16 +09:00
parent 527e16c924
commit 6286fd3397
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,10 +239,7 @@ class Context
$url = $_SERVER['REQUEST_URI'];
$route = Rhymix\Framework\Router::getRequestArguments($method, $url, Rhymix\Framework\Router::getRewriteLevel());
self::setRequestArguments($route->args);
if ($route->status !== 200)
{
}
self::set('route_info', $route);
}
else
{

10
classes/module/ModuleHandler.class.php
View file

@ -19,6 +19,7 @@ class ModuleHandler extends Handler
var $document_srl = NULL; ///< Document Number
var $module_srl = NULL; ///< Module Number
var $module_info = NULL; ///< Module Info
var $route = NULL; ///< Router result
var $error = NULL; ///< an error code.
var $httpStatusCode = NULL; ///< http status code.
@ -84,6 +85,7 @@ class ModuleHandler extends Handler
$this->mid = $mid ? $mid : Context::get('mid');
$this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl');
$this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl');
$this->route = Context::get('route_info');
if($entry = Context::get('entry'))
{
$this->entry = Context::convertEncodingStr($entry);
@ -140,6 +142,14 @@ class ModuleHandler extends Handler
}
}
// If the Router returned an error earlier, show an error here.
if($this->route && $this->route->status > 200)
{
$this->error = 'msg_module_is_not_exists';
$this->httpStatusCode = '404';
return true;
}
// if success_return_url and error_return_url is incorrect
$urls = array(Context::get('success_return_url'), Context::get('error_return_url'));
foreach($urls as $url)