From 6189a3aba19fee483d9a9ba22417fd46e7d27c77 Mon Sep 17 00:00:00 2001 From: ngleader Date: Fri, 5 Nov 2010 06:04:58 +0000 Subject: [PATCH] =?UTF-8?q?#19241621=20member=20table=20=EC=97=90=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=ED=95=84=EB=93=9C=20list=5Forder=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= 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@7805 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.admin.model.php | 23 +++++++++++-------- modules/member/member.class.php | 15 ++++++++++++ modules/member/queries/getMemberList.xml | 2 +- .../queries/getMemberListWithinGroup.xml | 2 +- .../queries/updateAllChangePasswordDate.xml | 2 +- .../queries/updateMemberListOrderAll.xml | 8 +++++++ modules/member/schemas/member.xml | 3 ++- 7 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 modules/member/queries/updateMemberListOrderAll.xml diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index cd6465596..30a13a893 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -51,22 +51,22 @@ $args->s_email_address = $search_keyword; break; case 'regdate' : - $args->s_regdate = ereg_replace("[^0-9]","",$search_keyword); + $args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword); break; case 'regdate_more' : - $args->s_regdate_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14); + $args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14); break; case 'regdate_less' : - $args->s_regdate_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14); + $args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14); break; case 'last_login' : $args->s_last_login = $search_keyword; break; case 'last_login_more' : - $args->s_last_login_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14); + $args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14); break; case 'last_login_less' : - $args->s_last_login_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14); + $args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14); break; case 'extra_vars' : $args->s_extra_vars = ereg_replace("[^0-9]","",$search_keyword); @@ -75,8 +75,13 @@ } // selected_group_srl이 있으면 query id를 변경 (table join때문에) + $sort_order = Context::get('sort_order'); $sort_index = Context::get('sort_index'); - if($sort_index != 'last_login') $sort_index = "member_srl"; + if($sort_index != 'last_login') { + $sort_index = "list_order"; + }else{ + $sort_order = 'desc'; + } if($args->selected_group_srl) { $query_id = 'member.getMemberListWithinGroup'; $args->sort_index = "member.".$sort_index; @@ -84,8 +89,7 @@ $query_id = 'member.getMemberList'; $args->sort_index = $sort_index; } - $sort_order = Context::get('sort_order'); - if($sort_order != "asc") $sort_order = "desc"; + if($sort_order != "desc") $sort_order = "asc"; $args->sort_order = $sort_order; Context::set('sort_order', $sort_order); @@ -93,7 +97,8 @@ $args->page = Context::get('page'); $args->list_count = 40; $args->page_count = 10; - return executeQuery($query_id, $args); + $output = executeQuery($query_id, $args); + return $output; } /** diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 25424a148..af95975c4 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -153,6 +153,9 @@ if(!$oDB->isColumnExists("member", "find_account_question")) return true; if(!$oDB->isColumnExists("member", "find_account_answer")) return true; + if(!$oDB->isColumnExists("member", "list_order")) return true; + if(!$oDB->isIndexExists("member","idx_list_order")) return true; + return false; } @@ -206,6 +209,18 @@ $oDB->addColumn("member", "find_account_answer", "varchar", 250); } + if(!$oDB->isColumnExists("member", "list_order")) { + $oDB->addColumn("member", "list_order", "number", 11); + set_time_limit(0); + $args->list_order = 'member_srl'; + executeQuery('member.updateMemberListOrderAll',$args); + executeQuery('member.updateMemberListOrderAll'); + } + + if(!$oDB->isIndexExists("member","idx_list_order")) { + $oDB->addIndex("member","idx_list_order", array("list_order")); + } + return new Object(0, 'success_updated'); } diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml index a532ef84a..63e12c3c2 100644 --- a/modules/member/queries/getMemberList.xml +++ b/modules/member/queries/getMemberList.xml @@ -23,7 +23,7 @@ - + diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml index 0f69d9b63..7d8a4a449 100644 --- a/modules/member/queries/getMemberListWithinGroup.xml +++ b/modules/member/queries/getMemberListWithinGroup.xml @@ -26,7 +26,7 @@ - + diff --git a/modules/member/queries/updateAllChangePasswordDate.xml b/modules/member/queries/updateAllChangePasswordDate.xml index 70ffe3170..0752f1c0a 100644 --- a/modules/member/queries/updateAllChangePasswordDate.xml +++ b/modules/member/queries/updateAllChangePasswordDate.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/modules/member/queries/updateMemberListOrderAll.xml b/modules/member/queries/updateMemberListOrderAll.xml new file mode 100644 index 000000000..22e7e8940 --- /dev/null +++ b/modules/member/queries/updateMemberListOrderAll.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/schemas/member.xml b/modules/member/schemas/member.xml index 379a7851a..c977ddc24 100644 --- a/modules/member/schemas/member.xml +++ b/modules/member/schemas/member.xml @@ -22,4 +22,5 @@ -
\ No newline at end of file + +