From f930ec74f8ddbde1a834d7bbcad9d217e45c8ecb Mon Sep 17 00:00:00 2001 From: conory Date: Mon, 18 Apr 2016 23:43:04 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EB=A9=94=EC=84=B8=EC=A7=80=EB=A5=BC=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20403=20HTTP=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 14 +++++++---- classes/module/ModuleObject.class.php | 2 +- common/js/xml_handler.js | 2 +- modules/admin/admin.admin.controller.php | 2 +- modules/admin/admin.admin.view.php | 2 +- .../adminlogging/adminlogging.controller.php | 2 +- modules/message/message.mobile.php | 9 ++++++++ modules/message/message.view.php | 23 ++++++++----------- .../skins/default/http_status_code.html | 2 +- .../skins/xedition/http_status_code.html | 4 ++-- 10 files changed, 35 insertions(+), 27 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index ded0c827a..92110716d 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -632,7 +632,7 @@ class ModuleHandler extends Handler { self::_setInputErrorToContext(); - $this->error = 'msg_is_not_administrator'; + $this->error = 'admin.msg_is_not_administrator'; $oMessageObject = self::getModuleInstance('message', $display_mode); $oMessageObject->setError(-1); $oMessageObject->setMessage($this->error); @@ -646,7 +646,7 @@ class ModuleHandler extends Handler if(!$grant->manager) { self::_setInputErrorToContext(); - $this->error = 'msg_is_not_administrator'; + $this->error = 'admin.msg_is_not_administrator'; $oMessageObject = self::getModuleInstance('message', $display_mode); $oMessageObject->setError(-1); $oMessageObject->setMessage($this->error); @@ -658,7 +658,7 @@ class ModuleHandler extends Handler if(!$grant->is_admin && $this->module != $this->orig_module->module && $xml_info->permission->{$this->act} != 'manager') { self::_setInputErrorToContext(); - $this->error = 'msg_is_not_administrator'; + $this->error = 'admin.msg_is_not_administrator'; $oMessageObject = self::getModuleInstance('message', $display_mode); $oMessageObject->setError(-1); $oMessageObject->setMessage($this->error); @@ -914,10 +914,13 @@ class ModuleHandler extends Handler $oMessageObject->setMessage($this->error); $oMessageObject->dispMessage(); - if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200') + if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() !== '200') { self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); - $oMessageObject->setTemplateFile('http_status_code'); + if($oMessageObject->getHttpStatusCode() !== '403') + { + $oMessageObject->setTemplateFile('http_status_code'); + } } // If module was called normally, change the templates of the module into ones of the message view module @@ -925,6 +928,7 @@ class ModuleHandler extends Handler { $oModule->setTemplatePath($oMessageObject->getTemplatePath()); $oModule->setTemplateFile($oMessageObject->getTemplateFile()); + $oModule->setHttpStatusCode($oMessageObject->getHttpStatusCode()); // Otherwise, set message instance as the target module } else diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 99ee0b6a7..eba0ebc44 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -191,7 +191,7 @@ class ModuleObject extends Object { case 'root' : case 'manager' : - $this->stop('msg_is_not_administrator'); + $this->stop('admin.msg_is_not_administrator'); return; case 'member' : if(!$is_logged) diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index 9d246a88b..40c9c73ed 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -203,7 +203,7 @@ // If the response contains an error, display the error message. if(data.error != "0" && data.error > -1000) { - if(data.error == -1 && data.message == "msg_is_not_administrator") { + if(data.error == -1 && data.message == "admin.msg_is_not_administrator") { alert("You are not logged in as an administrator."); if ($.isFunction(callback_error)) { callback_error(data); diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 95f0813ee..31380efbe 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -22,7 +22,7 @@ class adminAdminController extends admin $logged_info = $oMemberModel->getLoggedInfo(); if($logged_info->is_admin != 'Y') { - return $this->stop("msg_is_not_administrator"); + return $this->stop("admin.msg_is_not_administrator"); } } diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index d77f7e0e3..4341dab4d 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -40,7 +40,7 @@ class adminAdminView extends admin $logged_info = $oMemberModel->getLoggedInfo(); if($logged_info->is_admin != 'Y') { - return $this->stop("msg_is_not_administrator"); + return $this->stop("admin.msg_is_not_administrator"); } // change into administration layout diff --git a/modules/adminlogging/adminlogging.controller.php b/modules/adminlogging/adminlogging.controller.php index eebde5a00..2b6b330fb 100644 --- a/modules/adminlogging/adminlogging.controller.php +++ b/modules/adminlogging/adminlogging.controller.php @@ -23,7 +23,7 @@ class adminloggingController extends adminlogging $logged_info = $oMemberModel->getLoggedInfo(); if($logged_info->is_admin != 'Y') { - return $this->stop("msg_is_not_administrator"); + return $this->stop("admin.msg_is_not_administrator"); } } diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php index 1b2041541..3b86cdf23 100644 --- a/modules/message/message.mobile.php +++ b/modules/message/message.mobile.php @@ -20,12 +20,15 @@ class messageMobile extends messageView $config = $oModuleModel->getModuleConfig('message'); if(!is_object($config)) $config = new stdClass; if(!$config->mskin) $config->mskin = 'default'; + // Set the template path $template_path = sprintf('%sm.skins/%s', $this->module_path, $config->mskin); + // Get the member configuration $oModuleModel = getModel('module'); $member_config = $oModuleModel->getModuleConfig('member'); Context::set('member_config', $member_config); + // Set a flag to check if the https connection is made when using SSL and create https url $ssl_mode = false; if($member_config->enable_ssl == 'Y') @@ -41,6 +44,12 @@ class messageMobile extends messageView $this->setTemplatePath($template_path); $this->setTemplateFile('system_message'); + + // Default 403 Error + if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() === '200') + { + $this->setHttpStatusCode('403'); + } } } /* End of file message.mobile.php */ diff --git a/modules/message/message.view.php b/modules/message/message.view.php index 6360e4c0e..2f54d3112 100644 --- a/modules/message/message.view.php +++ b/modules/message/message.view.php @@ -31,27 +31,16 @@ class messageView extends message if(!$config->skin) { $config->skin = 'xedition'; - $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin); - } - else - { - //check theme - $config_parse = explode('|@|', $config->skin); - if (count($config_parse) > 1) - { - $template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]); - } - else - { - $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin); - } } + $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin); + // Template path $this->setTemplatePath($template_path); // Get the member configuration $member_config = $oModuleModel->getModuleConfig('member'); Context::set('member_config', $member_config); + // Set a flag to check if the https connection is made when using SSL and create https url $ssl_mode = false; if($member_config->enable_ssl == 'Y') @@ -64,6 +53,12 @@ class messageView extends message Context::set('system_message_detail', nl2br($detail)); $this->setTemplateFile('system_message'); + + // Default 403 Error + if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() === '200') + { + $this->setHttpStatusCode('403'); + } } } /* End of file message.view.php */ diff --git a/modules/message/skins/default/http_status_code.html b/modules/message/skins/default/http_status_code.html index e119e9a86..790081673 100644 --- a/modules/message/skins/default/http_status_code.html +++ b/modules/message/skins/default/http_status_code.html @@ -11,7 +11,7 @@ section{margin-top:20px}
-

404 Not Found

+

{$http_status_code} {$http_status_message}

{$lang->msg_module_is_not_exists}

diff --git a/modules/message/skins/xedition/http_status_code.html b/modules/message/skins/xedition/http_status_code.html index d0c31de59..5666332e7 100644 --- a/modules/message/skins/xedition/http_status_code.html +++ b/modules/message/skins/xedition/http_status_code.html @@ -30,7 +30,7 @@
-

404

-

Oops, Sorry.
Page is not found!

+

{$http_status_code}

+

Oops, Sorry.
Page is {$http_status_message}!

From 649e25ab63fe634d5f7b11c15339f05f685d1649 Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 12:56:28 +0900 Subject: [PATCH 2/9] =?UTF-8?q?HttpStatusCode=EA=B0=80=20=EC=A0=95?= =?UTF-8?q?=EC=88=98=ED=98=95=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=EB=8C=80?= =?UTF-8?q?=EB=B9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 4 ++-- modules/message/message.mobile.php | 2 +- modules/message/message.view.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 92110716d..1d76b7103 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -914,10 +914,10 @@ class ModuleHandler extends Handler $oMessageObject->setMessage($this->error); $oMessageObject->dispMessage(); - if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() !== '200') + if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200') { self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); - if($oMessageObject->getHttpStatusCode() !== '403') + if($oMessageObject->getHttpStatusCode() != '403') { $oMessageObject->setTemplateFile('http_status_code'); } diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php index 3b86cdf23..d08f2b85a 100644 --- a/modules/message/message.mobile.php +++ b/modules/message/message.mobile.php @@ -46,7 +46,7 @@ class messageMobile extends messageView $this->setTemplateFile('system_message'); // Default 403 Error - if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() === '200') + if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() == '200') { $this->setHttpStatusCode('403'); } diff --git a/modules/message/message.view.php b/modules/message/message.view.php index 2f54d3112..b4d3e6c6c 100644 --- a/modules/message/message.view.php +++ b/modules/message/message.view.php @@ -55,7 +55,7 @@ class messageView extends message $this->setTemplateFile('system_message'); // Default 403 Error - if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() === '200') + if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() == '200') { $this->setHttpStatusCode('403'); } From 0cb99583194e87c313b58232181cd7390205e65b Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 16:02:42 +0900 Subject: [PATCH 3/9] =?UTF-8?q?stop()=EC=82=AC=EC=9A=A9=EC=8B=9C=EC=97=90?= =?UTF-8?q?=EB=8F=84=20http=20status=20code=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 14 ++++++-------- classes/module/ModuleObject.class.php | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 1d76b7103..0afb24ab0 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -897,7 +897,6 @@ class ModuleHandler extends Handler $methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1); if(!isset($methodList[Context::getRequestMethod()])) { - if($_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->dispMessage(); - if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200') + // display Error Page + if($oMessageObject->getHttpStatusCode() && !in_array($oMessageObject->getHttpStatusCode(), array('200', '403'))) { - self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); - if($oMessageObject->getHttpStatusCode() != '403') - { - $oMessageObject->setTemplateFile('http_status_code'); - } + $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($oModule) { diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index eba0ebc44..7122bab11 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -236,6 +236,8 @@ class ModuleObject extends Object $this->setTemplatePath($oMessageObject->getTemplatePath()); $this->setTemplateFile($oMessageObject->getTemplateFile()); + $this->setHttpStatusCode($oMessageObject->getHttpStatusCode()); + ModuleHandler::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); return $this; } From 13c6178a57450fc48a25a643061dc50d555ad36e Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 16:25:46 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=EC=97=90=EB=8F=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index b59acb0a1..cfa8c67c5 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -1136,9 +1136,9 @@ class boardView extends board **/ function dispBoardMessage($msg_code) { - $msg = lang($msg_code); - if(!$msg) $msg = $msg_code; - Context::set('message', $msg); + Context::set('message', lang($msg_code)); + + $this->setHttpStatusCode('403'); $this->setTemplateFile('message'); } From de0b09f4e325650f3bc2d598106a8d1216bee61d Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 17:10:15 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=B5=9C=EC=A2=85=EB=8B=A8=EA=B3=84?= =?UTF-8?q?=EC=97=90=EC=84=9C=20Set=20http=20status=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/context/Context.class.php | 1 - classes/module/ModuleHandler.class.php | 9 +++++---- classes/module/ModuleObject.class.php | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index aa63095c9..fdf1632d6 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1524,7 +1524,6 @@ class Context if ($status != 200) { $oMessageObject->setHttpStatusCode($status); - ModuleHandler::_setHttpStatusMessage($status); } if (in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK'))) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 0afb24ab0..d8581b0dc 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -919,8 +919,6 @@ class ModuleHandler extends Handler $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($oModule) { @@ -933,7 +931,7 @@ class ModuleHandler extends Handler { $oModule = $oMessageObject; } - + self::_clearErrorSession(); } @@ -1051,7 +1049,10 @@ class ModuleHandler extends Handler } } } - + + // Set http status message + self::_setHttpStatusMessage($oModule->getHttpStatusCode()); + // Display contents $oDisplayHandler = new DisplayHandler(); $oDisplayHandler->printContent($oModule); diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 7122bab11..08cefd9f9 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -237,8 +237,7 @@ class ModuleObject extends Object $this->setTemplatePath($oMessageObject->getTemplatePath()); $this->setTemplateFile($oMessageObject->getTemplateFile()); $this->setHttpStatusCode($oMessageObject->getHttpStatusCode()); - ModuleHandler::_setHttpStatusMessage($oMessageObject->getHttpStatusCode()); - + return $this; } From 862058d7cebef56bdbacb572b49f00bd3fcc769f Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 17:19:04 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8E=80=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9,=20=EA=B6=8C=ED=95=9C=EC=97=86=EB=8A=94=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=EB=AC=BC=EB=8F=84=20403=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.view.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index cfa8c67c5..2646aedd2 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -1189,7 +1189,9 @@ class boardView extends board function alertMessage($message) { $script = sprintf('', lang($message)); - Context::addHtmlFooter( $script ); + Context::addHtmlFooter($script); + + $this->setHttpStatusCode('403'); } } From 107996918e002dc71992e35940f0f5ba6f81fb77 Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 22:02:28 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EB=B9=84=EB=B0=80=EA=B8=80=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=8F=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index d8581b0dc..7206adc91 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -207,6 +207,17 @@ class ModuleHandler extends Handler { unset($module_info); } + + // if the secret document permission does not have, specify HTTP 403 + if(Context::getRequestMethod() == 'GET') + { + $oDocumentModel = getModel('document'); + $oDocument = $oDocumentModel->getDocument($this->document_srl); + if($oDocument->isSecret() && !$oDocument->isGranted()) + { + $this->httpStatusCode = '403'; + } + } } } @@ -1050,6 +1061,12 @@ class ModuleHandler extends Handler } } + // Set http status code + if($this->httpStatusCode && (!$oModule->getHttpStatusCode() || $oModule->getHttpStatusCode() == '200')) + { + $oModule->setHttpStatusCode($this->httpStatusCode); + } + // Set http status message self::_setHttpStatusMessage($oModule->getHttpStatusCode()); From 29507df48f59a5599822b699945cae80913b25a8 Mon Sep 17 00:00:00 2001 From: conory Date: Tue, 19 Apr 2016 23:14:50 +0900 Subject: [PATCH 8/9] =?UTF-8?q?httpStatusCode=20=EB=A5=BC=20=EC=A0=95?= =?UTF-8?q?=EC=88=98=ED=98=95=EC=9C=BC=EB=A1=9C=20=EB=A7=8C=EB=93=A4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/display/DisplayHandler.class.php | 2 +- classes/module/ModuleHandler.class.php | 4 ++-- classes/object/Object.class.php | 6 +++--- modules/board/board.view.php | 4 ++-- modules/message/message.mobile.php | 4 ++-- modules/message/message.view.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index d98f250ed..bffe15e19 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -83,7 +83,7 @@ class DisplayHandler extends Handler // header output $httpStatusCode = $oModule->getHttpStatusCode(); - if($httpStatusCode && $httpStatusCode != 200 && !in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK'))) + if($httpStatusCode !== 200 && !in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK'))) { self::_printHttpStatusCode($httpStatusCode); } diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 7206adc91..243cd9321 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -925,7 +925,7 @@ class ModuleHandler extends Handler $oMessageObject->dispMessage(); // display Error Page - if($oMessageObject->getHttpStatusCode() && !in_array($oMessageObject->getHttpStatusCode(), array('200', '403'))) + if(!in_array($oMessageObject->getHttpStatusCode(), array(200, 403))) { $oMessageObject->setTemplateFile('http_status_code'); } @@ -1062,7 +1062,7 @@ class ModuleHandler extends Handler } // Set http status code - if($this->httpStatusCode && (!$oModule->getHttpStatusCode() || $oModule->getHttpStatusCode() == '200')) + if($this->httpStatusCode && $oModule->getHttpStatusCode() === 200) { $oModule->setHttpStatusCode($this->httpStatusCode); } diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index 9fbb9c491..2715a579a 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -31,7 +31,7 @@ class Object * http status code. * @var int */ - var $httpStatusCode = NULL; + var $httpStatusCode = 200; /** * Constructor @@ -73,9 +73,9 @@ class Object * @param int $code HTTP status code. Default value is `200` that means successful * @return void */ - function setHttpStatusCode($code = '200') + function setHttpStatusCode($code = 200) { - $this->httpStatusCode = $code; + $this->httpStatusCode = (int) $code; } /** diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 2646aedd2..c6db99834 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -1138,7 +1138,7 @@ class boardView extends board { Context::set('message', lang($msg_code)); - $this->setHttpStatusCode('403'); + $this->setHttpStatusCode(403); $this->setTemplateFile('message'); } @@ -1191,7 +1191,7 @@ class boardView extends board $script = sprintf('', lang($message)); Context::addHtmlFooter($script); - $this->setHttpStatusCode('403'); + $this->setHttpStatusCode(403); } } diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php index d08f2b85a..422c3f3fa 100644 --- a/modules/message/message.mobile.php +++ b/modules/message/message.mobile.php @@ -46,9 +46,9 @@ class messageMobile extends messageView $this->setTemplateFile('system_message'); // Default 403 Error - if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() == '200') + if($this->getHttpStatusCode() === 200) { - $this->setHttpStatusCode('403'); + $this->setHttpStatusCode(403); } } } diff --git a/modules/message/message.view.php b/modules/message/message.view.php index b4d3e6c6c..fd3169eec 100644 --- a/modules/message/message.view.php +++ b/modules/message/message.view.php @@ -55,9 +55,9 @@ class messageView extends message $this->setTemplateFile('system_message'); // Default 403 Error - if(!$this->getHttpStatusCode() || $this->getHttpStatusCode() == '200') + if($this->getHttpStatusCode() === 200) { - $this->setHttpStatusCode('403'); + $this->setHttpStatusCode(403); } } } From 951d992ed4d93d033e03d673a5da434ef39af634 Mon Sep 17 00:00:00 2001 From: conory Date: Wed, 20 Apr 2016 15:41:10 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EA=B8=80=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/module/ModuleHandler.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 243cd9321..4ffe9e363 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -213,9 +213,12 @@ class ModuleHandler extends Handler { $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($this->document_srl); - if($oDocument->isSecret() && !$oDocument->isGranted()) + if($oDocument->isSecret() || $oDocument->get('status') === $oDocumentModel->getConfigStatus('temp')) { - $this->httpStatusCode = '403'; + if(!$oDocument->isGranted() && !$oDocument->isAccessible()) + { + $this->httpStatusCode = '403'; + } } } }