From 081ef155ffcf216666e6ef746bc707ecf02f4572 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 19 Nov 2008 07:49:53 +0000
Subject: [PATCH] =?UTF-8?q?r17463267=20=ED=99=88=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EA=B7=B8=EB=A3=B9=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4900 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/homepage/homepage.admin.controller.php |  3 +++
 modules/homepage/tpl/delete.html               |  3 ++-
 modules/member/member.model.php                | 17 ++++++-----------
 modules/member/member.view.php                 |  3 ++-
 modules/member/queries/deleteSiteGroup.xml     |  8 ++++++++
 5 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 modules/member/queries/deleteSiteGroup.xml

diff --git a/modules/homepage/homepage.admin.controller.php b/modules/homepage/homepage.admin.controller.php
index 1d34f5108..9d504da98 100644
--- a/modules/homepage/homepage.admin.controller.php
+++ b/modules/homepage/homepage.admin.controller.php
@@ -255,6 +255,9 @@
             // 회원 그룹 매핑 데이터 삭제
             executeQuery('member.deleteMemberGroup', $args);
 
+            // 회원 그룹 삭제
+            executeQuery('member.deleteSiteGroup', $args);
+
             // 메뉴 삭제
             $oMenuAdminController = &getAdminController('menu');
             Context::set('menu_srl', $homepage_info->first_menu_srl);
diff --git a/modules/homepage/tpl/delete.html b/modules/homepage/tpl/delete.html
index df3891cfe..57b95bdb2 100644
--- a/modules/homepage/tpl/delete.html
+++ b/modules/homepage/tpl/delete.html
@@ -10,7 +10,7 @@
     <table cellspacing="0" class="adminTable">
     <thead>
         <tr>
-            <th colspan="2">{$lang->cmd_homepage_delete}</th>
+            <th colspan="2"><div>{$lang->cmd_homepage_delete}</div></th>
         </tr>
     </thead>
     <tbody>
@@ -28,6 +28,7 @@
                 <!--@foreach($admin_list as $key => $val)-->
                     {$val->nick_name} ({$val->user_id})<br />
                 <!--@end-->
+                &nbsp;
             </td>
         </tr>
         <tr>
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 2cc3fe2df..75e5a63c5 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -122,19 +122,14 @@
                 // site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정
                 $site_module_info = Context::get('site_module_info');
                 if($site_module_info) {
-                    unset($logged_info->group_list);
-                    $site_srl = $site_module_info->site_srl;
-                    $groups = $this->getMemberGroups($logged_info->member_srl, $site_srl);
-
-                    // 만약 현재 접속된 사이트의 그룹이 없으면 기본 그룹을 지정
-                    if(!count($groups)) {
+                    $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
+                    if(!count($logged_info->group_list)) {
                         $default_group = $this->getDefaultGroup($site_module_info->site_srl);
                         $oMemberController = &getController('member');
-                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_srl);
+                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
                         $groups[$default_group->group_srl] = $default_group->title;
+                        $logged_info->group_list = $groups;
                     }
-                   
-                    $logged_info->group_list = $groups;
 
                     $oModuleModel = &getModel('module');
                     if($oModuleModel->isSiteAdmin()) $logged_info->is_site_admin = true;
@@ -168,14 +163,14 @@
         /**
          * @brief member_srl로 사용자 정보 return
          **/
-        function getMemberInfoByMemberSrl($member_srl) {
+        function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) {
             if(!$member_srl) return;
             $args->member_srl = $member_srl;
             $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
             if(!$output) return $output;
 
             $member_info = $this->arrangeMemberInfo($output->data);
-            $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+            $member_info->group_list = $this->getMemberGroups($member_info->member_srl, $site_srl);
             return $member_info;
         }
 
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index acb890d87..838f9bd4b 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -47,7 +47,8 @@
                 return $this->dispMemberSignUpForm();
             }
 
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+            $site_module_info = Context::get('site_module_info');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl);
             unset($member_info->password);
             unset($member_info->email_id);
             unset($member_info->email_host);
diff --git a/modules/member/queries/deleteSiteGroup.xml b/modules/member/queries/deleteSiteGroup.xml
new file mode 100644
index 000000000..816900a19
--- /dev/null
+++ b/modules/member/queries/deleteSiteGroup.xml
@@ -0,0 +1,8 @@
+<query id="deleteSiteGroup" action="delete">
+    <tables>
+        <table name="member_group" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+    </conditions>
+</query>