From b909a11c5e2a734e841cb56034f743e428f5755c Mon Sep 17 00:00:00 2001 From: devjin Date: Tue, 6 Sep 2011 09:21:31 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9054 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/lang/lang.xml | 8 +- modules/member/member.admin.controller.php | 94 ++------------------ modules/member/member.admin.view.php | 6 +- modules/member/tpl/js/member_admin.js | 10 --- modules/member/tpl/js/member_admin_config.js | 54 ++++++++++- modules/member/tpl/js/member_admin_group.js | 1 - modules/member/tpl/member_config.html | 44 +++------ 7 files changed, 81 insertions(+), 136 deletions(-) diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml index 1b091497d..8c3cf83ab 100644 --- a/modules/member/lang/lang.xml +++ b/modules/member/lang/lang.xml @@ -2248,7 +2248,7 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới, - %s개의 금지아이디가 있습니다.]]> + %s개의 금지아이디가 있습니다.]]> %s prohibited ID.]]> @@ -2310,4 +2310,10 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới, + + + + + + diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 97efd1d16..3c26074a5 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -114,7 +114,6 @@ $list_order = Context::get('list_order'); $usable_list = Context::get('usable_list'); - $denied_id = Context::get('denied_id'); $all_args = Context::getRequestVars(); $oModuleController = &getController('module'); @@ -189,39 +188,6 @@ // create Ruleset $this->_createSignupRuleset($signupForm); - - if ($denied_id){ - $denied_id = explode("\r\n", $denied_id); - $denied_list = $oMemberModel->getDeniedIDs(); - $deniedIDs = array(); - foreach($denied_list as $denied_info){ - $deniedIDs[] = $denied_info->user_id; - } - - $add_list = array_diff($denied_id, $deniedIDs); - $delete_list = array_diff($deniedIDs, $denied_id); - - $oDB = &DB::getInstance(); - $oDB->begin(); - - foreach($add_list as $user_id){ - $output = $this->insertDeniedID($user_id, ''); - if(!$output->toBool()){ - $oDB->rollback(); - return $output; - } - } - - foreach($delete_list as $user_id){ - $output = $this->deleteDeniedID($user_id); - if(!$output->toBool()){ - $oDB->rollback(); - return $output; - } - } - $oDB->commit(); - - } } $output = $oModuleController->updateModuleConfig('member', $args); // default setting end @@ -252,50 +218,6 @@ FileHandler::writeFile($xml_file, $xml_buff); } - /** - * @brief Add information for member administration - **/ - function _procMemberAdminInsertConfig() { - // Get the basic information - $args = Context::gets( - 'webmaster_name', 'webmaster_email', - 'skin', 'colorset', - 'editor_skin', 'editor_colorset', - 'enable_openid', 'enable_join', 'enable_confirm', 'limit_day', - 'after_login_url', 'after_logout_url', 'redirect_url', 'agreement', - 'profile_image', 'profile_image_max_width', 'profile_image_max_height', - 'image_name', 'image_name_max_width', 'image_name_max_height', - 'image_mark', 'image_mark_max_width', 'image_mark_max_height', - 'group_image_mark', 'group_image_mark_max_width', 'group_image_mark_max_height', - 'signature','signature_max_height','change_password_date' - ); - - if(!$args->skin) $args->skin = "default"; - if(!$args->colorset) $args->colorset = "white"; - if(!$args->editor_skin) $args->editor_skin= "xpresseditor"; - if(!$args->editor_colorset) $args->editor_colorset = "white"; - if($args->enable_join!='Y') $args->enable_join = 'N'; - if($args->enable_openid!='Y') $args->enable_openid= 'N'; - if($args->profile_image !='Y') $args->profile_image = 'N'; - if($args->image_name!='Y') $args->image_name = 'N'; - if($args->image_mark!='Y') $args->image_mark = 'N'; - if($args->group_image_mark!='Y') $args->group_image_mark = 'N'; - if($args->signature!='Y') $args->signature = 'N'; - if(!trim(strip_tags($args->agreement))) $args->agreement = null; - $args->limit_day = (int)$args->limit_day; - if(!$args->change_password_date) $args->change_password_date = 0; - - $oMemberController = &getController('member'); - $output = $oMemberController->setMemberConfig($args); - - if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig'); - header('location:'.$returnUrl); - return; - } - return $output; - } - /** * @brief Add a user group **/ @@ -615,15 +537,17 @@ * @brief Add a denied ID **/ function procMemberAdminInsertDeniedID() { - $user_id = Context::get('user_id'); - $description = Context::get('description'); + $user_ids = Context::get('user_id'); - $output = $this->insertDeniedID($user_id, $description); - if(!$output->toBool()) return $output; + $user_ids = explode(',',$user_ids); + $success_ids = array(); - $this->add('group_srl',''); - $this->add('page',Context::get('page')); - $this->setMessage('success_registed'); + foreach($user_ids as $val){ + $output = $this->insertDeniedID($val, ''); + if($output->toBool()) $success_ids[] = $val; + } + + $this->add('user_ids', implode(',',$success_ids)); if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList'); diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 200a35d45..06ac81144 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -114,11 +114,7 @@ // get denied ID list $denied_list = $oMemberModel->getDeniedIDs(); - $deniedIDs = array(); - foreach($denied_list as $denied_info){ - $deniedIDs[] = $denied_info->user_id; - } - Context::set('deniedIDs', $deniedIDs); + Context::set('deniedIDs', $denied_list); $this->setTemplateFile('member_config'); } diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js index ffadbad02..efc83022f 100644 --- a/modules/member/tpl/js/member_admin.js +++ b/modules/member/tpl/js/member_admin.js @@ -67,16 +67,6 @@ function completeInsertDeniedID(ret_obj) { location.href = url; } -/* 금지아이디 관련 작업들 */ -function doUpdateDeniedID(user_id, mode, message) { - if(typeof(message)!='undefined'&&!confirm(message)) return; - - var fo_obj = get_by_id('fo_denied_id_info'); - fo_obj.user_id.value = user_id; - fo_obj.mode.value = mode; - procFilter(fo_obj, update_denied_id); -} - /* 가입폼 관련 작업들 */ function doUpdateJoinForm(member_join_form_srl, mode, message) { if(typeof(message)!='undefined'&&!confirm(message)) return; diff --git a/modules/member/tpl/js/member_admin_config.js b/modules/member/tpl/js/member_admin_config.js index 0330014a9..157b765d4 100644 --- a/modules/member/tpl/js/member_admin_config.js +++ b/modules/member/tpl/js/member_admin_config.js @@ -23,6 +23,24 @@ function doGetSkinColorset(skin) { ); } +/* 금지아이디 관련 작업들 */ +function doUpdateDeniedID(user_id, mode, message) { + if(typeof(message)!='undefined'&&!confirm(message)) return; + + exec_xml( + 'member', + 'procMemberAdminUpdateDeniedID', + {user_id:user_id, mode:mode}, + function(){ + if (mode == 'delete'){ + jQuery('#denied_'+user_id).remove(); + jQuery('._deniedIDCount').html(jQuery('#deniedList li').length); + } + }, + ['error','message','tpl'] + ); +} + jQuery(function($){ // hide form if enable_join is setted "No" var suSetting = $('fieldset.suSetting'); // 회원가입 설정 @@ -98,7 +116,6 @@ jQuery(function($){ var memberFormSrl = $(event.target).parent().attr('id'); var targetTR = $(event.target).closest('tr'); - exec_xml( 'member', 'procMemberAdminDeleteJoinForm', @@ -109,4 +126,39 @@ jQuery(function($){ ['error','message','tpl'] ); }); + + $('button._addDeniedID').click(function(){ + var ids = $('#prohibited_id').val(); + if(ids == ''){ + alert(xe.lang.msg_null_prohibited_id); + $('#prohibited_id').focus(); + return; + } + + + ids = ids.replace(/\n/g, ','); + + var tag; + function on_complete(data){ + var uids = data.user_ids.split(','); + for (var i=0; i'+uids[i]+' '+xe.lang.cmd_delete+''; + $('#deniedList').append($(tag)); + } + $('#prohibited_id').val(''); + + $('._deniedIDCount').html($('#deniedList li').length); + } + + jQuery.exec_json('member.procMemberAdminInsertDeniedID', {'user_id': ids}, on_complete); + + }); + + $('a.modalAnchor._preview').bind('before-open.mw', function(){ + var $inputList = $('input[name="usable_list[]"]:checked'); + var title = ''; + for(var i=0; i<$inputList.length; i++){ + title = $($inputList[i]).closest('tr').find('.wrap ._title').html(); + } + }); }); diff --git a/modules/member/tpl/js/member_admin_group.js b/modules/member/tpl/js/member_admin_group.js index 547ae7ba9..36ca68a84 100644 --- a/modules/member/tpl/js/member_admin_group.js +++ b/modules/member/tpl/js/member_admin_group.js @@ -41,7 +41,6 @@ jQuery(function ($){ var $target = $(event.target).closest('tr'); var group_srl = $(event.target).attr('href').substr(1); if(!confirm(xe.lang.groupDeleteMessage)) return; - console.log(group_srl); if (group_srl.indexOf("new") > 0){ $target.remove(); diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index 306f7f022..afd7497b0 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -1,6 +1,9 @@

{$XE_VALIDATOR_MESSAGE}

@@ -90,23 +93,15 @@

  • -
    - - + + {$lang->multi_line_input}
    -
    • @@ -130,7 +125,7 @@
    - {$item->title} + {$item->title}
    @@ -155,7 +150,7 @@
    - {$item->title} + {$item->title}
    @@ -164,7 +159,7 @@ {$item->description} - {$lang->cmd_edit} | 삭제 + {$lang->cmd_edit} | {$lang->cmd_delete} @@ -172,8 +167,7 @@

    - 사용자 정의 항목 추가... - Preview + {$lang->add_extend_form}...

    @@ -188,20 +182,4 @@
    -