diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index bc25a71f2..e07c03dd8 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -2228,8 +2228,22 @@ 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 = ''; + if(isset(Context::getLang('default_message_verbs')[$type]) && is_string(Context::getLang('default_message_verbs')[$type])) + { + $message_content = sprintf(Context::getLang('default_message_format'), $logged_info->nick_name, Context::getLang('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); @@ -2246,28 +2260,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("%s", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl()); - else $purl = ""; - $content = sprintf("
%s
%s
%s
%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(); @@ -2327,6 +2319,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("%s
", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl()); + else $purl = ""; + $content = sprintf("

%s

%s
%s
%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); diff --git a/modules/document/lang/lang.xml b/modules/document/lang/lang.xml index b03a0c13d..b0d2b3641 100644 --- a/modules/document/lang/lang.xml +++ b/modules/document/lang/lang.xml @@ -874,4 +874,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html index 03a809633..dd32526f1 100644 --- a/modules/document/tpl/checked_list.html +++ b/modules/document/tpl/checked_list.html @@ -40,6 +40,7 @@
+
@@ -54,4 +55,20 @@ - \ No newline at end of file + + \ No newline at end of file