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

커뮤니케이션 모듈에 메일전송 기능을 삭제

Browse source
This commit is contained in:
BJRambo 2018-10-27 16:12:45 +09:00
parent 6d239378a0
commit b4239c1c61
5 changed files with 1 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/communication/communication.controller.php
View file

@ -78,12 +78,6 @@ class communicationController extends communication
throw new Rhymix\Framework\Exception('msg_content_is_null');
}
$send_mail = Context::get('send_mail');
if($send_mail != 'Y')
{
$send_mail = 'N';
}
// Check if there is a member to receive a message
$oMemberModel = getModel('member');
$oCommunicationModel = getModel('communication');
@ -124,26 +118,6 @@ class communicationController extends communication
return $output;
}
// send an e-mail
if($send_mail == 'Y')
{
$view_url = Context::getRequestUri();
$content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>", $content, $view_url, $view_url);
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject($title);
$oMail->setBody(utf8_mbencode(removeHackTag($content)));
$oMail->setFrom($logged_info->email_address ?: config('mail.default_from'), $logged_info->nick_name);
$oMail->setReplyTo($logged_info->email_address);
$oMail->addTo($receiver_member_info->email_address, $receiver_member_info->nick_name);
$sendOutput = $oMail->send();
if($sendOutput === false)
{
$oMail->setFrom(config('mail.default_from') ?: $logged_info->email_address, $logged_info->nick_name);
$oMail->send();
}
}
if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
{
if(Context::get('is_popup') != 'Y')

3
modules/communication/m.skins/default/send_message.html
View file

@ -41,9 +41,6 @@
<label for="message_content">{$lang->content}</label>
<textarea id="message_content" name="new_content" rows="8" style="width:100%"></textarea>
</li>
<li>
<span id="message_send_mail"><input type="checkbox" value="Y" name="send_mail" /> {$lang->cmd_send_mail}</span>
</li>
</ul>
<div class="bna">
<span class="fl"><a href="{getUrl('act', 'dispCommunicationMessages')}" class="bn white">{$lang->cmd_back}</a></span>

4
modules/communication/m.skins/rx_prn/send_message.html
View file

@ -27,8 +27,6 @@
<a id="message_receiver" href="#popup_menu_area" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<label for="message_title">{$lang->title}</label>
<input type="text" name="title" id="message_title" value="{$source_message->title}" />
<label for="message_send_mail"><input type="checkbox" value="Y" name="send_mail" id="message_send_mail" /> {$lang->cmd_send_mail}</label>
<div class="rx_prn-notice info">{$lang->msg_send_mail_privacy}</div>
</div>
{$editor|noescape}
<div class="control-group">
@ -37,4 +35,4 @@
</form>
</section>
</div>
<include target="./common_footer.html" />
<include target="./common_footer.html" />

4
modules/communication/skins/default/send_message.html
View file

@ -30,10 +30,6 @@
<th scope="row">{$lang->title}</th>
<td><input type="text" name="title" id="message_title" value="{$source_message->title}" style="width:90%" /></td>
</tr>
<tr>
<th scope="row">{$lang->cmd_option}</th>
<td><input type="checkbox" value="Y" name="send_mail" /> {$lang->cmd_send_mail} <span class="explanation">{$lang->msg_send_mail_privacy}</span></td>
</tr>
</table>
{$editor|noescape}
<div class="btnArea">

2
modules/communication/skins/simple_world/send_message.html
View file

@ -16,8 +16,6 @@
<a id="message_receiver" href="#popup_menu_area" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<label for="message_title">{$lang->title}</label>
<input type="text" name="title" id="message_title" value="{$source_message->title}" />
<label for="message_send_mail"><input type="checkbox" value="Y" name="send_mail" id="message_send_mail" /> {$lang->cmd_send_mail}</label>
<div class="rx_member-notice info">{$lang->msg_send_mail_privacy}</div>
<div class="rx_member-notice info" cond="$logged_info->allow_message !== 'Y'">
{$lang->warning}
<br>