쪽지, 친구에 대한 활성화 설정 추가

modules/communication/communication.admin.controller.php

@@ -24,7 +24,7 @@ class communicationAdminController extends communication
 	function procCommunicationAdminInsertConfig()
 	{
 		// get the default information
-		$args = Context::gets('skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_write_default','grant_write_group', 'member_menu');
+		$args = Context::gets('enable_message', 'enable_friend', 'skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_write_default','grant_write_group');
 		$args->editor_colorset = $args->sel_editor_colorset;
 		unset($args->sel_editor_colorset);
 

modules/communication/communication.admin.view.php

@@ -30,7 +30,7 @@ class communicationAdminView extends communication
 		$oCommunicationModel = getModel('communication');
 
 		// get the configurations of communication module
-		Context::set('communication_config', $oCommunicationModel->getConfig());
+		Context::set('config', $oCommunicationModel->getConfig());
 
 		// get a list of layout
 		Context::set('layout_list', $oLayoutModel->getLayoutList());
@@ -39,10 +39,10 @@ class communicationAdminView extends communication
 		Context::set('editor_skin_list', $oEditorModel->getEditorSkinList());
 
 		// get a list of communication skins
-		Context::set('communication_skin_list', $oModuleModel->getSkins($this->module_path));
+		Context::set('skin_list', $oModuleModel->getSkins($this->module_path));
 
 		// get a list of communication skins
-		Context::set('communication_mobile_skin_list', $oModuleModel->getSkins($this->module_path, 'm.skins'));
+		Context::set('mobile_skin_list', $oModuleModel->getSkins($this->module_path, 'm.skins'));
 
 		// Get a layout list
 		$layout_list = $oLayoutModel->getLayoutList();
@@ -52,11 +52,11 @@ class communicationAdminView extends communication
 		Context::set('mlayout_list', $mlayout_list);
 
 		$security = new Security();
-		$security->encodeHTML('communication_config..');
+		$security->encodeHTML('config..');
 		$security->encodeHTML('layout_list..');
 		$security->encodeHTML('editor_skin_list..');
-		$security->encodeHTML('communication_skin_list..title');
+		$security->encodeHTML('skin_list..title');
-		$security->encodeHTML('communication_mobile_skin_list..title');
+		$security->encodeHTML('mobile_skin_list..title');
 
 		$oMemberModel = getModel('member');
 		$group_list = $oMemberModel->getGroups($this->site_srl);

modules/communication/communication.controller.php

@@ -89,7 +89,7 @@ class communicationController extends communication
 		$oCommunicationModel = getModel('communication');
 		$config = $oCommunicationModel->getConfig();
 
-		if(!$oCommunicationModel->checkGrant($config->grant_write))
+		if(!$oCommunicationModel->checkWriteGrant($config->grant_write))
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -784,31 +784,40 @@ class communicationController extends communication
 			return new Object();
 		}
 
+		$logged_info = Context::get('logged_info');
 		$oCommunicationModel = getModel('communication');
 		$config = $oCommunicationModel->getConfig();
-
+		
-		if($config->member_menu != 'Y')
+		if($config->enable_message == 'N' && $config->enable_friend == 'N')
 		{
 			return new Object();
 		}
-
-		$logged_info = Context::get('logged_info');
 		
 		// Add menus on the member login information
 		$oMemberController = getController('member');
-		$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
+		if($config->enable_message == 'Y')
-		$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
-
-		$flag_file = './files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
-		if(file_exists($flag_file))
 		{
-			// Pop-up to display messages if a flag on new message is set
+			$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
-			$new_message_count = (int) trim(FileHandler::readFile($flag_file));
+		}
-			$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
+		
-			Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
+		if($config->enable_friend == 'Y')
-			Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
+		{
-			
+			$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
-			FileHandler::removeFile($flag_file);
+		}
+		
+		if($config->enable_message == 'Y')
+		{
+			$flag_file = './files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
+			if(file_exists($flag_file))
+			{
+				// Pop-up to display messages if a flag on new message is set
+				$new_message_count = (int) trim(FileHandler::readFile($flag_file));
+				$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
+				Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
+				Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
+				
+				FileHandler::removeFile($flag_file);
+			}
 		}
 	}
 	
