From 9ccf23473b0a005166e6cc920bb28c62300f4941 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 13 Jul 2007 06:19:21 +0000
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=84=9C/=EB=8C=93=EA=B8=80/=EC=B2=A8?=
 =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC/=EC=97=AE=EC=9D=B8=EA=B8=80=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EC=97=90=20=EB=AA=A8=EB=93=88=EB=B3=84=20=EC=97=B4=EB=9E=8C?=
 =?UTF-8?q?=EC=9D=B4=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=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/trunk@1929 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/tpl/css/admin.css               |  3 +++
 modules/comment/comment.admin.view.php        |  7 +++++++
 modules/comment/comment.model.php             |  1 +
 .../comment/queries/getTotalCommentList.xml   | 19 +++++++++++--------
 modules/comment/tpl/comment_list.html         | 12 +++++++++++-
 modules/document/document.admin.view.php      |  7 +++++++
 modules/document/tpl/document_list.html       | 12 +++++++++++-
 modules/file/file.admin.model.php             |  1 +
 modules/file/file.admin.view.php              |  6 ++++++
 modules/file/queries/getFileList.xml          |  5 +++--
 modules/file/tpl/file_list.html               | 12 +++++++++++-
 .../queries/getTotalTrackbackList.xml         | 15 +++++++++------
 modules/trackback/tpl/trackback_list.html     | 12 +++++++++++-
 modules/trackback/trackback.admin.model.php   |  1 +
 modules/trackback/trackback.admin.view.php    |  6 ++++++
 15 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index a80001eb3..daeeb2984 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -201,3 +201,6 @@ select.time_zone { width:70%; position:relative; top:4px; }
 
 .w700 { width:700px; }
 .w5 { width:5em; }
+
+.nowrap { white-space:nowrap; }
+.mid_list { width:7em; }
diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
index c00084e1a..8be1af26e 100644
--- a/modules/comment/comment.admin.view.php
+++ b/modules/comment/comment.admin.view.php
@@ -24,6 +24,13 @@
 
             $args->sort_index = 'list_order'; ///< 소팅 값
 
+            $args->module_srl = Context::get('module_srl');
+
+            // mid목록을 구함
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList();
+            Context::set('mid_list', $mid_list);
+
             // 목록 구함, comment->getCommentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
             $oCommentModel = &getModel('comment');
             $output = $oCommentModel->getTotalCommentList($args);
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 35ad5dd50..5ac4f23f4 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -176,6 +176,7 @@
             $args->page = $obj->page?$obj->page:1;
             $args->list_count = $obj->list_count?$obj->list_count:20;
             $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
 
             // 검색 옵션 정리
             $search_target = trim(Context::get('search_target'));
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index a982e7036..f3daff1a5 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -6,14 +6,17 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="like" column="content" var="s_content" />
-        <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
-        <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
-        <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
-        <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
-        <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
-        <condition operation="like_prefix" column="last_update" var="s_last_upate" pipe="or" />
-        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        <condition operation="equal" column="module_srl" var="s_module_srl" />
+        <group pipe="and">
+            <condition operation="like" column="content" var="s_content" pipe="or" />
+            <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="last_update" var="s_last_upate" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
     </conditions>
     <navigation>
         <index var="sort_index" default="list_order" order="asc" />
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 1d42f45eb..9d416cee1 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -16,7 +16,16 @@
     <thead>
         <tr>
             <th scope="col"><input type="checkbox" onclick="doCheckAll(); return false;" /></th>
-            <th scope="col">{$lang->module}</th>
+            <th scope="col">
+                <div class="nowrap">
+                    <select name="module_srl" class="mid_list" id="module_srl">
+                        <option value="">{$lang->module}</option>
+                        <!--@foreach($mid_list as $key => $val)-->
+                        <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
+                        <!--@end-->
+                    </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
+                </div>
+            </th>
             <th scope="col">{$lang->user_name}</th>
             <th scope="col">{$lang->date}</th>
             <th scope="col">{$lang->last_update}</th>
@@ -71,6 +80,7 @@
 <form action="./" method="get" class="adminSearch">
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="{$act}" />
+<input type="hidden" name="module_srl" value="{$module_srl}" />
 
     <fieldset>
         <select name="search_target">
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index bb55646b5..6879e6831 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -27,6 +27,13 @@
 
             $args->sort_index = 'list_order'; ///< 소팅 값
 
+            $args->module_srl = Context::get('module_srl');
+
+            // mid목록을 구함
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList();
+            Context::set('mid_list', $mid_list);
+
             // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
             $oDocumentModel = &getModel('document');
             $output = $oDocumentModel->getDocumentList($args);
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 6a6671324..216ba35ce 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -17,7 +17,16 @@
         <tr>
             <th scope="col">{$lang->no}</th>
             <th scope="col"><input type="checkbox" onclick="doCheckAll(); return false;" /></th>
-            <th scope="col">{$lang->module}</th>
+            <th scope="col">
+                <div class="nowrap">
+                    <select name="module_srl" class="mid_list" id="module_srl">
+                        <option value="">{$lang->module}</option>
+                        <!--@foreach($mid_list as $key => $val)-->
+                        <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
+                        <!--@end-->
+                    </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
+                </div>
+            </th>
             <th scope="col">{$lang->title}</th>
             <th scope="col">{$lang->user_name}</th>
             <th scope="col">{$lang->readed_count}</th>
