diff --git a/modules/file/file.model.php b/modules/file/file.model.php index 16bdbeda6..7e49259ee 100644 --- a/modules/file/file.model.php +++ b/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; diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php index 6f4d55333..6e4e000f3 100644 --- a/modules/file/lang/ko.lang.php +++ b/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 주소', + ); + ?> diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml index ab99c9e5b..1cba2e767 100644 --- a/modules/file/queries/getFileList.xml +++ b/modules/file/queries/getFileList.xml @@ -1,14 +1,21 @@ - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + diff --git a/modules/file/tpl.admin/file_list.html b/modules/file/tpl.admin/file_list.html index f93283cef..047e46064 100644 --- a/modules/file/tpl.admin/file_list.html +++ b/modules/file/tpl.admin/file_list.html @@ -19,6 +19,7 @@ + @@ -31,6 +32,7 @@ + @@ -45,6 +47,27 @@ + +
+
+ + + + +
+ + + + +
+ +
+
[{$lang->first_page}] diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml index 104d7cdeb..4adc01082 100644 --- a/modules/member/queries/getMemberList.xml +++ b/modules/member/queries/getMemberList.xml @@ -17,7 +17,7 @@ - + diff --git a/modules/member/tpl.admin/filter/search.xml b/modules/member/tpl.admin/filter/search.xml deleted file mode 100644 index 088fd77cc..000000000 --- a/modules/member/tpl.admin/filter/search.xml +++ /dev/null @@ -1,8 +0,0 @@ - -
- - - - - - diff --git a/modules/member/tpl.admin/js/admin.js b/modules/member/tpl.admin/js/admin.js index 3afe0ab25..2984fe3b6 100644 --- a/modules/member/tpl.admin/js/admin.js +++ b/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(); -} - diff --git a/modules/member/tpl.admin/member_list.html b/modules/member/tpl.admin/member_list.html index d0b76caae..2766cff0c 100644 --- a/modules/member/tpl.admin/member_list.html +++ b/modules/member/tpl.admin/member_list.html @@ -1,7 +1,5 @@ - -
{number_format($total_count)}, @@ -46,7 +44,7 @@
- + diff --git a/modules/trackback/lang/ko.lang.php b/modules/trackback/lang/ko.lang.php index 77228b0ad..b0e2a38f5 100644 --- a/modules/trackback/lang/ko.lang.php +++ b/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 주소', + ); + ?> diff --git a/modules/trackback/queries/getTotalTrackbackList.xml b/modules/trackback/queries/getTotalTrackbackList.xml index 5c52b7e76..9171d08df 100644 --- a/modules/trackback/queries/getTotalTrackbackList.xml +++ b/modules/trackback/queries/getTotalTrackbackList.xml @@ -1,14 +1,22 @@ - -
{$lang->file_size} {$lang->download_count} {$lang->date}{$lang->ipaddress} {$lang->cmd_move_to_document} {$lang->cmd_download}
{$val->file_size} {$val->downloaded_count} {zdate($val->regdate,"Y-m-d")}{$val->ipaddress} {$lang->cmd_move} {$lang->cmd_download}
- - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + diff --git a/modules/trackback/tpl.admin/trackback_list.html b/modules/trackback/tpl.admin/trackback_list.html index ee91eaf53..d81d0c0bd 100644 --- a/modules/trackback/tpl.admin/trackback_list.html +++ b/modules/trackback/tpl.admin/trackback_list.html @@ -15,20 +15,25 @@ - - + + + - - + + - - + + - + + + + +
{$lang->no} {$lang->module}{$lang->user_name}{$lang->content}{$lang->blog_name}{$lang->title} {$lang->date}{$lang->ipaddress} {$lang->cmd_move}
{$no}{$no} {$module_list[$val->module_srl]->browser_title}{$val->user_name}{$val->content}{$val->blog_name}{$val->title} {zdate($val->regdate,"Y-m-d")}{$lang->cmd_move}{$val->ipaddress}{$lang->cmd_move}
{$val->excerpt}
@@ -41,6 +46,28 @@ + +
+
+ + + + +
+ + + + +
+
+
+ +
[{$lang->first_page}] diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php index 3d71baa5f..12098bb1c 100644 --- a/modules/trackback/trackback.model.php +++ b/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;