mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-14 16:02:14 +09:00
Merge #1672 게시물 관리시 쪽지 보내기 기능 보완 및 기능 메시지 기능을 추가하는 PR ( 개선 ) by misol
* pr/1672: 코드 다듬기 게시물 관리시 쪽지 보내기 기능 보완 및 기능 메시지 기능 추가 Conflicts: modules/document/lang/lang.xml
This commit is contained in:
Kijin Sung
commit
a2bc06a0ef
3 changed files with 120 additions and 25 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -881,4 +881,66 @@
|
|||
<item name="msg_admin_document_no_move_to_trash">
|
||||
<value xml:lang="ko"><![CDATA[최고관리자의 게시물을 휴지통으로 이동시킬 권한이 없습니다.]]></value>
|
||||
</item>
|
||||
<item name="send_default_message">
|
||||
<value xml:lang="ko"><![CDATA[기본 쪽지 내용으로 보내기]]></value>
|
||||
<value xml:lang="en"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="jp"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="ru"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="tr"><![CDATA[Send the default message]]></value>
|
||||
<value xml:lang="vi"><![CDATA[Send the default message]]></value>
|
||||
</item>
|
||||
<item name="default_message_format">
|
||||
<value xml:lang="ko"><![CDATA[%1$s님께서 다음 게시물을 %2$s 합니다.]]></value>
|
||||
<value xml:lang="en"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="jp"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="ru"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="tr"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
<value xml:lang="vi"><![CDATA[%1$s %2$s the document below.]]></value>
|
||||
</item>
|
||||
<item name="default_message_verbs" type="array">
|
||||
<item name="move">
|
||||
<value xml:lang="ko"><![CDATA[이동]]></value>
|
||||
<value xml:lang="en"><![CDATA[moves]]></value>
|
||||
<value xml:lang="jp"><![CDATA[moves]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[moves]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[moves]]></value>
|
||||
<value xml:lang="ru"><![CDATA[moves]]></value>
|
||||
<value xml:lang="tr"><![CDATA[moves]]></value>
|
||||
<value xml:lang="vi"><![CDATA[moves]]></value>
|
||||
</item>
|
||||
<item name="copy">
|
||||
<value xml:lang="ko"><![CDATA[복사]]></value>
|
||||
<value xml:lang="en"><![CDATA[copies]]></value>
|
||||
<value xml:lang="jp"><![CDATA[copies]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[copies]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[copies]]></value>
|
||||
<value xml:lang="ru"><![CDATA[copies]]></value>
|
||||
<value xml:lang="tr"><![CDATA[copies]]></value>
|
||||
<value xml:lang="vi"><![CDATA[copies]]></value>
|
||||
</item>
|
||||
<item name="delete">
|
||||
<value xml:lang="ko"><![CDATA[삭제]]></value>
|
||||
<value xml:lang="en"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="jp"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="ru"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="tr"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="vi"><![CDATA[deletes]]></value>
|
||||
</item>
|
||||
<item name="trash">
|
||||
<value xml:lang="ko"><![CDATA[삭제]]></value>
|
||||
<value xml:lang="en"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="jp"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="ru"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="tr"><![CDATA[deletes]]></value>
|
||||
<value xml:lang="vi"><![CDATA[deletes]]></value>
|
||||
</item>
|
||||
</item>
|
||||
</lang>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
<label class="x_control-label" for="message_content">{$lang->cmd_send_message}</label>
|
||||
<div class="x_controls" style="margin-right:14px">
|
||||
<textarea name="message_content" id="message_content" rows="4" cols="42" style="width:100%"></textarea>
|
||||
<label for="send_default_message" class="x_inline"><input type="checkbox" name="send_default_message" id="send_default_message" value="Y" checked="checked" /> {$lang->send_default_message}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -54,4 +55,20 @@
|
|||
</span>
|
||||
</div>
|
||||
<!--@end-->
|
||||
</form>
|
||||
</form>
|
||||
<script>
|
||||
jQuery(function($){
|
||||
var message_content_area = $('#message_content');
|
||||
if($('#send_default_message').is(':checked'))
|
||||
{
|
||||
message_content_area.prop("disabled", true);
|
||||
}
|
||||
$('#send_default_message').change(function(){
|
||||
if($(this).is(':checked')){
|
||||
message_content_area.prop("disabled", true);
|
||||
} else {
|
||||
message_content_area.prop("disabled", false);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue