From d43d5d8535506da19345cb1e5917ce54880e55ef Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 29 Mar 2007 04:43:18 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@760 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/xml_handler.js | 2 +- modules/member/conf/module.xml | 2 ++ modules/member/member.controller.php | 32 +++++++++++++++++++ modules/member/tpl.admin/delete_form.html | 4 +-- .../tpl.admin/filter/delete_image_mark.xml | 2 ++ .../tpl.admin/filter/delete_image_name.xml | 2 ++ .../tpl.admin/{ => filter}/delete_member.xml | 2 +- modules/member/tpl.admin/js/admin.js | 12 +++---- modules/member/tpl.admin/member_info.html | 9 ++++-- 9 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 modules/member/tpl.admin/filter/delete_image_mark.xml create mode 100644 modules/member/tpl.admin/filter/delete_image_name.xml rename modules/member/tpl.admin/{ => filter}/delete_member.xml (66%) diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index fe46a2a1a..dbee5c73c 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -16,7 +16,7 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu oXml.addParam("module", module); oXml.addParam("act", act); - if(typeof(response_tags)=="undefined") response_tags = new Array('error','message'); + if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = new Array('error','message'); response_tags[response_tags.length] = "redirect_url"; if(show_waiting_message) { diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index 30e9ef350..f513e0df8 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -22,5 +22,7 @@ + + diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index a9debf2c0..56ca72ff0 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -648,6 +648,38 @@ return new Object(); } + /** + * @brief 이미지 이름을 삭제 + **/ + function procDeleteImageName() { + $member_srl = Context::get('member_srl'); + if(!$member_srl) return new Object(0,'success'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { + $oMemberModel = &getModel('member'); + $image_name = $oMemberModel->getImageName($member_srl); + @unlink($image_name->file); + } + return new Object(0,'success'); + } + + /** + * @brief 이미지 마크를 삭제 + **/ + function procDeleteImageMark() { + $member_srl = Context::get('member_srl'); + if(!$member_srl) return new Object(0,'success'); + + $logged_info = Context::get('logged_info'); + if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) { + $oMemberModel = &getModel('member'); + $image_mark = $oMemberModel->getImageMark($member_srl); + @unlink($image_mark->file); + } + return new Object(0,'success'); + } + /** * @brief 최종 출력물에서 이미지 이름을 변경 * imgae_name 애드온에서 요청이 됨 diff --git a/modules/member/tpl.admin/delete_form.html b/modules/member/tpl.admin/delete_form.html index f3068ec06..33fc499b5 100644 --- a/modules/member/tpl.admin/delete_form.html +++ b/modules/member/tpl.admin/delete_form.html @@ -1,7 +1,7 @@ - + -
+ diff --git a/modules/member/tpl.admin/filter/delete_image_mark.xml b/modules/member/tpl.admin/filter/delete_image_mark.xml new file mode 100644 index 000000000..93bd1cd6f --- /dev/null +++ b/modules/member/tpl.admin/filter/delete_image_mark.xml @@ -0,0 +1,2 @@ + + diff --git a/modules/member/tpl.admin/filter/delete_image_name.xml b/modules/member/tpl.admin/filter/delete_image_name.xml new file mode 100644 index 000000000..12aa37712 --- /dev/null +++ b/modules/member/tpl.admin/filter/delete_image_name.xml @@ -0,0 +1,2 @@ + + diff --git a/modules/member/tpl.admin/delete_member.xml b/modules/member/tpl.admin/filter/delete_member.xml similarity index 66% rename from modules/member/tpl.admin/delete_member.xml rename to modules/member/tpl.admin/filter/delete_member.xml index c5ee894c9..72350ffc1 100644 --- a/modules/member/tpl.admin/delete_member.xml +++ b/modules/member/tpl.admin/filter/delete_member.xml @@ -1,4 +1,4 @@ - + diff --git a/modules/member/tpl.admin/js/admin.js b/modules/member/tpl.admin/js/admin.js index 3f612121e..f072d2164 100644 --- a/modules/member/tpl.admin/js/admin.js +++ b/modules/member/tpl.admin/js/admin.js @@ -256,14 +256,14 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) { /* 이미지 이름, 마크 삭제 */ function doDeleteImageName(member_srl) { - var params = new Array(); - params['member_srl'] = member_srl; - exec_xml("member","procDeleteImageName", params); + var fo_obj = xGetElementById("fo_image"); + fo_obj.member_srl.value = member_srl; + procFilter(fo_obj, delete_image_name); } function doDeleteImageMark(member_srl) { - var params = new Array(); - params['member_srl'] = member_srl; - exec_xml("member","procDeleteImageMark", params); + var fo_obj = xGetElementById("fo_image"); + fo_obj.member_srl.value = member_srl; + procFilter(fo_obj, delete_image_mark); } diff --git a/modules/member/tpl.admin/member_info.html b/modules/member/tpl.admin/member_info.html index 66ad5c3d5..5862a6a99 100644 --- a/modules/member/tpl.admin/member_info.html +++ b/modules/member/tpl.admin/member_info.html @@ -1,6 +1,11 @@ - - + + + + +
+ +