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

modules/file/file.model.php

@@ -69,6 +69,31 @@
             // DB 객체 생성
             $oDB = &DB::getInstance();
 
+            // 검색 옵션 정리
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'filename' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_filename = $search_keyword;
+                        break;
+                    case 'filesize' :
+                            $args->s_filesize = (int)$search_keyword;
+                        break;
+                    case 'download_count' :
+                            $args->s_download_count = (int)$search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                }
+            }
+
             // 변수 설정
             $args->sort_index = $obj->sort_index;
             $args->page = $obj->page?$obj->page:1;

modules/file/lang/ko.lang.php

@@ -16,4 +16,13 @@
 
     $lang->msg_cart_is_null = '삭제할 글을 선택해주세요';
     $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다';
+
+    $lang->search_target_list = array(
+        'filename' => '파일이름',
+        'filesize' => '파일크기 (byte, 이상)',
+        'download_count' => '다운로드 회수 (이상)',
+        'regdate' => '등록일',
+        'ipaddress' => 'IP 주소',
+    );
+
 ?>

modules/file/queries/getFileList.xml

@@ -1,14 +1,21 @@
 <query id="getFileList" action="select">
-  <tables>
+    <tables>
-    <table name="files" />
+        <table name="files" />
-  </tables>
+    </tables>
-  <columns>
+    <columns>
-    <column name="*" />
+        <column name="*" />
-  </columns>
+    </columns>
-  <navigation>
+    <conditions>
-    <index var="sort_index" order="desc" />
+        <condition operation="like" column="uploaded_filename" var="s_filename" />
-    <list_count var="list_count" default="20" />
+        <condition operation="more" column="file_size" var="s_filesize" pipe="or" />
-    <page_count var="page_count" default="10" />
+        <condition operation="more" column="downloaded_count" var="s_download_count" pipe="or" />
-    <page var="page" default="1" />
+        <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
-  </navigation>
+        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
 </query>

modules/file/tpl.admin/file_list.html

@@ -19,6 +19,7 @@
     <th>{$lang->file_size}</th>
     <th>{$lang->download_count}</th>
     <th>{$lang->date}</th>
+    <th>{$lang->ipaddress}</th>
     <th>{$lang->cmd_move_to_document}</th>
     <th>{$lang->cmd_download}</th>
   </tr>
@@ -31,6 +32,7 @@
     <td>{$val->file_size}</td>
     <td>{$val->downloaded_count}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
+    <td>{$val->ipaddress}</td>
     <td><a href="#" onclick="window.open('./?document_srl={$val->document_srl}');return false">{$lang->cmd_move}</a></td>
     <td><a href="./?mid={$val->mid}&amp;act=procDownloadFile&amp;file_srl={$val->file_srl}&amp;sid={$val->sid}&amp;document_srl={$val->document_srl}">{$lang->cmd_download}</a></td>
   </tr>
@@ -45,6 +47,27 @@
 
 </form>
 
+<!-- 검색 -->
+<div>
+  <form action="./" method="get">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="mo" value="{$mo}" />
+    <input type="hidden" name="act" value="{$act}" />
+
+    <div>
+      <select name="search_target">
+        <option value="">{$lang->search_target}</option>
+        <!--@foreach($lang->search_target_list as $key => $val)-->
+        <option value="{$key}" <!--@if($search_target==$key)-->selected="true"<!--@end-->>{$val}</option>
+        <!--@end-->
+      </select>
+      <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+      <input type="submit" value="{$lang->cmd_search}" />
+      <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'mo',$mo,'act',$act)}'"/>
+    </div>
+  </form>
+</div>
+
 <!-- 페이지 네비게이션 -->
 <div>
   <a href="{getUrl('page','','file_srl','')}">[{$lang->first_page}]</a>

modules/member/queries/getMemberList.xml

@@ -17,7 +17,7 @@
             <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
         </group>
     </conditions>
-        <navigation>
+    <navigation>
         <index var="sort_index" order="desc" />
         <list_count var="list_count" default="20" />
         <page_count var="page_count" default="10" />

modules/member/tpl.admin/filter/search.xml

@@ -1,8 +0,0 @@
-<filter name="search" module="member">
-  <form />
-  <parameter />
-  <response callback_func="completeSearch">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>

modules/member/tpl.admin/js/admin.js

@@ -253,8 +253,3 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) {
     zone_list_obj.style.display = 'inline';
 }
 
-/* 검색 실행 */
-function completeSearch(fo_obj, params) {
-  fo_obj.submit();
-}
-

modules/member/tpl.admin/member_list.html

@@ -1,7 +1,5 @@
 <!--#include("header.html")-->
 
-<!--%import("filter/search.xml")-->
-
 <!-- 정보 -->
 <div>
   {number_format($total_count)}, 
@@ -46,7 +44,7 @@
 
 <!-- 검색 -->
 <div>
-  <form action="./" method="get" onsubmit="return procFilter(this, search)">
+  <form action="./" method="get">
     <input type="hidden" name="module" value="{$module}" />
     <input type="hidden" name="mo" value="{$mo}" />
     <input type="hidden" name="act" value="{$act}}" />

modules/trackback/lang/ko.lang.php

