#464 쪽지 수신 여부를 쪽지함에서 보이도록 하고 커뮤니케이션 애드온 비활성화시 개인의 쪽지함/친구함이 보이지 않도록 처리

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4160 201d5d3c-b55e-5fd7-737f-ddc643e51545

addons/member_extra_info/member_extra_info.addon.php

@@ -39,6 +39,12 @@
         // 로그인된 사용자 정보를 구함
         $logged_info = Context::get('logged_info');
 
+        // 회원 로그인 정보중에서 쪽지등의 메뉴를 추가
+        $logged_info->menu_list['dispMemberFriend'] = 'cmd_view_friend';
+        $logged_info->menu_list['dispMemberMessages'] = 'cmd_view_message_box';
+        Context::set('logged_info', $logged_info);
+        $_SESSION['logged_info'] = $logged_info;
+
         $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
         $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl);
 

modules/member/conf/module.xml

@@ -54,6 +54,7 @@
         <action name="procMemberDeleteImageName" type="controller" standalone="true" />
         <action name="procMemberDeleteImageMark" type="controller" standalone="true" />
 
+        <action name="procMemberUpdateAllowMessage" type="controller" standalone="true" />
         <action name="procMemberSendMessage" type="controller" standalone="true" />
         <action name="procMemberStoreMessage" type="controller" standalone="true" />
         <action name="procMemberDeleteMessage" type="controller" standalone="true" />

modules/member/member.controller.php

@@ -152,6 +152,23 @@
             return $output;
         }
 
+        /**
+         * @brief 쪽지함 설정 변경
+         **/
+        function procMemberUpdateAllowMessage() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+
+            $args->allow_message = Context::get('allow_message');
+            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+
+            $output = executeQuery('member.updateAllowMessage', $args);
+
+            return $output;
+        }
+
         /**
          * @brief 쪽지 발송
          **/
@@ -696,7 +713,7 @@
             if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
 
             // 필수 정보들을 미리 추출
-            $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message');
+            $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing');
             $args->member_srl = getNextSequence();
 
             // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
@@ -740,7 +757,7 @@
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
 
             // 필수 정보들을 미리 추출
-            $args = Context::gets('user_name','nick_name','homepage','blog','birthday','email_address','allow_mailing','allow_message');
+            $args = Context::gets('user_name','nick_name','homepage','blog','birthday','email_address','allow_mailing');
 
             // 로그인 정보
             $logged_info = Context::get('logged_info');
@@ -1346,8 +1363,6 @@
 
             // 사용자의 전용 메뉴 구성 (이 메뉴는 애드온등으로 변경될 수 있음)
             $member_info->menu_list['dispMemberInfo'] = 'cmd_view_member_info';
-            $member_info->menu_list['dispMemberFriend'] = 'cmd_view_friend';
-            $member_info->menu_list['dispMemberMessages'] = 'cmd_view_message_box';
             $member_info->menu_list['dispMemberScrappedDocument'] = 'cmd_view_scrapped_document';
             $member_info->menu_list['dispMemberSavedDocument'] = 'cmd_view_saved_document';
             $member_info->menu_list['dispMemberOwnDocument'] = 'cmd_view_own_document';
@@ -1407,7 +1422,7 @@
             // 필수 변수들의 조절
             if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
             if($args->denied!='Y') $args->denied = 'N';
-            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message= 'Y';
+            $args->allow_message= 'Y';
 
             if($logged_info->is_admin == 'Y') {
                 if($args->is_admin!='Y') $args->is_admin = 'N';
@@ -1543,7 +1558,7 @@
 
             // 필수 변수들의 조절
             if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+            if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
 
             if($logged_info->is_admin == 'Y') {
                 if($args->denied!='Y') $args->denied = 'N';

modules/member/queries/updateAllowMessage.xml

@@ -0,0 +1,11 @@
+<query id="updateAllowMessage" action="update">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="allow_message" var="allow_message" default="Y" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+    </conditions>
+</query>

modules/member/queries/updateMember.xml

@@ -13,7 +13,7 @@
         <column name="blog" var="blog" />
         <column name="birthday" var="birthday" />
         <column name="allow_mailing" var="allow_mailing" default="Y" />
-        <column name="allow_message" var="allow_message" default="Y" />
+        <column name="allow_message" var="allow_message" />
         <column name="denied" var="denied" />
         <column name="limit_date" var="limit_date" />
         <column name="is_admin" var="is_admin" />

modules/member/skins/default/css/common.css

@@ -87,6 +87,7 @@
 .readMessage .messageHeader address .date { font:.8em Tahoma; color:#999999; margin-left:10px;}
 .readMessage .messageBody { border:1px solid #e0e1db; margin:0 1.5em 1.5em 1.5em; padding:1em; color:#666666;}
 .readMessage .deleteOrKeep { padding:.5em 0; overflow:hidden; background:#f5f5f3; border-top:1px solid #eaebe7; _width:100%;}
+.messageSetup { float:left; overflow:hidden; }
 .instantMessage { float:right; overflow:hidden;}
 .instantMessage li { float:left; padding:0 .8em 0 .8em; margin-left:-1px; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left center; list-style:none; }
 .instantMessage li a { text-decoration:none; display:block; float:left; height:1em; height:1.1em; overflow:hidden; font-size:1em; white-space:nowrap; color:#666666; padding-left:1.8em; background:url(../images/common/iconInstantMessage.gif) no-repeat left top;}

modules/member/skins/default/filter/modify_info.xml

@@ -12,7 +12,6 @@
         <param name="blog" target="blog" />
         <param name="birthday" target="birthday" />
         <param name="allow_mailing" target="allow_mailing" />
-        <param name="allow_message" target="allow_message" />
         <param name="email_address" target="email_address" />
         <param name="signature" target="signature" />
     </parameter>

modules/member/skins/default/filter/update_allow_message.xml

@@ -0,0 +1,5 @@
+<filter name="update_allow_message" module="member" act="procMemberUpdateAllowMessage">
+    <form />
+    <parameter />
+    <response />
+</filter>

modules/member/skins/default/member_messages.html

@@ -5,6 +5,7 @@
 <!--@end-->
 <!--#include("./common_header.html")-->
 <!--%import("filter/delete_checked_message.xml")-->
+<!--%import("filter/update_allow_message.xml")-->
 
     <!--@if($message)-->
     <div class="readMessage">
@@ -37,6 +38,16 @@
     <!--@end-->
 
 	<div class="boardInformation">
+        <div class="messageSetup">
+            <form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)">
+                <select name="allow_message">
+                    <!--@foreach($lang->allow_message_type as $key => $val)-->
+                    <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
+                    <!--@end-->
+                </select>
+                <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
+            </form>
+        </div>
         <ul class="instantMessage">
             <!--@foreach($lang->message_box as $key => $val)-->
                 <!--@if($key == $message_type)-->

modules/member/skins/default/modify_info.html

@@ -135,17 +135,6 @@
         <th scope="row">{$lang->allow_mailing}</th>
         <td><input type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p>{$lang->about_allow_mailing}</p></td>
     </tr>
-    <tr>
-        <th scope="row">{$lang->allow_message}</th>
-        <td>
-            <select name="allow_message">
-                <!--@foreach($lang->allow_message_type as $key => $val)-->
-                <option value="{$key}" <!--@if($member_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_allow_message}</p>
-        </td>
-    </tr>
     <tr>
         <th scope="row">{$lang->signature}</th>
         <td>{$editor}</td>