diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index bafe3eb3e..ae1ed04f2 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -49,9 +49,9 @@ - - - + + + @@ -67,16 +67,17 @@ - + - - - - + + + + + - + - + diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 190b749dd..ace8ca347 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -56,6 +56,12 @@ // Return result $this->add('member_srl', $args->member_srl); $this->setMessage($msg_code); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); + header('location:'.$returnUrl); + return; + } } /** @@ -108,6 +114,12 @@ $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; } @@ -122,6 +134,12 @@ $this->add('group_srl',''); $this->add('page',Context::get('page')); $this->setMessage('success_registed'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + header('location:'.$returnUrl); + return; + } } /** @@ -129,26 +147,41 @@ **/ function procMemberAdminUpdateGroup() { $group_srl = Context::get('group_srl'); - $mode = Context::get('mode'); - switch($mode) { - case 'delete' : - $output = $this->deleteGroup($group_srl); - if(!$output->toBool()) return $output; - $msg_code = 'success_deleted'; - break; - case 'update' : - $args = Context::gets('group_srl','title','description','is_default','image_mark'); - $args->site_srl = 0; - $output = $this->updateGroup($args); - if(!$output->toBool()) return $output; - $msg_code = 'success_updated'; - break; - } + $args = Context::gets('group_srl','title','description','is_default','image_mark'); + $args->site_srl = 0; + $output = $this->updateGroup($args); + if(!$output->toBool()) return $output; $this->add('group_srl',''); $this->add('page',Context::get('page')); - $this->setMessage($msg_code); + $this->setMessage('success_updated'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + header('location:'.$returnUrl); + return; + } + } + + /** + * @brief Update user group information + **/ + function procMemberAdminDeleteGroup() { + $group_srl = Context::get('group_srl'); + + $output = $this->deleteGroup($group_srl); + if(!$output->toBool()) return $output; + + $this->add('group_srl',''); + $this->add('page',Context::get('page')); + $this->setMessage('success_deleted'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + header('location:'.$returnUrl); + return; + } } /** @@ -184,6 +217,12 @@ $this->add('act','dispJoinForm'); $this->setMessage('success_registed'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList'); + header('location:'.$returnUrl); + return; + } } /** @@ -243,8 +282,8 @@ $member_srls = explode(',',$member_srl); $group_srl = Context::get('group_srls'); - $group_srls = explode('|@|', $group_srl); - if(!$group_srl) return new Object(-1,'msg_check_group'); + if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl); + else $group_srls = $group_srl; $oDB = &DB::getInstance(); $oDB->begin(); @@ -277,8 +316,15 @@ } } $oDB->commit(); - $this->setMessage('success_updated'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + global $lang; + alertScript($lang->success_updated); + reload(true); + closePopupScript(); + exit; + } } /** @@ -294,6 +340,12 @@ $this->add('group_srl',''); $this->add('page',Context::get('page')); $this->setMessage('success_registed'); + + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList'); + header('location:'.$returnUrl); + return; + } } /** @@ -515,4 +567,4 @@ return new Object(); } } -?> \ No newline at end of file +?> diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 02f669459..64357b688 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1490,6 +1490,9 @@ $oDB->rollback(); return $output; } + + if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list; + else $group_srl_list = explode('|@|', $args->group_srl_list); // If no value is entered the default group, the value of group registration if(!$args->group_srl_list) { $columnList = array('site_srl', 'group_srl'); @@ -1502,7 +1505,6 @@ } // If the value is the value of the group entered the group registration } else { - $group_srl_list = explode('|@|', $args->group_srl_list); for($i=0;$iaddMemberToGroup($args->member_srl,$group_srl_list[$i]); @@ -1623,9 +1625,10 @@ $oDB->rollback(); return $output; } + if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list; + else $group_srl_list = explode('|@|', $args->group_srl_list); // If the group information, group information changes - if($args->group_srl_list) { - $group_srl_list = explode('|@|', $args->group_srl_list); + if(count($group_srl_list) > 0) { $args->site_srl = 0; // One of its members to delete all the group $output = executeQuery('member.deleteMemberGroupMember', $args); diff --git a/modules/member/ruleset/deleteGroup.xml b/modules/member/ruleset/deleteGroup.xml new file mode 100644 index 000000000..c15f708cc --- /dev/null +++ b/modules/member/ruleset/deleteGroup.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/insert.xml b/modules/member/ruleset/insert.xml new file mode 100644 index 000000000..b4e26144f --- /dev/null +++ b/modules/member/ruleset/insert.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/member/ruleset/insertConfig.xml b/modules/member/ruleset/insertConfig.xml new file mode 100644 index 000000000..6051d7ad8 --- /dev/null +++ b/modules/member/ruleset/insertConfig.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/insertDeniedId.xml b/modules/member/ruleset/insertDeniedId.xml new file mode 100644 index 000000000..2b5b037fd --- /dev/null +++ b/modules/member/ruleset/insertDeniedId.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/insertGroup.xml b/modules/member/ruleset/insertGroup.xml new file mode 100644 index 000000000..79b27e272 --- /dev/null +++ b/modules/member/ruleset/insertGroup.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/insertJoinForm.xml b/modules/member/ruleset/insertJoinForm.xml new file mode 100644 index 000000000..e4d593d79 --- /dev/null +++ b/modules/member/ruleset/insertJoinForm.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/member/ruleset/manageMemberGroup.xml b/modules/member/ruleset/manageMemberGroup.xml new file mode 100644 index 000000000..3ea817e84 --- /dev/null +++ b/modules/member/ruleset/manageMemberGroup.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/member/ruleset/updateGroup.xml b/modules/member/ruleset/updateGroup.xml new file mode 100644 index 000000000..adde869ac --- /dev/null +++ b/modules/member/ruleset/updateGroup.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html index ceea725dd..719ec67fe 100644 --- a/modules/member/tpl/denied_id_list.html +++ b/modules/member/tpl/denied_id_list.html @@ -1,5 +1,4 @@ - @@ -46,7 +45,9 @@ -
+

