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

2026-01-14 00:39:57 +09:00 · 2007-04-12 03:24:17 +00:00 · 2007-04-12 03:24:17 +00:00 · ea50fbbaa6
commit ea50fbbaa6
parent 4f1d02cda0
43 changed files with 235 additions and 101 deletions
--- a/modules/addon/queries/deleteAddon.xml
+++ b/modules/addon/queries/deleteAddon.xml
@ -1,8 +1,8 @@
 <query id="deleteAddon" action="delete">
-  <tables>
-    <table name="addons" />
-  </tables>
-  <conditions>
-    <condition operation="equal" column="addon" var="addon" notnull="notnull" />
-  </conditions>
+    <tables>
+      <table name="addons" />
+    </tables>
+    <conditions>
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" />
+    </conditions>
 </query>
--- a/modules/addon/queries/getAddonIsActivated.xml
+++ b/modules/addon/queries/getAddonIsActivated.xml
@ -1,11 +1,11 @@
 <query id="getAddonIsActivated" action="select">
-  <tables>
-    <table name="addons" />
-  </tables>
-  <columns>
-    <column name="count(*)" alias="count" />
-  </columns>
-  <conditions>
-    <condition operation="equal" column="addon" var="addon" notnull="notnull" />
-  </conditions>
+    <tables>
+      <table name="addons" />
+    </tables>
+    <columns>
+      <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" />
+    </conditions>
 </query>
--- a/modules/addon/queries/getAddons.xml
+++ b/modules/addon/queries/getAddons.xml
@ -1,8 +1,8 @@
 <query id="getAddons" action="select">
-  <tables>
-    <table name="addons" />
-  </tables>
-  <navigation>
-    <index var="list_order" default="addon" order="asc" />
-  </navigation>
+    <tables>
+      <table name="addons" />
+    </tables>
+    <navigation>
+      <index var="list_order" default="addon" order="asc" />
+    </navigation>
 </query>
--- a/modules/addon/queries/insertAddon.xml
+++ b/modules/addon/queries/insertAddon.xml
@ -1,9 +1,9 @@
 <query id="insertAddon" action="insert">
-  <tables>
-    <table name="addons" />
-  </tables>
-  <columns>
-    <column name="addon" var="addon" notnull="notnull" />
-    <column name="regdate" var="regdate" default="curdate()" />
-  </columns>
+    <tables>
+      <table name="addons" />
+    </tables>
+    <columns>
+      <column name="addon" var="addon" notnull="notnull" />
+      <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
 </query>
--- a/modules/board/queries/getBoardList.xml
+++ b/modules/board/queries/getBoardList.xml
@ -16,7 +16,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="module_srl" order="desc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/comment/queries/getCommentList.xml
+++ b/modules/comment/queries/getCommentList.xml
@ -9,6 +9,6 @@
        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
    </conditions>
    <navigation>
-        <index var="list_order" order="asc" />
+        <index var="list_order" default="list_order" order="asc" />
    </navigation>
 </query>
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@ -16,7 +16,7 @@
        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="list_order" order="asc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/comment/queries/getTotalCommentListWithinMember.xml
+++ b/modules/comment/queries/getTotalCommentListWithinMember.xml
@ -21,7 +21,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="comments.list_order" order="asc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/comment/queries/insertComment.xml
+++ b/modules/comment/queries/insertComment.xml
@ -7,7 +7,7 @@
        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
        <column name="parent_srl" var="parent_srl" filter="number" default="0" />
        <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
-        <column name="content" var="content" notnull="notnull" minlength="2" maxlength="250" />
+        <column name="content" var="content" notnull="notnull" />
        <column name="password" var="password" minlength="2" maxlength="60" />
        <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
        <column name="user_name" var="user_name" default="" />
--- a/modules/comment/queries/updateComment.xml
+++ b/modules/comment/queries/updateComment.xml
@ -5,7 +5,7 @@
    <columns>
        <column name="module_srl" var="module_srl" filter="number" default="0" />
        <column name="parent_srl" var="parent_srl" filter="number" default="0" />