@@ -821,12 +830,12 @@ class communicationController extends communication
 		
 		$oCommunicationModel = getModel('communication');
 		$config = $oCommunicationModel->getConfig();
-
+		
-		if($config->member_menu != 'Y')
+		if($config->enable_message == 'N' && $config->enable_friend == 'N')
 		{
 			return new Object();
 		}
-
+		
 		$mid = Context::get('cur_mid');
 		$member_srl = Context::get('target_srl');
 		$logged_info = Context::get('logged_info');
@@ -836,11 +845,16 @@ class communicationController extends communication
 		if($logged_info->member_srl == $member_srl)
 		{
 			// Add your own viewing Note Template
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
+			if($config->enable_message == 'Y')
+			{
+				$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
+			}
 			
 			// Display a list of friends
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
+			if($config->enable_friend == 'Y')
-			
+			{
+				$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
+			}
 		}
 		// If not, Add menus to send message and to add friends
 		else
@@ -854,13 +868,13 @@ class communicationController extends communication
 			}
 
 			// Add a menu for sending message
-			if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
+			if($config->enable_message == 'Y' && ($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))))
 			{
 				$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
 			}
 			
 			// Add a menu for listing friends (if a friend is new)
-			if(!$oCommunicationModel->isAddedFriend($member_srl))
+			if($config->enable_friend == 'Y' && !$oCommunicationModel->isAddedFriend($member_srl))
 			{
 				$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
 			}

modules/communication/communication.model.php

@@ -25,44 +25,44 @@ class communicationModel extends communication
 	function getConfig()
 	{
 		$oModuleModel = getModel('module');
-		$communication_config = $oModuleModel->getModuleConfig('communication');
+		$config = $oModuleModel->getModuleConfig('communication');
 
-		if(!is_object($communication_config))
+		if(!$config->skin)
 		{
-			$communication_config = new stdClass();
+			$config->skin = 'default';
 		}
 
-		if(!$communication_config->skin)
+		if(!$config->colorset)
 		{
-			$communication_config->skin = 'default';
+			$config->colorset = 'white';
 		}
 
-		if(!$communication_config->colorset)
+		if(!$config->editor_skin)
 		{
-			$communication_config->colorset = 'white';
+			$config->editor_skin = 'ckeditor';
 		}
 
-		if(!$communication_config->editor_skin)
+		if(!$config->mskin)
 		{
-			$communication_config->editor_skin = 'ckeditor';
+			$config->mskin = 'default';
 		}
 
-		if(!$communication_config->mskin)
+		if(!$config->grant_write)
 		{
-			$communication_config->mskin = 'default';
+			$config->grant_write = array('default_grant' => 'member');
 		}
 
-		if(!$communication_config->grant_write)
+		if(!$config->enable_message)
 		{
-			$communication_config->grant_write = array('default_grant' => 'member');
+			$config->enable_message = 'Y';
+		}
+		
+		if(!$config->enable_friend)
+		{
+			$config->enable_friend = 'Y';
 		}
 
-		if(!$communication_config->member_menu)
+		return $config;
-		{
-			$communication_config->member_menu = 'Y';
-		}
-
-		return $communication_config;
 	}
 
 	/**
@@ -74,7 +74,7 @@ class communicationModel extends communication
 	function getGrantArray($default, $group)
 	{
 		$grant = array();
-		if($default!="")
+		if($default)
 		{
 			switch($default)
 			{
@@ -91,65 +91,51 @@ class communicationModel extends communication
 		} 
 		else if(is_array($group)) 
 		{
-			$oMemberModel = getModel('member');
-			$group_list = $oMemberModel->getGroups($this->site_srl);
-
 			$group_grant = array();
 			foreach($group as $group_srl)
 			{
-				$group_grant[$group_srl] = $group_list[$group_srl]->title;
+				$group_grant[$group_srl] = true;
 			}
-			$grant = array('group_grant'=>$group_grant);
+			
+			$grant = array('group_grant' => $group_grant);
 		} 
+		
 		return $grant;
 	}
 
 	/**
-	  * @brief check member's grant
+	  * @brief Check Write Grant
-	  * @param object $member_info
 	  * @param array $arrGrant
 	  * @return boolean
 	  */
