diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index 4a4790048..b2a45f9f5 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -65,15 +65,15 @@ diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index d1232ed49..420bbef4f 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -75,15 +75,15 @@ diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 882baf4ce..22e26247b 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -30,6 +30,9 @@ case 'filesize' : $args->s_filesize = (int)$search_keyword; break; + case 'filesize_mega' : + $args->s_filesize = (int)$search_keyword * 1024 * 1024; + break; case 'download_count' : $args->s_download_count = (int)$search_keyword; break; @@ -37,7 +40,16 @@ $args->s_regdate = $search_keyword; break; case 'ipaddress' : - $args->s_ipaddress= $search_keyword; + $args->s_ipaddress = $search_keyword; + break; + case 'user_id' : + $args->s_user_id = $search_keyword; + break; + case 'user_name' : + $args->s_user_name = $search_keyword; + break; + case 'nick_name' : + $args->s_nick_name = $search_keyword; break; } } diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php index 1e2aec7e2..a21eb2185 100644 --- a/modules/file/lang/en.lang.php +++ b/modules/file/lang/en.lang.php @@ -31,11 +31,16 @@ $lang->msg_checked_file_is_deleted = '%d attachment(s) was(were) deleted'; $lang->msg_exceeds_limit_size = 'File size of attachment is bigger than allowed size.'; - $lang->search_target_list = array( + + $lang->file_search_target_list = array( 'filename' => 'File Name', 'filesize' => 'File Size (byte, over)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => 'Downloads (over)', 'regdate' => 'Registered Date', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임', 'ipaddress' => 'IP Address', ); ?> diff --git a/modules/file/lang/es.lang.php b/modules/file/lang/es.lang.php index 49a931386..a8c2b769e 100644 --- a/modules/file/lang/es.lang.php +++ b/modules/file/lang/es.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = 'Total de %d archivos eliminados'; $lang->msg_exceeds_limit_size = 'Ha excedido el límite del tamaño total de los archivos adjuntos'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => 'Nombre del archivo', 'filesize' => 'Tamaño del archivo (Byte, sobre)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => 'Descargados (Sobre)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => 'La fecha registrada', 'ipaddress' => 'Dirección IP', ); diff --git a/modules/file/lang/fr.lang.php b/modules/file/lang/fr.lang.php index c7d21be81..ce5b05243 100644 --- a/modules/file/lang/fr.lang.php +++ b/modules/file/lang/fr.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = '%d Annexe(s) est(sont) supprimé(s)'; $lang->msg_exceeds_limit_size = 'La mesure de l\'(des) Annexe(s) est plus grande que celle consentie.'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => 'Nom de Fichier', 'filesize' => 'Mesure de Fichier (octet, surplus)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => 'Téléchargés (surplus)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => 'Enrgistré', 'ipaddress' => 'Adresse IP', ); diff --git a/modules/file/lang/jp.lang.php b/modules/file/lang/jp.lang.php index 52e17dbf5..8848f0b5c 100644 --- a/modules/file/lang/jp.lang.php +++ b/modules/file/lang/jp.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = '%d個の添付ファイルを削除しました'; $lang->msg_exceeds_limit_size = 'ファイルサイズの制限を超えたため、添付できません。'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => 'ファイル名', 'filesize' => 'ファイルサイズ((Byte以上)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => 'ダウンロード数(以上)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => '登録日', 'ipaddress' => 'IPアドレス', ); diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php index 0fbf82997..b49df9ad0 100644 --- a/modules/file/lang/ko.lang.php +++ b/modules/file/lang/ko.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다'; $lang->msg_exceeds_limit_size = '허용된 용량을 초과하여 첨부가 되지 않았습니다'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => '파일이름', 'filesize' => '파일크기 (byte, 이상)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => '다운로드 회수 (이상)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임', 'regdate' => '등록일', 'ipaddress' => 'IP 주소', ); diff --git a/modules/file/lang/ru.lang.php b/modules/file/lang/ru.lang.php index 8fc8d7987..b726d4eb4 100644 --- a/modules/file/lang/ru.lang.php +++ b/modules/file/lang/ru.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = 'Всего %d вложений было удалено'; $lang->msg_exceeds_limit_size = 'Вложение провалено: превышен лимит размера файлов'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => 'Имя файла', 'filesize' => 'Размер файла (байт, Выше)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => 'Скачано (Выше)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => 'Дата', 'ipaddress' => 'IP-Адрес', ); diff --git a/modules/file/lang/zh-CN.lang.php b/modules/file/lang/zh-CN.lang.php index f5c29250a..4fca33d7e 100644 --- a/modules/file/lang/zh-CN.lang.php +++ b/modules/file/lang/zh-CN.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = '已删除%d个文件!'; $lang->msg_exceeds_limit_size = '已超过系统指定的上传文件大小!'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => '文件名', 'filesize' => '文件大小 (byte, 以上)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => '下载次数 (以上)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => '登录日期', 'ipaddress' => 'IP地址', ); diff --git a/modules/file/lang/zh-TW.lang.php b/modules/file/lang/zh-TW.lang.php index 273ad0814..2be748b8c 100644 --- a/modules/file/lang/zh-TW.lang.php +++ b/modules/file/lang/zh-TW.lang.php @@ -31,10 +31,14 @@ $lang->msg_checked_file_is_deleted = '已刪除%d個檔案!'; $lang->msg_exceeds_limit_size = '已超過系統指定的上傳檔案大小!'; - $lang->search_target_list = array( + $lang->file_search_target_list = array( 'filename' => '檔案名稱', 'filesize' => '檔案大小 (byte, 以上)', + 'filesize_mega' => '파일크기 (Mb, 이상)', 'download_count' => '下載次數 (以上)', + 'user_id' => '아이디', + 'user_name' => '이름', + 'nick_name' => '닉네임' 'regdate' => '登錄日期', 'ipaddress' => 'IP位址', ); diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml index fc58f0e21..515f77629 100644 --- a/modules/file/queries/getFileList.xml +++ b/modules/file/queries/getFileList.xml @@ -1,23 +1,28 @@ - +
+
- + - - + + + - - - - - + + + + + + + + - + diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index a819db452..0bc5ac8a5 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -111,7 +111,7 @@