-        <column name="content" var="content" notnull="notnull" minlength="2" maxlength="250" />
+        <column name="content" var="content" notnull="notnull" />
        <column name="password" var="password" minlength="2" maxlength="60" />
        <column name="user_name" var="user_name" default="" />
        <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
--- a/modules/document/queries/getCategoryList.xml
+++ b/modules/document/queries/getCategoryList.xml
@ -6,6 +6,6 @@
        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="list_order" order="asc" />
    </navigation>
 </query>
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@ -30,7 +30,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="list_order" order="asc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/document/queries/getDocumentListWithinMember.xml
+++ b/modules/document/queries/getDocumentListWithinMember.xml
@ -31,7 +31,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="documents.list_order" order="asc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/document/queries/updateCommentCount.xml
+++ b/modules/document/queries/updateCommentCount.xml
@ -3,7 +3,7 @@
        <table name="documents" />
    </tables>
    <columns>
-        <column name="comment_count" var="comment_count" />
+        <column name="comment_count" var="comment_count" notnull="notnull" />
    </columns>
    <conditions>
        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@ -16,7 +16,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="file_srl" order="desc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/file/queries/getFiles.xml
+++ b/modules/file/queries/getFiles.xml
@ -6,6 +6,6 @@
        <condition operation="equal" column="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" defualt="file_srl" order="asc" />
    </navigation>
 </query>
--- a/modules/file/schemas/files.xml
+++ b/modules/file/schemas/files.xml
@ -10,7 +10,7 @@
    <column name="uploaded_filename" type="varchar" size="250" />
    <column name="file_size" type="number" size="11" default="0" notnull="notnull" index="idx_file_size" />
    <column name="comment" type="varchar" size="250" />
-    <column name="isvalid" type="char" size="1" default="N" index="idx_upload_target_srl" />
+    <column name="isvalid" type="char" size="1" default="N" index="idx_is_valid" />
    <column name="regdate" type="date" index="idx_regdate" />
    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
 </table>
--- a/modules/layout/queries/getLayoutMenuList.xml
+++ b/modules/layout/queries/getLayoutMenuList.xml
@ -7,7 +7,7 @@
    </columns>
    <conditions>
        <condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="menu_id" var="menu_id" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="menu_id" var="menu_id" notnull="notnull" pipe="and" />
    </conditions>
    <navigation>
        <index var="sort_index" default="listorder" order="desc" />
--- a/modules/layout/queries/updateLayoutMenuParent.xml
+++ b/modules/layout/queries/updateLayoutMenuParent.xml
@ -3,7 +3,7 @@
        <table name="layout_menu" />
    </tables>
    <columns>
-        <column name="parent_srl" var="parent_srl" />
+        <column name="parent_srl" var="parent_srl" default="0" />
        <column name="listorder" var="listorder" notnull="notnull" />
    </columns>
    <conditions>
--- a/modules/member/queries/deleteDeniedID.xml
+++ b/modules/member/queries/deleteDeniedID.xml
@ -3,6 +3,6 @@
        <table name="member_denied_user_id" />
    </tables>
    <conditions>
-        <condition operation="equal" column="user_id" var="user_id" notnull="notnull" filter="number" />
+        <condition operation="equal" column="user_id" var="user_id" notnull="notnull" />
    </conditions>
 </query>
--- a/modules/member/queries/getFriends.xml
+++ b/modules/member/queries/getFriends.xml
@ -12,7 +12,7 @@
        <condition operation="equal" column="member.member_srl" var="friend.target_srl" pipe="and" />
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="friend.list_order" order="asc" />
        <list_count var="list_count" default="10" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/queries/getMemberList.xml
