From c420844e9fc77ec5595e90f2720fcb26dcf8d3f4 Mon Sep 17 00:00:00 2001 From: qw5414 Date: Wed, 27 Jan 2016 15:03:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A7=B4=EB=B2=84=EB=AA=A8=EB=93=88?= =?UTF-8?q?=EC=9D=98=20=EC=9B=B9=EB=A7=88=EC=8A=A4=ED=84=B0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=EC=9D=B4=20=EC=A7=80=EC=A0=95=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=95=98=EA=B3=A0,=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9D=84=20=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=8A=94=20=EA=B2=8C=EC=8B=9C=ED=8C=90?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EB=A9=94=EC=9D=BC=EC=9D=84=20?= =?UTF-8?q?=EB=B3=B4=EB=82=B8=EC=9D=B4=EB=A1=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.controller.php | 6 ++++++ modules/document/document.controller.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index c6923816c..cb9d6cf04 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -148,6 +148,12 @@ class boardController extends board { $oModuleModel = getModel('module'); $member_config = $oModuleModel->getModuleConfig('member'); + $is_logged = Context::get('is_logged'); + + if(!$is_logged && $member_config->webmaster_email) + { + $obj->email_address = $this->module_info->admin_mail; + } $oMail = new Mail(); $oMail->setTitle($obj->title); diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 2a8c8e55e..9a5bd1b40 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -316,8 +316,8 @@ class documentController extends document if(!$obj->email_address) $obj->email_address = ''; if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR']; - // can modify regdate only manager - $grant = Context::get('grant'); + // can modify regdate only manager + $grant = Context::get('grant'); if(!$grant->manager) { unset($obj->regdate); From d4f17ecbfab3bbfb9736911c29027aec90f2cc60 Mon Sep 17 00:00:00 2001 From: qw5414 Date: Wed, 27 Jan 2016 15:31:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/comment.controller.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 7d62bce1d..314e75330 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -616,6 +616,7 @@ class commentController extends comment $oDocument = $oDocumentModel->getDocument($obj->document_srl); $oMemberModel = getModel("member"); + $is_logged = Context::get('is_logged'); if(isset($obj->member_srl) && !is_null($obj->member_srl)) { $member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl); @@ -639,7 +640,12 @@ class commentController extends comment if($module_info->admin_mail && $member_info->is_admin != 'Y') { $oMail = new Mail(); - $oMail->setSender($obj->email_address, $obj->email_address); + + if($is_logged) + { + $oMail->setSender($obj->email_address, $obj->email_address); + } + $mail_title = "[Rhymix - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\""; $oMail->setTitle($mail_title); $url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl; @@ -712,7 +718,10 @@ class commentController extends comment { continue; } - + if(!$is_logged) + { + $oMail->setSender($email_address, $email_address); + } $oMail->setReceiptor($email_address, $email_address); $oMail->send(); } From 3b6e20f6ade741c131a153759a9b302d46ae79aa Mon Sep 17 00:00:00 2001 From: qw5414 Date: Wed, 27 Jan 2016 20:17:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20if=EB=AC=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index cb9d6cf04..1fe00a2f2 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -150,7 +150,7 @@ class boardController extends board $member_config = $oModuleModel->getModuleConfig('member'); $is_logged = Context::get('is_logged'); - if(!$is_logged && $member_config->webmaster_email) + if(!$is_logged && !$member_config->webmaster_email) { $obj->email_address = $this->module_info->admin_mail; }