-	function checkGrant($arrGrant)
+	function checkWriteGrant($arrGrant)
 	{
-		if(!$arrGrant)
+		if(!$arrGrant) return false;
-			return false;
-
-		if(!Context::get('is_logged'))
-			return false;
 		
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == "Y")
+		if($logged_info->is_admin == "Y") return true;
-			return true;
 
 		if($arrGrant['default_grant'])
 		{
-			if($arrGrant['default_grant'] == "member" && $logged_info)
+			if($arrGrant['default_grant'] == "member" && Context::get('is_logged')) return true;
-				return true;
+			
-
+			if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl) return true;
-			if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl)
+			
-				return true;
+			if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y") return true;
-
-			if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y")
-				return true;
 		}
 
 		if($arrGrant['group_grant'])
 		{
 			$group_grant = $arrGrant['group_grant'];
-			if(!is_array($group_grant))
+			if(!is_array($group_grant)) return false;
-				return false;
 
-			foreach($logged_info->group_list as $group_srl=>$title)
+			foreach($logged_info->group_list as $group_srl => $title)
 			{
-				if(isset($group_grant[$group_srl])&&$group_grant[$group_srl]==$title)
+				if($group_grant[$group_srl]) return true;
-					return true;
 			}
-
 		}
 
 		return false;
