From c4b2bd4a86c726a663364bde122b7c55f56ecf9a Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 23 Feb 2007 08:30:19 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@178 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/conf/module.xml | 17 +++++ modules/member/member.controller.php | 16 +---- modules/member/member.model.php | 14 ++++ modules/member/member.view.php | 17 ++--- modules/member/tpl.admin/delete_form.html | 2 +- modules/member/tpl.admin/denied_id_list.html | 14 ++-- modules/member/tpl.admin/filter/delete.xml | 21 +++--- modules/member/tpl.admin/filter/insert.xml | 26 ++++--- .../tpl.admin/filter/insert_denied_id.xml | 20 +++--- .../member/tpl.admin/filter/insert_group.xml | 20 +++--- .../tpl.admin/filter/insert_join_form.xml | 24 +++---- .../tpl.admin/filter/update_denied_id.xml | 19 +++--- .../member/tpl.admin/filter/update_group.xml | 20 +++--- modules/member/tpl.admin/group_list.html | 3 + .../member/tpl.admin/group_update_form.html | 2 +- modules/member/tpl.admin/header.html | 6 +- modules/member/tpl.admin/insert_member.html | 4 +- modules/member/tpl.admin/js/admin.js | 67 ++++++++++--------- modules/member/tpl.admin/member_info.html | 2 +- modules/member/tpl.admin/member_list.html | 14 ++-- 20 files changed, 165 insertions(+), 163 deletions(-) diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index 7363be2eb..18400cf31 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 4cb9a9ec7..6e69b6f1e 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -95,9 +95,7 @@ if(!$output->toBool()) return $output; - $this->add('sid','member'); $this->add('member_srl',$output->get('member_srl')); - $this->add('act','dispInfo'); $this->add('page',Context::get('page')); $this->setMessage($msg_code); } @@ -112,7 +110,6 @@ $output = $this->deleteMember($member_srl); if(!$output->toBool()) return $output; - $this->add('sid','member'); $this->add('page',Context::get('page')); $this->setMessage("success_deleted"); } @@ -125,8 +122,6 @@ $output = $this->insertGroup($args); if(!$output->toBool()) return $output; - $this->add('sid','member'); - $this->add('act','dispGroup'); $this->add('group_srl',''); $this->add('page',Context::get('page')); $this->setMessage('success_registed'); @@ -153,8 +148,6 @@ break; } - $this->add('sid','member'); - $this->add('act','dispGroup'); $this->add('group_srl',''); $this->add('page',Context::get('page')); $this->setMessage($msg_code); @@ -172,7 +165,6 @@ $output = $oDB->executeQuery('member.insertJoinForm', $args); if(!$output->toBool()) return $output; - $this->add('sid','member'); $this->add('act','dispJoinForm'); $this->setMessage('success_registed'); } @@ -184,12 +176,10 @@ $user_id = Context::get('user_id'); $description = Context::get('description'); - $oMemberModel = &getModel('member'); - $output = $oMemberModel->insertDeniedID($user_id, $description); + $oMemberController = &getController('member'); + $output = $oMemberController->insertDeniedID($user_id, $description); if(!$output->toBool()) return $output; - $this->add('sid','member'); - $this->add('act','dispDeniedID'); $this->add('group_srl',''); $this->add('page',Context::get('page')); $this->setMessage('success_registed'); @@ -212,8 +202,6 @@ break; } - $this->add('sid','member'); - $this->add('act','dispDeniedID'); $this->add('page',Context::get('page')); $this->setMessage($msg_code); } diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 743777213..ffdb81b80 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -120,6 +120,20 @@ return $logged_info->user_id; } + /** + * @brief 회원 목록을 구함 + **/ + function getMemberList() { + // 등록된 member 모듈을 불러와 세팅 + $oDB = &DB::getInstance(); + + $args->sort_index = "member_srl"; + $args->page = Context::get('page'); + $args->list_count = 40; + $args->page_count = 10; + return $oDB->executeQuery('member.getMemberList', $args); + } + /** * @brief member_srl이 속한 group 목록을 가져옴 **/ diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 3e94101e4..da3066a35 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -14,6 +14,7 @@ * @brief 초기화 **/ function init() { + // 멤버모델 객체 생성 $oMemberModel = &getModel('member'); @@ -22,13 +23,16 @@ if($member_srl) { $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); if(!$member_info) Context::set('member_srl',''); - else Context::set('member_info',$this->member_info); + else Context::set('member_info',$member_info); } // group 목록 가져오기 $this->group_list = $oMemberModel->getGroups(); Context::set('group_list', $this->group_list); + // template path 지정 + $this->setTemplatePath($this->module_path.'tpl.admin'); + return true; } @@ -36,13 +40,10 @@ * @brief 회원 목록 출력 **/ function dispMemberList() { - // 등록된 member 모듈을 불러와 세팅 - $oDB = &DB::getInstance(); - $args->sort_index = "member_srl"; - $args->page = Context::get('page'); - $args->list_count = 40; - $args->page_count = 10; - $output = $oDB->executeQuery('member.getMemberList', $args); + + // member model 객체 생성후 목록을 구해옴 + $oMemberModel = &getModel('member'); + $output = $oMemberModel->getMemberList(); // 템플릿에 쓰기 위해서 context::set Context::set('total_count', $output->total_count); diff --git a/modules/member/tpl.admin/delete_form.html b/modules/member/tpl.admin/delete_form.html index b3b1326e6..e506ca1db 100644 --- a/modules/member/tpl.admin/delete_form.html +++ b/modules/member/tpl.admin/delete_form.html @@ -22,7 +22,7 @@ - + diff --git a/modules/member/tpl.admin/denied_id_list.html b/modules/member/tpl.admin/denied_id_list.html index 075fb9252..537f496a8 100644 --- a/modules/member/tpl.admin/denied_id_list.html +++ b/modules/member/tpl.admin/denied_id_list.html @@ -1,6 +1,6 @@ - +
@@ -40,11 +40,11 @@ [{$lang->first_page}] - - {$page_no} - - [{$page_no}] - + + {$page_no} + + [{$page_no}] + [{$lang->last_page}] @@ -52,8 +52,6 @@
- -
diff --git a/modules/member/tpl.admin/filter/delete.xml b/modules/member/tpl.admin/filter/delete.xml index 512dadb63..72350ffc1 100644 --- a/modules/member/tpl.admin/filter/delete.xml +++ b/modules/member/tpl.admin/filter/delete.xml @@ -1,16 +1,11 @@ - - - - - - - - - - - - - + + + + + + + + diff --git a/modules/member/tpl.admin/filter/insert.xml b/modules/member/tpl.admin/filter/insert.xml index afcca3f9a..e27ae9aa5 100644 --- a/modules/member/tpl.admin/filter/insert.xml +++ b/modules/member/tpl.admin/filter/insert.xml @@ -1,16 +1,14 @@ - - - - - - - - - - - - - - + +
+ + + + + + + + + +
diff --git a/modules/member/tpl.admin/filter/insert_denied_id.xml b/modules/member/tpl.admin/filter/insert_denied_id.xml index 113179346..62d462f0c 100644 --- a/modules/member/tpl.admin/filter/insert_denied_id.xml +++ b/modules/member/tpl.admin/filter/insert_denied_id.xml @@ -1,14 +1,10 @@ - - - - - - - - - - - - + +
+ + + + + +
diff --git a/modules/member/tpl.admin/filter/insert_group.xml b/modules/member/tpl.admin/filter/insert_group.xml index 92c3e41e2..556e02aff 100644 --- a/modules/member/tpl.admin/filter/insert_group.xml +++ b/modules/member/tpl.admin/filter/insert_group.xml @@ -1,14 +1,10 @@ - - - - - - - - - - - - + +
+ + + + + +
diff --git a/modules/member/tpl.admin/filter/insert_join_form.xml b/modules/member/tpl.admin/filter/insert_join_form.xml index be4ed7858..644bc3431 100644 --- a/modules/member/tpl.admin/filter/insert_join_form.xml +++ b/modules/member/tpl.admin/filter/insert_join_form.xml @@ -1,16 +1,12 @@ - - - - - - - - - - - - - - + +
+ + + + + + + +
diff --git a/modules/member/tpl.admin/filter/update_denied_id.xml b/modules/member/tpl.admin/filter/update_denied_id.xml index c5c17a3b7..90865990b 100644 --- a/modules/member/tpl.admin/filter/update_denied_id.xml +++ b/modules/member/tpl.admin/filter/update_denied_id.xml @@ -1,14 +1,11 @@ - - - - - - + +
+ + + - - - - - + + +
diff --git a/modules/member/tpl.admin/filter/update_group.xml b/modules/member/tpl.admin/filter/update_group.xml index 81495886e..4678f7f57 100644 --- a/modules/member/tpl.admin/filter/update_group.xml +++ b/modules/member/tpl.admin/filter/update_group.xml @@ -1,14 +1,10 @@ - - - - - - - - - - - - + +
+ + + + + +
diff --git a/modules/member/tpl.admin/group_list.html b/modules/member/tpl.admin/group_list.html index bee1c3987..f8bb6bf3d 100644 --- a/modules/member/tpl.admin/group_list.html +++ b/modules/member/tpl.admin/group_list.html @@ -45,6 +45,9 @@
+ +
+
diff --git a/modules/member/tpl.admin/group_update_form.html b/modules/member/tpl.admin/group_update_form.html index 534a09e65..192d9c1b4 100644 --- a/modules/member/tpl.admin/group_update_form.html +++ b/modules/member/tpl.admin/group_update_form.html @@ -19,7 +19,7 @@ {$lang->is_default} :
{$lang->description} :
- +
diff --git a/modules/member/tpl.admin/header.html b/modules/member/tpl.admin/header.html index 898b49abe..1b093a93d 100644 --- a/modules/member/tpl.admin/header.html +++ b/modules/member/tpl.admin/header.html @@ -1,9 +1,9 @@
- [{$lang->cmd_list}] - style="font-weight:bold">[{$lang->cmd_member_group}] + [{$lang->cmd_list}] + style="font-weight:bold">[{$lang->cmd_member_group}] style="font-weight:bold">[{$lang->cmd_manage_form}] style="font-weight:bold">[{$lang->cmd_send_mail}] - style="font-weight:bold">[{$lang->cmd_manage_id}] + style="font-weight:bold">[{$lang->cmd_manage_id}]
diff --git a/modules/member/tpl.admin/insert_member.html b/modules/member/tpl.admin/insert_member.html index 6569d46f0..bac8d3568 100644 --- a/modules/member/tpl.admin/insert_member.html +++ b/modules/member/tpl.admin/insert_member.html @@ -9,7 +9,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/modules/member/tpl.admin/js/admin.js b/modules/member/tpl.admin/js/admin.js index 60877ab05..70559f50c 100644 --- a/modules/member/tpl.admin/js/admin.js +++ b/modules/member/tpl.admin/js/admin.js @@ -1,48 +1,43 @@ -/* 메세지 출력후 현페이지 리로드 */ -function procReload(ret_obj, response_tags) { - var error = ret_obj['error']; - var message = ret_obj['message']; - if(message) alert(message); - - location.href = location.href; -} - /* 사용자 추가 */ -function procInsert(ret_obj, response_tags) { +function completeInsert(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; var member_srl = ret_obj['member_srl']; - var act = ret_obj['act']; var page = ret_obj['page']; + alert(message); - url = "./admin.php?sid="+sid+"&member_srl="+member_srl+"&page="+page+"&act="+act; + var url = "./?module=admin&mo=member&act=dispMemberInfo&member_srl="+member_srl; + if(page) url += "&page="+page; + location.href = url; } /* 사용자 삭제 */ -function procDelete(ret_obj, response_tags) { +function completeDelete(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; var page = ret_obj['page']; + alert(message); - url = "./admin.php?sid="+sid+"&page="+page; + var url = "./?module=admin&mo=member&act=dispMemberList"; + if(page) url += "&page="+page; + location.href = url; } /* 그룹 추가 */ -function procInsertGroup(ret_obj, response_tags) { +function completeInsertGroup(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; - var act = ret_obj['act']; var page = ret_obj['page']; + alert(message); - url = "./admin.php?sid="+sid+"&page="+page+"&act="+act; + var url = "./?module=admin&mo=member&act=dispGroupList"; + if(page) url += "&page="+page; + location.href = url; } @@ -53,20 +48,29 @@ function doUpdateGroup(group_srl, mode, message) { var fo_obj = xGetElementById('fo_group_info'); fo_obj.group_srl.value = group_srl; fo_obj.mode.value = mode; - procFormFilter(fo_obj, update_group, procReload); + procFilter(fo_obj, update_group); +} + +function completeUpdateGroup(ret_obj) { + var page = ret_obj['page']; + var url = "./?module=admin&mo=member&act=dispGroupList"; + if(page) url += "&page="+page; + + location.href = url; } /* 금지아이디 추가 */ -function procInsertDeniedID(ret_obj, response_tags) { +function completeInsertDeniedID(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; - var act = ret_obj['act']; var page = ret_obj['page']; + alert(message); - url = "./admin.php?sid="+sid+"&page="+page+"&act="+act; + var url = "./?module=admin&mo=member&act=dispDeniedIDList"; + if(page) url += "&page="+page; + location.href = url; } @@ -77,16 +81,19 @@ function doUpdateDeniedID(user_id, mode, message) { var fo_obj = xGetElementById('fo_denied_id_info'); fo_obj.user_id.value = user_id; fo_obj.mode.value = mode; - procFormFilter(fo_obj, update_denied_id, procReload); + procFilter(fo_obj, update_denied_id); } /* 가입폼 관련 */ -function procInsertJoinForm(ret_obj, response_tags) { +function completeInsertJoinForm(ret_obj) { var error = ret_obj['error']; var message = ret_obj['message']; - var sid = ret_obj['sid']; - var act = ret_obj['act']; + var page = ret_obj['page']; + alert(message); - url = "./admin.php?sid="+sid+"&act="+act; + + var url = "./?module=admin&mo=member&act=dispJoinForm"; + if(page) url += "&page="+page; + location.href = url; } diff --git a/modules/member/tpl.admin/member_info.html b/modules/member/tpl.admin/member_info.html index cfce3aceb..5d19ebcbe 100644 --- a/modules/member/tpl.admin/member_info.html +++ b/modules/member/tpl.admin/member_info.html @@ -43,7 +43,7 @@ - + diff --git a/modules/member/tpl.admin/member_list.html b/modules/member/tpl.admin/member_list.html index c78feff66..50b50a2e7 100644 --- a/modules/member/tpl.admin/member_list.html +++ b/modules/member/tpl.admin/member_list.html @@ -24,7 +24,7 @@ {$val->member_srl} - {$val->user_id} + {$val->user_id} {$val->user_name} {$val->nick_name} {$val->allow_mailing} @@ -39,7 +39,7 @@
- [{$lang->cmd_make}] + [{$lang->cmd_make}]
@@ -47,11 +47,11 @@ [{$lang->first_page}] - - {$page_no} - - [{$page_no}] - + + {$page_no} + + [{$page_no}] + [{$lang->last_page}]