diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php
index 8a5934b90..28a84ee85 100644
--- a/common/lang/en.lang.php
+++ b/common/lang/en.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "Publish";
$lang->cmd_layout_setup = 'Configure layout';
$lang->cmd_layout_edit = 'Edit layout';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = 'Enable';
$lang->disable = 'Disable';
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 11864cf1c..0deb7f450 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -61,6 +61,7 @@
$lang->cmd_publish = "Publicar";
$lang->cmd_layout_setup = 'Configuración del diseño';
$lang->cmd_layout_edit = 'Editar el diseño';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = 'Activar';
$lang->disable = 'Desactivar';
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index 1cae84b4e..c04fc4626 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "Publier";
$lang->cmd_layout_setup = 'Configurer la Mise en page';
$lang->cmd_layout_edit = 'Editer la Mise en page';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = 'Valide';
$lang->disable = 'Invalide';
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 48f0b36db..0fe60928d 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = 'Veröffentlichen';
$lang->cmd_layout_setup = 'Konfiguration Layout';
$lang->cmd_layout_edit = 'Layout bearbeiten';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = 'Aktivieren';
$lang->deaktivieren = 'Deaktivieren';
@@ -247,4 +248,4 @@
$lang->filter->invalid_alpha = "Das Format von% s ist ungültig. Bitte geben Sie nur Alphabete";
$lang->filter->invalid_alpha_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Alphabete oder Zahlen";
$lang->filter->invalid_number = "Das Format von% s ist ungültig. Bitte geben Sie nur Zahlen";
-?>
\ No newline at end of file
+?>
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
index 1d320aa23..bb2e6cb03 100644
--- a/common/lang/jp.lang.php
+++ b/common/lang/jp.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "発行";
$lang->cmd_layout_setup = 'レイアウト設定';
$lang->cmd_layout_edit = 'レイアウト編集';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = '可能';
$lang->disable = '不可';
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index e6e289b5c..06143758a 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "발행";
$lang->cmd_layout_setup = '레이아웃 설정';
$lang->cmd_layout_edit = '레이아웃 편집';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = '가능';
$lang->disable = '불가능';
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index 83e0b4c25..f92d72f08 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "Опубликовать";
$lang->cmd_layout_setup = 'Конфигурировать лейаут';
$lang->cmd_layout_edit = 'Редактировать лейаут';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = 'Включено';
$lang->disable = 'Выключено';
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index 56e32c792..7e1e81a5d 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -62,6 +62,7 @@
$lang->cmd_publish = "发表";
$lang->cmd_layout_setup = '布局设置';
$lang->cmd_layout_edit = '编辑布局';
+ $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
$lang->enable = '可用';
$lang->disable = '禁用';
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 9921223df..13cf50051 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -53,6 +53,19 @@
// trigger 호출 (after)
ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
+ // 관리자일 경우 ip로 글 찾기
+ if($logged_info->is_admin == 'Y') {
+ $oCommentModel = &getModel('comment');
+ $oComment = $oCommentModel->getComment($comment_srl);
+
+ if($oComment->isExists()) {
+ // ip주소에 해당하는 글 찾기
+ $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->get('ipaddress'));
+ $icon_path = './modules/member/tpl/images/icon_management.gif';
+ $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+ }
+ }
+
// 팝업메뉴의 언어 변경
$menus = Context::get('comment_popup_menu_list');
$menus_count = count($menus);
@@ -351,6 +364,9 @@
case 'ipaddress' :
$args->s_ipaddress= $search_keyword;
break;
+ case 'member_srl' :
+ $args->{"s_".$search_target} = (int)$search_keyword;
+ break;
}
}
diff --git a/modules/comment/lang/en.lang.php b/modules/comment/lang/en.lang.php
index 9c917770c..ee2036214 100644
--- a/modules/comment/lang/en.lang.php
+++ b/modules/comment/lang/en.lang.php
@@ -21,6 +21,7 @@
'user_id' => 'ID',
'user_name' => 'Name',
'nick_name' => 'Nickname',
+ 'member_srl' => 'Member Serial',
'email_address' => 'Email',
'homepage' => 'Homepage',
'regdate' => 'Date',
diff --git a/modules/comment/lang/es.lang.php b/modules/comment/lang/es.lang.php
index 17b0bc84b..699a80c36 100644
--- a/modules/comment/lang/es.lang.php
+++ b/modules/comment/lang/es.lang.php
@@ -21,6 +21,7 @@
'user_id' => 'ID',
'user_name' => 'Nombre',
'nick_name' => 'Apodo',
+ 'member_srl' => 'Member Serial',
'email_address' => 'Correo Electrónico',
'homepage' => 'Página web',
'regdate' => 'Fecha del registro',
diff --git a/modules/comment/lang/fr.lang.php b/modules/comment/lang/fr.lang.php
index 7b80aa6f2..351105280 100644
--- a/modules/comment/lang/fr.lang.php
+++ b/modules/comment/lang/fr.lang.php
@@ -22,6 +22,7 @@
'user_id' => 'ID',
'user_name' => 'Nom',
'nick_name' => 'Surnom',
+ 'member_srl' => 'Member Serial',
'email_address' => 'Courriel',
'homepage' => 'Page d\'Accueil',
'regdate' => 'Jour',
diff --git a/modules/comment/lang/jp.lang.php b/modules/comment/lang/jp.lang.php
index 339d4b964..325b17b79 100644
--- a/modules/comment/lang/jp.lang.php
+++ b/modules/comment/lang/jp.lang.php
@@ -22,6 +22,7 @@
'user_id' => 'ユーザID',
'user_name' => '名前',
'nick_name' => 'ニックネーム',
+ 'member_srl' => 'Member Serial',
'email_address' => 'メールアドレス',
'homepage' => 'ホームページURL',
'regdate' => '登録日',
diff --git a/modules/comment/lang/ko.lang.php b/modules/comment/lang/ko.lang.php
index c8692772a..5adccd71b 100644
--- a/modules/comment/lang/ko.lang.php
+++ b/modules/comment/lang/ko.lang.php
@@ -22,6 +22,7 @@
'user_id' => '아이디',
'user_name' => '이름',
'nick_name' => '닉네임',
+ 'member_srl' => '회원번호',
'email_address' => '이메일주소',
'homepage' => '홈페이지',
'regdate' => '등록일',
diff --git a/modules/comment/lang/ru.lang.php b/modules/comment/lang/ru.lang.php
index 01eeaaa09..cdbbde467 100644
--- a/modules/comment/lang/ru.lang.php
+++ b/modules/comment/lang/ru.lang.php
@@ -21,6 +21,7 @@
'user_id' => 'ID',
'user_name' => 'Имя',
'nick_name' => 'Ник',
+ 'member_srl' => 'Member Serial',
'email_address' => 'Email',
'homepage' => 'Домашняя страница',
'regdate' => 'Дата',
diff --git a/modules/comment/lang/zh-CN.lang.php b/modules/comment/lang/zh-CN.lang.php
index f3b1e7aea..4d7a6f415 100644
--- a/modules/comment/lang/zh-CN.lang.php
+++ b/modules/comment/lang/zh-CN.lang.php
@@ -22,6 +22,7 @@
'user_id' => 'I D',
'user_name' => '姓名',
'nick_name' => '昵称',
+ 'member_srl' => 'Member Serial',
'email_address' => '电子信箱',
'homepage' => '主页',
'regdate' => '日期',
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index f3daff1a5..555311ba2 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -13,6 +13,7 @@
+
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 53a7d6027..ee67ce346 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -56,10 +56,6 @@
$oDocumentController = &getController('document');
- // 인쇄 버튼 추가
- $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
- $oDocumentController->addDocumentPopupMenu($url,'cmd_print','./modules/document/tpl/icons/print.gif','printDocument');
-
// 회원이어야만 가능한 기능
if($logged_info->member_srl) {
@@ -80,9 +76,26 @@
$oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','./modules/document/tpl/icons/scrap.gif','javascript');
}
+ // 인쇄 버튼 추가
+ $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
+ $oDocumentController->addDocumentPopupMenu($url,'cmd_print','./modules/document/tpl/icons/print.gif','printDocument');
+
// trigger 호출 (after)
ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
+ // 관리자일 경우 ip로 글 찾기
+ if($logged_info->is_admin == 'Y') {
+ $oDocumentModel = &getModel('document');
+ $oDocument = $oDocumentModel->getDocument($document_srl);
+
+ if($oDocument->isExists()) {
+ // ip주소에 해당하는 글 찾기
+ $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'));
+ $icon_path = './modules/member/tpl/images/icon_management.gif';
+ $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+ }
+ }
+
// 팝업메뉴의 언어 변경
$menus = Context::get('document_popup_menu_list');
$menus_count = count($menus);
diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 3c0030f3d..6f2bda070 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -86,6 +86,8 @@
$lang->cmd_manage_id = 'Manage Prohibited IDs';
$lang->cmd_manage_form = 'Manage Join Form';
$lang->cmd_view_own_document = 'Written Articles';
+ $lang->cmd_trace_document = 'Trace Written Articles';
+ $lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = 'Scraps';
$lang->cmd_view_saved_document = 'Saved Articles';
$lang->cmd_send_email = 'Send Mail';
diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php
index aba95e29b..d1104b259 100644
--- a/modules/member/lang/es.lang.php
+++ b/modules/member/lang/es.lang.php
@@ -86,6 +86,8 @@
$lang->cmd_manage_id = 'Manejo de ID prohibidos';
$lang->cmd_manage_form = 'Manejo de forma del registro';
$lang->cmd_view_own_document = 'Ver documentos escritos';
+ $lang->cmd_trace_document = 'Trace Written Articles';
+ $lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = 'Ver Scraps';
$lang->cmd_view_saved_document = 'Ver artículos guardados';
$lang->cmd_send_email = 'Enviar Email';
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
index 87bf24b48..b30290379 100644
--- a/modules/member/lang/jp.lang.php
+++ b/modules/member/lang/jp.lang.php
@@ -86,6 +86,8 @@
$lang->cmd_manage_id = '禁止ＩＤ管理';
$lang->cmd_manage_form = '加入フォーム管理';
$lang->cmd_view_own_document = '書き込み表示';
+ $lang->cmd_trace_document = 'Trace Written Articles';
+ $lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = 'スクラップ表示';
$lang->cmd_view_saved_document = '保存ドキュメント表示';
$lang->cmd_send_email = 'メール送信';
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 0908b9712..a423a554e 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -85,7 +85,9 @@
$lang->cmd_send_mail = '메일발송';
$lang->cmd_manage_id = '금지아이디관리';
$lang->cmd_manage_form = '가입폼관리';
- $lang->cmd_view_own_document = '작성글 보기';
+ $lang->cmd_view_own_document = '작성 글 보기';
+ $lang->cmd_trace_document = '작성글 추적';
+ $lang->cmd_trace_comment = '작성 댓글 추적';
$lang->cmd_view_scrapped_document = '스크랩 보기';
$lang->cmd_view_saved_document = '저장함 보기';
$lang->cmd_send_email = '메일 보내기';
diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php
index 9f817ef3a..189c0c18f 100644
--- a/modules/member/lang/ru.lang.php
+++ b/modules/member/lang/ru.lang.php
@@ -85,6 +85,8 @@
$lang->cmd_manage_id = 'Управление запрещенными ID';
$lang->cmd_manage_form = 'Управление формой регистрации';
$lang->cmd_view_own_document = 'Просмотреть написанные статьи';
+ $lang->cmd_trace_document = 'Trace Written Articles';
+ $lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = 'Черновики';
$lang->cmd_view_saved_document = 'Просмотреть сохраненные статьи';
$lang->cmd_send_email = 'Отправить почту';
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 4814d6673..dd832fac1 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -87,6 +87,8 @@
$lang->cmd_manage_id = '禁止用户名管理';
$lang->cmd_manage_form = '注册表单管理';
$lang->cmd_view_own_document = '查看发表主题';
+ $lang->cmd_trace_document = 'Trace Written Articles';
+ $lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = '查看收藏';
$lang->cmd_view_saved_document = '查看临时保存箱';
$lang->cmd_send_email = '发送邮件';
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 381da0d71..583c93c52 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -46,13 +46,6 @@
$oMemberController = &getController('member');
- // 최고 관리자라면 회원정보 수정 메뉴 만듬
- if($logged_info->is_admin == 'Y') {
- $url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
- $icon_path = './modules/member/tpl/images/icon_management.gif';
- $oMemberController->addMemberPopupMenu($url,'cmd_management',$icon_path,'MemberModifyInfo');
- }
-
// 회원 정보 보기 (비회원일 경우 볼 수 없도록 수정)
if($logged_info->member_srl) {
$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
@@ -82,6 +75,21 @@
// trigger 호출 (after)
ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
+ // 최고 관리자라면 회원정보 수정 메뉴 만듬
+ if($logged_info->is_admin == 'Y') {
+ $url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
+ $icon_path = './modules/member/tpl/images/icon_management.gif';
+ $oMemberController->addMemberPopupMenu($url,'cmd_management',$icon_path,'MemberModifyInfo');
+
+ $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
+ $icon_path = './modules/member/tpl/images/icon_trace_document.gif';
+ $oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
+
+ $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
+ $icon_path = './modules/member/tpl/images/icon_trace_comment.gif';
+ $oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
+ }
+
// 팝업메뉴의 언어 변경
$menus = Context::get('member_popup_menu_list');
$menus_count = count($menus);
diff --git a/modules/member/tpl/images/icon_trace_comment.gif b/modules/member/tpl/images/icon_trace_comment.gif
new file mode 100755
index 000000000..b234dec94
Binary files /dev/null and b/modules/member/tpl/images/icon_trace_comment.gif differ
diff --git a/modules/member/tpl/images/icon_trace_document.gif b/modules/member/tpl/images/icon_trace_document.gif
new file mode 100755
index 000000000..42ec550e9
Binary files /dev/null and b/modules/member/tpl/images/icon_trace_document.gif differ