+++ b/modules/member/queries/getMemberList.xml
@ -18,7 +18,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="member_srl" order="desc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/queries/getMemberListWithinGroup.xml
+++ b/modules/member/queries/getMemberListWithinGroup.xml
@ -21,7 +21,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="member.list_order" order="desc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/queries/getReceivedMessages.xml
+++ b/modules/member/queries/getReceivedMessages.xml
@ -12,7 +12,7 @@
        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and"/>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="message.list_order" order="asc" />
        <list_count var="list_count" default="10" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/queries/getSendedMessages.xml
+++ b/modules/member/queries/getSendedMessages.xml
@ -12,7 +12,7 @@
        <condition operation="equal" column="message.receiver_srl" var="member.member_srl" pipe="and"/>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="message.list_order" order="asc" />
        <list_count var="list_count" default="10" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/queries/getStoredMessages.xml
+++ b/modules/member/queries/getStoredMessages.xml
@ -12,7 +12,7 @@
        <condition operation="equal" column="message.sender_srl" var="member.member_srl" pipe="and"/>
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="message.list_order" order="asc" />
        <list_count var="list_count" default="10" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@ -6,6 +6,7 @@
    <!--%import("filter/delete_image_mark.xml")-->
 <!--@end-->
 <!--%import("js/member.js")-->
+<!--%import("../../tpl/js/krzip_search.js")-->
 <div>
    {$lang->msg_update_member}
 </div>
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@ -1,5 +1,6 @@
 <!--%import("filter/signup.xml")-->
 <!--%import("js/member.js")-->
+<!--%import("../../tpl/js/krzip_search.js")-->

 <div>
    {$lang->msg_new_member}
--- a/modules/member/tpl/header.html
+++ b/modules/member/tpl/header.html
@ -1,4 +1,5 @@
 <!--%import("js/member_admin.js")-->
+<!--%import("js/krzip_search.js")-->

 <div style="margin-bottom:20px;">
    <span <!--@if($act=='dispMemberAdminList')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a>]</span>
--- a/modules/member/tpl/js/krzip_search.js
+++ b/modules/member/tpl/js/krzip_search.js
@ -0,0 +1,71 @@
+/* 한국 우편 번호 관련 */
+function doHideKrZipList(column_name) {
+        var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
+        var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
+        var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
+        var addr1_obj = xGetElementById('fo_insert_member')[column_name][0];
+        var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name];
+
+        zone_addr1_obj.style.display = 'none';
+        zone_list_obj.style.display = 'none';
+        zone_search_obj.style.display = 'inline';
+        addr1_obj.value = '';
+        field_obj.focus();
+}
+
+function doSelectKrZip(column_name) {
+        var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
+        var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
+        var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
+        var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name];
+        var value = sel_obj.options[sel_obj.selectedIndex].value;
+        var addr1_obj = xGetElementById('fo_insert_member')[column_name][0];
+        var addr2_obj = xGetElementById('fo_insert_member')[column_name][1];
+        addr1_obj.value = value;
+        zone_search_obj.style.display = 'none';
+        zone_list_obj.style.display = 'none';
+        zone_addr1_obj.style.display = 'inline';
+        addr2_obj.focus();
+}
+
+function doSearchKrZip(column_name) {
+        var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name];
+        var addr = field_obj.value;
+        if(!addr) return;
+
+        var params = new Array();
+        params['addr'] = addr;
+        params['column_name'] = column_name;
+
+        var response_tags = new Array('error','message','address_list');
+        exec_xml('krzip', 'getKrzipCodeList', params, completeSearchKrZip, response_tags, params);
+}
+
+function completeSearchKrZip(ret_obj, response_tags, callback_args) {
+        if(!ret_obj['address_list']) {
+                alert(alert_msg['address']);
+                return;
+        }
+        var address_list = ret_obj['address_list'].split("\n");
+        var column_name = callback_args['column_name'];
+
+        var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
+        var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
+        var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
+        var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name];
+
+        for(var i=0;i<address_list.length;i++) {
+                var opt = new Option(address_list[i],address_list[i],false,false);
+                sel_obj.options[i] = opt;
+        }
+
+        for(var i=address_list.length-1;i<sel_obj.options.length;i++) {
+                sel_obj.remove(i);
+        }
+
+        sel_obj.selectedIndex = 0;
+
+        zone_search_obj.style.display = 'none';
+        zone_addr1_obj.style.display = 'none';
+        zone_list_obj.style.display = 'inline';
+}
--- a/modules/module/queries/getActionForward.xml
+++ b/modules/module/queries/getActionForward.xml
@ -6,6 +6,6 @@
        <column name="*" />
    </columns>
    <conditions>
