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

Merge pull request #171 from SoneYours/pr/fixed-board-mail

Browse source 
#159 관리자 메일 발송이슈.
This commit is contained in:
BJRambo 2016-01-28 07:51:28 +09:00
commit 0e71b9dea8
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/board/board.controller.php
View file

@ -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);

13
modules/comment/comment.controller.php
View file

@ -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();
}

4
modules/document/document.controller.php
View file

@ -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);