@@ -6,9 +6,20 @@
      **/
 
     $lang->module = '모듈';
+    $lang->blog_name = '사이트';
 
     $lang->cmd_delete_checked_trackback = '선택항목 삭제';
 
     $lang->msg_cart_is_null = '삭제할 글을 선택해주세요';
     $lang->msg_checked_trackback_is_deleted = '%d개의 엮인글이 삭제되었습니다';
+
+    $lang->search_target_list = array(
+        'url' => '대상 URL',
+        'blog_name' => '대상 사이트 이름',
+        'title' => '제목',
+        'excerpt' => '내용',
+        'regdate' => '등록일',
+        'ipaddress' => 'IP 주소',
+    );
+
 ?>

modules/trackback/queries/getTotalTrackbackList.xml

@@ -1,14 +1,22 @@
 <query id="getTotalTrackbackList" action="select">
-  <tables>
+    <tables>
-    <table name="trackbacks" />
+        <table name="trackbacks" />
-  </tables>
+    </tables>
-  <columns>
+    <columns>
-    <column name="*" />
+        <column name="*" />
-  </columns>
+    </columns>
-  <navigation>
+    <conditions>
-    <index var="sort_index" order="asc" />
+        <condition operation="like" column="url" var="s_url" />
-    <list_count var="list_count" default="20" />
+        <condition operation="like" column="blog_name" var="s_blog_name" pipe="or" />
-    <page_count var="page_count" default="10" />
+        <condition operation="like" column="title" var="title" pipe="or" />
-    <page var="page" default="1" />
+        <condition operation="like" column="exceprt" var="exceprt" pipe="or" />
-  </navigation>
+        <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+        <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" order="asc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
 </query>

modules/trackback/tpl.admin/trackback_list.html

@@ -15,20 +15,25 @@
   <tr>
     <th colspan="2">{$lang->no}</th>
     <th>{$lang->module}</th>
-    <th>{$lang->user_name}</th>
+    <th>{$lang->blog_name}</th>
-    <th>{$lang->content}</th>
+    <th>{$lang->title}</th>
     <th>{$lang->date}</th>
+    <th>{$lang->ipaddress}</th>
     <th>{$lang->cmd_move}</th>
   </tr>
   <!--@foreach($trackback_list as $no => $val)-->
   <tr>
-    <td>{$no}</td>
+    <td rowspan="2">{$no}</td>
-    <td><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
+    <td rowspan="2"><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
     <td><a href="#" onclick="window.open('./?mid={$val->mid}');return false">{$module_list[$val->module_srl]->browser_title}</a></td>
-    <td>{$val->user_name}</td>
+    <td><a href="#" onclick="window.open('{$val->url}');return false;">{$val->blog_name}</a></td>
-    <td>{$val->content}</td>
+    <td>{$val->title}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
-    <td><a href="#" onclick="window.open('./?document_srl={$val->document_srl}&amp;#trackback_{$val->trackback_srl}');return false">{$lang->cmd_move}</a></td>
+    <td>{$val->ipaddress}</td>
+    <td rowspan="2"><a href="#" onclick="window.open('./?document_srl={$val->document_srl}&amp;#trackback_{$val->trackback_srl}');return false">{$lang->cmd_move}</a></td>
+  </tr>
+  <tr>
+    <td colspan="5">{$val->excerpt}</td>
   </tr>
   <!--@end-->
   </table>
@@ -41,6 +46,28 @@
 
 </form>
 
+<!-- 검색 -->
+<div>
+  <form action="./" method="get">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="mo" value="{$mo}" />
+    <input type="hidden" name="act" value="{$act}" />
+
+    <div>
+      <select name="search_target">
+        <option value="">{$lang->search_target}</option>
+        <!--@foreach($lang->search_target_list as $key => $val)-->
+        <option value="{$key}" <!--@if($search_target==$key)-->selected="true"<!--@end-->>{$val}</option>
+        <!--@end-->
+      </select>
+      <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+      <input type="submit" value="{$lang->cmd_search}" />
+      <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'mo',$mo,'act',$act)}'"/>
+    </div>
+  </form>
+</div>
+
+
 <!-- 페이지 네비게이션 -->
 <div>
   <a href="{getUrl('page','','trackback_srl','')}">[{$lang->first_page}]</a>

modules/trackback/trackback.model.php

@@ -46,7 +46,6 @@
             $args->document_srl = $document_srl;
             $args->ipaddress = $ipaddress;
             $output = $oDB->executeQuery('trackback.getTrackbackCountByIPAddress', $args);
-            debugPrint($output);
             $total_count = $output->data->count;
 
             return (int)$total_count;
@@ -79,6 +78,38 @@
             // DB 객체 생성
             $oDB = &DB::getInstance();
 
+            // 검색 옵션 정리
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'url' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_url = $search_keyword;
+                        break;
+                    case 'title' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title= $search_keyword;
+                        break;
+                    case 'blog_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_blog_name= $search_keyword;
+                        break;
+                    case 'excerpt' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_excerpt = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                }
+            }
+
+
             // 변수 설정
             $args->sort_index = $obj->sort_index;
             $args->page = $obj->page?$obj->page:1;