-        <condition operation="equal" column="act" default="act" />
+        <condition operation="equal" column="act" var="act" />
    </conditions>
 </query>
--- a/modules/module/queries/insertModuleConfig.xml
+++ b/modules/module/queries/insertModuleConfig.xml
@ -3,7 +3,7 @@
        <table name="module_config" />
    </tables>
    <columns>
-        <column name="module" default="module" notnull="notnull" />
+        <column name="module" var="module" notnull="notnull" />
        <column name="config" var="config" />
        <column name="regdate" default="curdate()" />
    </columns>
--- a/modules/module/schemas/modules.xml
+++ b/modules/module/schemas/modules.xml
@ -2,7 +2,7 @@
    <column name="module_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
    <column name="module" type="varchar" size="80" notnull="notnull" index="idx_module" />
    <column name="module_category_srl" type="number" size="11" default="0" index="idx_module_category" />
-    <column name="layout_srl" type="number" size="11" notnull="notnull" default="0" />
+    <column name="layout_srl" type="number" size="11" default="0" />
    <column name="mid" type="varchar" size="40" notnull="notnull" unique="unique_mid"/>
    <column name="skin" type="varchar" size="250" />
    <column name="browser_title" type="varchar" size="250" notnull="notnull"/>
--- a/modules/page/queries/getPageList.xml
+++ b/modules/page/queries/getPageList.xml
@ -16,7 +16,7 @@
        </group>
    </conditions>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="module_srl" order="desc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/poll/queries/getPollLog.xml
+++ b/modules/poll/queries/getPollLog.xml
@ -8,6 +8,6 @@
    <conditions>
        <condition operation="equal" column="poll_srl" var="poll_srl" />
        <condition operation="equal" column="member_srl" default="0" var="memer_srl" pipe="and" />
-        <condition operation="equal" column="ipaddress" var="ipaddress" default="ipaddress" pipe="and" />
+        <condition operation="equal" column="ipaddress" var="ipaddress" default="ipaddress()" pipe="and" />
    </conditions>
 </query>
--- a/modules/spamfilter/queries/getDeniedIPList.xml
+++ b/modules/spamfilter/queries/getDeniedIPList.xml
@ -6,6 +6,6 @@
        <column name="*" />
    </columns>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="regdate" order="desc" />
    </navigation>
 </query>
--- a/modules/spamfilter/queries/getDeniedWordList.xml
+++ b/modules/spamfilter/queries/getDeniedWordList.xml
@ -6,6 +6,6 @@
        <column name="*" />
    </columns>
    <navigation>
-        <index var="sort_index" order="desc" />
+        <index var="sort_index" default="regdate" order="desc" />
    </navigation>
 </query>
--- a/modules/trackback/queries/getTotalTrackbackList.xml
+++ b/modules/trackback/queries/getTotalTrackbackList.xml
@ -14,7 +14,7 @@
        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
    </conditions>
    <navigation>
-        <index var="sort_index" order="asc" />
+        <index var="sort_index" default="list_order" order="asc" />
        <list_count var="list_count" default="20" />
        <page_count var="page_count" default="10" />
        <page var="page" default="1" />
--- a/modules/trackback/queries/getTrackbackList.xml
+++ b/modules/trackback/queries/getTrackbackList.xml
@ -9,6 +9,6 @@
        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
    </conditions>
    <navigation>
-        <index var="list_order" order="asc" />
+        <index var="list_order" default="list_order" order="asc" />
    </navigation>
 </query>