diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 6a72140fd..a1c228db7 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -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

From : %s", $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') diff --git a/modules/communication/m.skins/default/send_message.html b/modules/communication/m.skins/default/send_message.html index fadd0c342..125f3c295 100644 --- a/modules/communication/m.skins/default/send_message.html +++ b/modules/communication/m.skins/default/send_message.html @@ -41,9 +41,6 @@ -
  • - {$lang->cmd_send_mail} -
  • {$lang->cmd_back} diff --git a/modules/communication/m.skins/rx_prn/send_message.html b/modules/communication/m.skins/rx_prn/send_message.html index 0192b0ccc..019bbf969 100644 --- a/modules/communication/m.skins/rx_prn/send_message.html +++ b/modules/communication/m.skins/rx_prn/send_message.html @@ -27,8 +27,6 @@ {$receiver_info->nick_name} - -
    {$lang->msg_send_mail_privacy}
    {$editor|noescape}
    @@ -37,4 +35,4 @@
    - \ No newline at end of file + diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html index cb6e066dc..b64b5d094 100644 --- a/modules/communication/skins/default/send_message.html +++ b/modules/communication/skins/default/send_message.html @@ -30,10 +30,6 @@ {$lang->title} - - {$lang->cmd_option} - {$lang->cmd_send_mail} {$lang->msg_send_mail_privacy} - {$editor|noescape}
    diff --git a/modules/communication/skins/simple_world/send_message.html b/modules/communication/skins/simple_world/send_message.html index 90ba091c3..4c37f5512 100644 --- a/modules/communication/skins/simple_world/send_message.html +++ b/modules/communication/skins/simple_world/send_message.html @@ -16,8 +16,6 @@ {$receiver_info->nick_name} - -
    {$lang->msg_send_mail_privacy}
    {$lang->warning}