@@ -75,6 +84,7 @@
 <form action="./" method="get" class="adminSearch">
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="{$act}" />
+<input type="hidden" name="module_srl" value="{$module_srl}" />
 
     <fieldset>
         <select name="search_target">
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index 58cd21559..882baf4ce 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -51,6 +51,7 @@
             $args->page = $obj->page?$obj->page:1;
             $args->list_count = $obj->list_count?$obj->list_count:20;
             $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
 
             // file.getFileList쿼리 실행
             $output = executeQuery('file.getFileList', $args);
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index 444e3c1d3..47de2c004 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -24,11 +24,17 @@
 
             $args->sort_index = 'file_srl'; ///< 소팅 값
             $args->isvalid = Context::get('isvalid');
+            $args->module_srl = Context::get('module_srl');
 
             // 목록 구함
             $oFileModel = &getAdminModel('file');
             $output = $oFileModel->getFileList($args);
 
+            // mid목록을 구함
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList();
+            Context::set('mid_list', $mid_list);
+
             // 목록의 loop를 돌면서 mid를 구하기 위한 module_srl값을 구함
             $file_count = count($output->data);
             if($file_count) {
diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml
index 916e9d603..fc58f0e21 100644
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@@ -6,9 +6,10 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="isvalid" var="isvalid" />
+        <condition operation="equal" column="module_srl" var="s_module_srl" />
+        <condition operation="equal" column="isvalid" var="isvalid" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="uploaded_filename" var="s_filename" />
+            <condition operation="like" column="source_filename" var="s_filename" pipe="or" />
             <condition operation="more" column="file_size" var="s_filesize" pipe="or" />
             <condition operation="more" column="download_count" var="s_download_count" pipe="or" />
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 441e1b217..5e54b988e 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -15,7 +15,16 @@
     <tr>
         <th scope="col">{$lang->no}</th>
         <th scope="col"><input type="checkbox" onclick="doCheckAll(); return false;" /></th>
-        <th scope="col">{$lang->module}</th>
+        <th scope="col">
+            <div class="nowrap">
+                <select name="module_srl" class="mid_list" id="module_srl">
+                    <option value="">{$lang->module}</option>
+                    <!--@foreach($mid_list as $key => $val)-->
+                    <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
+                    <!--@end-->
+                </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
+            </div>
+        </th>
         <th scope="col">{$lang->file_name}</th>
         <th scope="col">{$lang->file_size}</th>
         <th scope="col">{$lang->is_valid}</th>
@@ -73,6 +82,7 @@
 <form action="./" method="get" class="adminSearch">
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="{$act}" />
+<input type="hidden" name="module_srl" value="{$module_srl}" />
 
     <fieldset>
         <select name="isvalid">
diff --git a/modules/trackback/queries/getTotalTrackbackList.xml b/modules/trackback/queries/getTotalTrackbackList.xml
index 9de2b26a3..6fb61e06f 100644
--- a/modules/trackback/queries/getTotalTrackbackList.xml
+++ b/modules/trackback/queries/getTotalTrackbackList.xml
@@ -6,12 +6,15 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="like" column="url" var="s_url" />
-        <condition operation="like" column="blog_name" var="s_blog_name" pipe="or" />
-        <condition operation="like" column="title" var="title" pipe="or" />
-        <condition operation="like" column="exceprt" var="exceprt" pipe="or" />
-        <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
-        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        <condition operation="equal" column="module_srl" var="s_module_srl" />
+        <group pipe="and">
+            <condition operation="like" column="url" var="s_url" />
+            <condition operation="like" column="blog_name" var="s_blog_name" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="excerpt" var="s_excerpt" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
     </conditions>
     <navigation>
         <index var="sort_index" default="list_order" order="asc" />
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html
index a006b6482..f64bd563b 100644
--- a/modules/trackback/tpl/trackback_list.html
+++ b/modules/trackback/tpl/trackback_list.html
@@ -15,7 +15,16 @@
     <thead>
         <tr>
             <th scope="col">{$lang->no}</th>
-            <th scope="col">{$lang->module}</th>
+            <th scope="col">
+                <div class="nowrap">
+                    <select name="module_srl" class="mid_list" id="module_srl">
+                        <option value="">{$lang->module}</option>
+                        <!--@foreach($mid_list as $key => $val)-->
+                        <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
+                        <!--@end-->
+                    </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
+                </div>
+            </th>
             <th scope="col">{$lang->blog_name}</th>
             <th scope="col">{$lang->title}</th>
             <th scope="col">{$lang->date}</th>
@@ -71,6 +80,7 @@
 <form action="./" method="get" class="adminSearch">
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="{$act}" />
+<input type="hidden" name="module_srl" value="{$module_srl}" />
 
     <fieldset>
         <select name="search_target">
diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php
index 75cd4183d..9724e042f 100644
--- a/modules/trackback/trackback.admin.model.php
+++ b/modules/trackback/trackback.admin.model.php
@@ -53,6 +53,7 @@
             $args->page = $obj->page?$obj->page:1;
             $args->list_count = $obj->list_count?$obj->list_count:20;
             $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
 
             // trackback.getTotalTrackbackList 쿼리 실행
             $output = executeQuery('trackback.getTotalTrackbackList', $args);
diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php
index b9be09ec3..230ba79b8 100644
--- a/modules/trackback/trackback.admin.view.php
+++ b/modules/trackback/trackback.admin.view.php
@@ -23,6 +23,12 @@
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'list_order'; ///< 소팅 값
+            $args->module_srl = Context::get('module_srl');
+
+            // mid목록을 구함
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList();
+            Context::set('mid_list', $mid_list);
 
             // 목록 구함
             $oTrackbackAdminModel = &getAdminModel('trackback');