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

stop()사용시에도 http status code 적용

Browse source
This commit is contained in:
conory 2016-04-19 16:02:42 +09:00
parent 649e25ab63
commit 0cb9958319
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -897,7 +897,6 @@ class ModuleHandler extends Handler
$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1); $methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
if(!isset($methodList[Context::getRequestMethod()])) if(!isset($methodList[Context::getRequestMethod()]))
{ {
if($_SESSION['XE_VALIDATOR_RETURN_URL']) if($_SESSION['XE_VALIDATOR_RETURN_URL'])
{ {
header('location: ' . $_SESSION['XE_VALIDATOR_RETURN_URL']); header('location: ' . $_SESSION['XE_VALIDATOR_RETURN_URL']);
@ -914,15 +913,14 @@ class ModuleHandler extends Handler
$oMessageObject->setMessage($this->error); $oMessageObject->setMessage($this->error);
$oMessageObject->dispMessage(); $oMessageObject->dispMessage();
if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200') // display Error Page
if($oMessageObject->getHttpStatusCode() && !in_array($oMessageObject->getHttpStatusCode(), array('200', '403')))
{ {
self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); $oMessageObject->setTemplateFile('http_status_code');
if($oMessageObject->getHttpStatusCode() != '403')
{
$oMessageObject->setTemplateFile('http_status_code');
}
} }
self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
// If module was called normally, change the templates of the module into ones of the message view module // If module was called normally, change the templates of the module into ones of the message view module
if($oModule) if($oModule)
{ {

2
classes/module/ModuleObject.class.php
View file

@ -236,6 +236,8 @@ class ModuleObject extends Object
$this->setTemplatePath($oMessageObject->getTemplatePath()); $this->setTemplatePath($oMessageObject->getTemplatePath());
$this->setTemplateFile($oMessageObject->getTemplateFile()); $this->setTemplateFile($oMessageObject->getTemplateFile());
$this->setHttpStatusCode($oMessageObject->getHttpStatusCode());
ModuleHandler::_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
return $this; return $this;
} }