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

Merge #1672 게시물 관리시 쪽지 보내기 기능 보완 및 기능 메시지 기능을 추가하는 PR ( 개선 ) by misol

Browse source 
* pr/1672:
  코드 다듬기
  게시물 관리시 쪽지 보내기 기능 보완 및 기능 메시지 기능 추가

Conflicts:
	modules/document/lang/lang.xml
This commit is contained in:
Kijin Sung 2015-10-08 15:08:28 +09:00
commit a2bc06a0ef
3 changed files with 120 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2270,8 +2270,23 @@ class documentController extends document
$module_srl = Context::get('module_srl');
if($target_module && !$module_srl) $module_srl = $target_module;
$category_srl = Context::get('target_category');
$message_content = Context::get('message_content');
if($message_content) $message_content = nl2br($message_content);
// send default message - misol 2015-07-23
$send_default_message = Context::get('send_default_message');
if($send_default_message === 'Y')
{
$logged_info = Context::get('logged_info');
$message_content = '';
$default_message_verbs = Context::getLang('default_message_verbs');
if(isset($default_message_verbs[$type]) && is_string($default_message_verbs[$type]))
{
$message_content = sprintf(Context::getLang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
}
}
else
{
$message_content = Context::get('message_content');
if($message_content) $message_content = nl2br($message_content);
}
$cart = Context::get('cart');
if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
@ -2288,28 +2303,6 @@ class documentController extends document
if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
}
// Send a message
if($message_content)
{
$oCommunicationController = getController('communication');
$logged_info = Context::get('logged_info');
$title = cut_str($message_content,10,'...');
$sender_member_srl = $logged_info->member_srl;
foreach($document_items as $oDocument)
{
if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
else $purl = "";
$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
}
}
// Set a spam-filer not to be filtered to spams
$oSpamController = getController('spamfilter');
$oSpamController->setAvoidLog();
@ -2369,6 +2362,29 @@ class documentController extends document
$msg_code = 'success_declare_canceled';
}
// Send a message
if($message_content)
{
$oCommunicationController = getController('communication');
$logged_info = Context::get('logged_info');
$title = cut_str($message_content,10,'...');
$sender_member_srl = $logged_info->member_srl;
foreach($document_items as $oDocument)
{
if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\" style=\"padding:10px 0;\">%s</a><hr />", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
else $purl = "";
$content = sprintf("<div style=\"padding:10px 0;\"><p>%s</p></div><hr />%s<div style=\"padding:10px 0;font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
}
}
$_SESSION['document_management'] = array();
$this->setMessage($msg_code);