{$XE_VALIDATOR_ERROR}

+ +
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index 48611968c..9e3c3181e 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -1,4 +1,3 @@ - @@ -7,10 +6,9 @@ - - + + -
@@ -63,7 +61,9 @@
-
+

{$XE_VALIDATOR_ERROR}

+ + diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html index 4d6c688c0..2fddcf33b 100644 --- a/modules/member/tpl/group_update_form.html +++ b/modules/member/tpl/group_update_form.html @@ -1,10 +1,11 @@ - - +

{$XE_VALIDATOR_ERROR}

+ + diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html index 3b00e8589..3cfb8cd76 100644 --- a/modules/member/tpl/header.html +++ b/modules/member/tpl/header.html @@ -8,10 +8,10 @@ diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index f456f02ac..67897047b 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -1,7 +1,8 @@ - - +

{$XE_VALIDATOR_ERROR}

+ + diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index dc9600de8..a81ce1a42 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -1,19 +1,16 @@ - - - - - - - - - +

{$XE_VALIDATOR_ERROR}

+ + + + + @@ -26,6 +23,7 @@ {htmlspecialchars($member_info->user_id)} +

{$lang->about_user_id}

@@ -139,7 +137,7 @@
{$lang->group}
- group_list[$key])-->checked="checked" class="checkbox" /> + group_list[$key])-->checked="checked" class="checkbox" />

{$lang->about_group}

diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js index caa2334f8..4c34b5d0b 100644 --- a/modules/member/tpl/js/member_admin.js +++ b/modules/member/tpl/js/member_admin.js @@ -45,8 +45,7 @@ function doUpdateGroup(group_srl, mode, message) { var fo_obj = get_by_id('fo_group_info'); fo_obj.group_srl.value = group_srl; - fo_obj.mode.value = mode; - procFilter(fo_obj, update_group); + fo_obj.submit(); } function completeUpdateGroup(ret_obj) { diff --git a/modules/member/tpl/manage_member_group.html b/modules/member/tpl/manage_member_group.html index cc8aecf23..b64877b90 100644 --- a/modules/member/tpl/manage_member_group.html +++ b/modules/member/tpl/manage_member_group.html @@ -1,11 +1,12 @@ -

{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})

- +

{$XE_VALIDATOR_ERROR}

+ +
@@ -14,7 +15,7 @@ -  
+  
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index 9b1f102f4..8e9875a86 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -1,9 +1,10 @@ - - +

{$XE_VALIDATOR_ERROR}

+ +