-
 	}
 
 	/**

modules/communication/lang/en.php

@@ -32,6 +32,8 @@ $lang->msg_disallow_message = 'Failed to send a message because the recipient bl
 $lang->about_allow_message = 'You can set whether to receive messages or not.';
 $lang->message_notice = 'Send a message to the author about this. If you don\'t write a message, it is not sent.';
 $lang->friends_page_does_not_support = 'Friends in a mobile environment is not supported. Please go to the PC page.';
-$lang->cmd_write_communication = 'Write Grant';
+$lang->communication_send_message_grant = 'Send Message Grant';
 $lang->cmd_manage_base = 'Basic infomation';
 $lang->alert_new_message_arrived = 'You have %d new message(s). Do you want to check it now?';
+$lang->enable_communication_friend = 'Friend Enable';
+$lang->enable_communication_message = 'Message Enable';

modules/communication/lang/ko.php

@@ -32,6 +32,8 @@ $lang->msg_disallow_message = '쪽지 수신을 거부한 사용자라서 쪽지
 $lang->about_allow_message = '쪽지 수신 여부를 결정할 수 있습니다.';
 $lang->message_notice = '저작자에게 쪽지를 발송해서 이 사실을 알립니다. 작성하지 않으면 발송하지 않습니다.';
 $lang->friends_page_does_not_support = '모바일 환경에서는 친구 보기 페이지를 지원하지 않습니다. PC 화면으로 이동하세요.';
-$lang->cmd_write_communication = '작성 권한';
+$lang->communication_send_message_grant = '쪽지 발송 권한';
 $lang->cmd_manage_base = '기본 정보';
 $lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?';
+$lang->enable_communication_friend = '친구기능 사용';
+$lang->enable_communication_message = '쪽지기능 사용';

modules/communication/tpl/index.html

@@ -20,18 +20,37 @@
 	<input type="hidden" name="act" value="procCommunicationAdminInsertConfig">
 	<input type="hidden" name="xe_validator_id" value="modules/communication/tpl/index/1" />
 
+	<div class="x_control-group">
+		<div class="x_control-label">{$lang->enable_communication_message}</div>
+		<div class="x_controls">
+			<label class="x_inline" for="enable_message_yes">
+				<input type="radio" name="enable_message" id="enable_message_yes" value="Y" checked="checked"|cond="$config->enable_message == 'Y'" /> {$lang->cmd_yes}
+			</label>
+			<label class="x_inline" for="enable_message_no">
+				<input type="radio" name="enable_message" id="enable_message_no" value="N" checked="checked"|cond="$config->enable_message == 'N'" /> {$lang->cmd_no}
+			</label>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<div class="x_control-label">{$lang->enable_communication_friend}</div>
+		<div class="x_controls">
+			<label class="x_inline" for="enable_friend_yes">
+				<input type="radio" name="enable_friend" id="enable_friend_yes" value="Y" checked="checked"|cond="$config->enable_friend == 'Y'" /> {$lang->cmd_yes}
+			</label>
+			<label class="x_inline" for="enable_friend_no">
+				<input type="radio" name="enable_friend" id="enable_friend_no" value="N" checked="checked"|cond="$config->enable_friend == 'N'" /> {$lang->cmd_no}
+			</label>
+		</div>
+	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="editor_skin">{$lang->editor_skin}</label>
 		<div class="x_controls">
 			<select name="editor_skin" id="editor_skin" onchange="getEditorSkinColorList(this.value)">
-				<option loop="$editor_skin_list => $editor_skin" value="{$editor_skin}" selected="selected"|cond="$editor_skin==$communication_config->editor_skin">{$editor_skin}</option>
+				<option loop="$editor_skin_list => $editor_skin" value="{$editor_skin}" selected="selected"|cond="$editor_skin==$config->editor_skin">{$editor_skin}</option>
-			</select>
-			<select name="sel_editor_colorset" style="display:none">
 			</select>
+			<select name="sel_editor_colorset" style="display:none"></select>
 			<script>
-			//<![CDATA[
+				getEditorSkinColorList('{$config->editor_skin}','{$config->editor_colorset}');
-				getEditorSkinColorList('{$communication_config->editor_skin}','{$communication_config->editor_colorset}');
-			//]]>
 			</script>
 		</div>
 	</div>
@@ -40,7 +59,7 @@
 		<div class="x_controls">
 			<select id="layout" name="layout_srl" style="width:auto">
 				<option value="0">{$lang->notuse}</option>
-				<option loop="$layout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->layout_srl">{$val->title} ({$val->layout})</option>
+				<option loop="$layout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $config->layout_srl">{$val->title} ({$val->layout})</option>
 			</select>
 		</div>
 	</div>
@@ -48,7 +67,7 @@
 		<label class="x_control-label" for="skin">{$lang->skin}</label>
 		<div class="x_controls">
 			<select name="skin" id="skin" style="width:auto" onchange="doGetSkinColorset(this.options[this.selectedIndex].value, 'P')">
-				<option loop="$communication_skin_list => $key, $val" value="{$key}" selected="selected"|cond="$key==$communication_config->skin">{$val->title}</option>
+				<option loop="$skin_list => $key, $val" value="{$key}" selected="selected"|cond="$key==$config->skin">{$val->title}</option>
 			</select>
 		</div>
 	</div>
@@ -63,7 +82,7 @@
 		<div class="x_controls">
 			<select id="mlayout_srl" name="mlayout_srl" style="width:auto">
 				<option value="0">{$lang->notuse}</option>
-				<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->mlayout_srl">{$val->title} ({$val->layout})</option>
+				<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $config->mlayout_srl">{$val->title} ({$val->layout})</option>
 			</select>
 		</div>
 	</div>
@@ -71,7 +90,7 @@
 		<label class="x_control-label" for="mskin">{$lang->mobile_skin}</label>
 		<div class="x_controls">
 			<select name="mskin" id="mskin" style="width:auto" onchange="doGetSkinColorset(this.options[this.selectedIndex].value, 'M')">
-				<option loop="$communication_mobile_skin_list => $key,$val" value="{$key}" selected="selected"|cond="$key==$communication_config->mskin" >{$val->title}</option>
+				<option loop="$mobile_skin_list => $key,$val" value="{$key}" selected="selected"|cond="$key==$config->mskin" >{$val->title}</option>
 			</select>
 		</div>
 	</div>
@@ -81,39 +100,32 @@
 			<div id="communication_mcolorset"></div>
 		</div>
 	</div>
-
 	<div class="x_control-group">
-		<label class="x_control-label" for="mlayout_srl">{$lang->cmd_write_communication}</label>
+		<label class="x_control-label" for="mlayout_srl">{$lang->communication_send_message_grant}</label>
 		<div class="x_controls">
 			<select name="grant_write_default" class="grant_default">
-				<option value="-1" selected="selected"|cond="$communication_config->grant_write['default_grant']=='member'">{$lang->grant_to_login_user}</option>
+				<option value="-1" selected="selected"|cond="$config->grant_write['default_grant']=='member'">{$lang->grant_to_login_user}</option>
-				<option value="-2" selected="selected"|cond="$communication_config->grant_write['default_grant']=='site'">{$lang->grant_to_site_user}</option>
+				<option value="-2" selected="selected"|cond="$config->grant_write['default_grant']=='site'">{$lang->grant_to_site_user}</option>
-				<option value="-3" selected="selected"|cond="$communication_config->grant_write['default_grant']=='manager'">{$lang->grant_to_admin}</option>
+				<option value="-3" selected="selected"|cond="$config->grant_write['default_grant']=='manager'">{$lang->grant_to_admin}</option>
-				<option value="" selected="selected"|cond="$communication_config->grant_write['default_grant']==''">{$lang->grant_to_group}</option>
+				<option value="" selected="selected"|cond="$config->grant_write['default_grant']==''">{$lang->grant_to_group}</option>
 			</select>
 			<div id="zone_grant_write" hidden style="margin:8px 0 0 0">
-				<label loop="$group_list => $group_srl, $group_item" for="grant_write_group_{$group_srl}">
+				<label loop="$group_list => $group_srl, $group_item" for="group_{$group_srl}">
-					<input type="checkbox" class="checkbox" name="grant_write_group[]" value="{$group_item->group_srl}" id="grant_write_group_{$group_item->group_srl}" checked="checked"|cond="isset($communication_config->grant_write['group_grant'][$group_srl])&&$communication_config->grant_write['group_grant'][$group_srl]==$group_item->title"/>
+					<input type="checkbox" class="checkbox" name="grant_write_group[]" value="{$group_item->group_srl}" id="group_{$group_item->group_srl}" checked="checked"|cond="isset($config->grant_write['group_grant'][$group_srl])"/>
 					{$group_item->title}
 				</label>
 			</div>
 		</div>
 	</div>
-	<div class="x_control-group">
-		<label class="x_control-label">communication option</label>
-		<div class="x_controls">
-			<label class="x_inline" for="member_menu"><input type="checkbox" name="member_menu" id="member_menu" value="Y" checked="checked"|cond="$communication_config->member_menu == 'Y'" /> {$lang->about_mobile_view}</label>
-		</div>
-	</div>
 	<div class="btnArea">
 		<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
 	</div>
 </form>
 <script>
     jQuery(function() { 
-		doGetSkinColorset("{$communication_config->skin}", 'P'); 
+		doGetSkinColorset("{$config->skin}", 'P'); 
-		doGetSkinColorset("{$communication_config->mskin}", 'M'); 
+		doGetSkinColorset("{$config->mskin}", 'M'); 
 		jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); 
-		doShowGrantZone()
+		doShowGrantZone();
 	});
 </script>