From 2e41e44c5af8ce82ec79f3cb26defe81414e0d1e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 29 Mar 2007 08:27:08 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@776
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 common/js/common.js             | 50 ++++++++++++++++++---------------
 modules/member/member.model.php | 19 +++++++------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/common/js/common.js b/common/js/common.js
index c64ebecc5..d2281d1d0 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -392,37 +392,43 @@ function displayMemberMenu(ret_obj, response_tags, params) {
     var member_srl = params["member_srl"];
 
     var html = "";
-    if(loaded_member_menu_list[member_srl]) html = loaded_member_menu_list[member_srl];
-    else {
+
+    if(loaded_member_menu_list[member_srl]) {
+        html = loaded_member_menu_list[member_srl];
+    } else {
         var infos = info_list.split("\n");
-        for(var i=0;i<infos.length;i++) {
-            var info_str = infos[i];
-            var pos = info_str.indexOf(",");
-            var str = info_str.substr(0,pos).trim();
+        if(infos.length) {
+            for(var i=0;i<infos.length;i++) {
+                var info_str = infos[i];
+                var pos = info_str.indexOf(",");
+                var str = info_str.substr(0,pos).trim();
 
-            info_str = info_str.substr(pos+1, info_str.length);
-            pos = info_str.indexOf(",");
+                info_str = info_str.substr(pos+1, info_str.length);
+                pos = info_str.indexOf(",");
 
-            var target = info_str.substr(0,pos).trim();
+                var target = info_str.substr(0,pos).trim();
 
-            var url = info_str.substr(pos+1, info_str.length).trim();
-            var className = "item";
+                var url = info_str.substr(pos+1, info_str.length).trim();
+                var className = "item";
 
-            if(i==infos.length-1) className = "last_item";
+                if(i==infos.length-1) className = "last_item";
 
-            if(target=="self") html += "<div class=\""+className+"\"><a href=\""+url+"\">"+str+"</a></div>";
-            else html += "<div class=\""+className+"\"><a href=\""+url+"\" target=\"_blank\">"+str+"</a></div>";
-        }
+                if(!str || !url) continue;
+                if(target=="self") html += "<div class=\""+className+"\"><a href=\""+url+"\">"+str+"</a></div>";
+                else html += "<div class=\""+className+"\"><a href=\""+url+"\" target=\"_blank\">"+str+"</a></div>";
+            }
+        } 
         loaded_member_menu_list[member_srl] = html;
     }
-    xInnerHtml(area, html);
 
-    // 메뉴 이동
-    xLeft(area, params["page_x"]);
-    xTop(area, params["page_y"]);
-    if(xWidth(area)+xLeft(area)>xClientWidth()+xScrollLeft()) xLeft(area, xClientWidth()-xWidth(area)+xScrollLeft());
-    if(xHeight(area)+xTop(area)>xClientHeight()+xScrollTop()) xTop(area, xClientHeight()-xHeight(area)+xScrollTop());
-    area.style.visibility = "visible";
+    if(html) {
+        xInnerHtml(area, html);
+        xLeft(area, params["page_x"]);
+        xTop(area, params["page_y"]);
+        if(xWidth(area)+xLeft(area)>xClientWidth()+xScrollLeft()) xLeft(area, xClientWidth()-xWidth(area)+xScrollLeft());
+        if(xHeight(area)+xTop(area)>xClientHeight()+xScrollTop()) xTop(area, xClientHeight()-xHeight(area)+xScrollTop());
+        area.style.visibility = "visible";
+    }
 }
 
 // className = "member_*" 의 object의 cursor를 pointer로 본경
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 2dce87c4d..46c36270c 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -465,23 +465,23 @@
             $module = Context::get('cur_module');
             $logged_info = Context::get('logged_info');
 
-            $info_list = array();
-
             // 자신의 아이디를 클릭한 경우 
             if($member_srl == $logged_info->member_srl) {
-                $user_id = $logged_info->user_id;
-                $user_name = $logged_info->user_name;
-                $email_address = $logged_info->email_address;
+                $member_info = $logged_info;
 
             // 다른 사람의 아이디를 클릭한 경우
             } else {
                 // 회원의 정보를 구함
                 $member_info = $this->getMemberInfoByMemberSrl($member_srl);
-                $user_id = $member_info->user_id;
-                $user_name = $member_info->user_name;
-                $email_address = $member_info->email_address;
             }
 
+            // 변수 정리
+            $user_id = $member_info->user_id;
+            $user_name = $member_info->user_name;
+            $email_address = $member_info->email_address;
+
+            // info_list 에 "표시할글,target,url" 을 배열로 넣는다
+            $info_list = array();
 
             // 게시판이나 블로그등일 경우는 특별 옵션 지정
             if($mid) {
@@ -492,9 +492,12 @@
                 $info_list[] = sprintf('%s, self, %s', Context::getLang('cmd_view_own_document'), sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $user_id));
             }
 
+            // 다른 사람의 아이디를 클릭한 경우 (메일, 쪽지 보내기등은 다른 사람에게만 보내는거로 설정)
             if($member_srl != $logged_info->member_srl) {
+
                 // 메일 보내기 
                 $info_list[] = sprintf('%s, self, %s', Context::getLang('cmd_send_email'), sprintf('mailto:%s <%s>', $user_name, $email_address));
+
             }
 
             // 정보를 저장