From b4239c1c61b9cb5f8b7a264cd03225382f137648 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Sat, 27 Oct 2018 16:12:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EB=AE=A4=EB=8B=88=EC=BC=80=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EB=AA=A8=EB=93=88=EC=97=90=20=EB=A9=94=EC=9D=BC?=
 =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communication.controller.php              | 26 -------------------
 .../m.skins/default/send_message.html         |  3 ---
 .../m.skins/rx_prn/send_message.html          |  4 +--
 .../skins/default/send_message.html           |  4 ---
 .../skins/simple_world/send_message.html      |  2 --
 5 files changed, 1 insertion(+), 38 deletions(-)

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<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')
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 @@
 			<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>
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 @@
 				<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" />
\ No newline at end of file
+<include target="./common_footer.html" />
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 @@
 				<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">
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 @@
 			<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>