fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 46 validator apply to member module

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8512 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-06-21 08:28:58 +00:00
parent 6683636782
commit ee58f755a8
20 changed files with 194 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/member/conf/module.xml
View file

@ -49,9 +49,9 @@
<action name="procMemberModifyPassword" type="controller" standalone="true" />
<action name="procMemberLeave" type="controller" standalone="true" />
<action name="procMemberOpenIDLeave" type="controller" standalone="true" />
<action name="procMemberInsertProfileImage" type="controller" standalone="true" />
<action name="procMemberInsertImageName" type="controller" standalone="true" />
<action name="procMemberInsertImageMark" type="controller" standalone="true" />
<action name="procMemberInsertProfileImage" type="controller" standalone="true" ruleset="insertProfileImage" />
<action name="procMemberInsertImageName" type="controller" standalone="true" ruleset="insertImageName" />
<action name="procMemberInsertImageMark" type="controller" standalone="true" ruleset="insertImageMark" />
<action name="procMemberDeleteProfileImage" type="controller" standalone="true" />
<action name="procMemberDeleteImageName" type="controller" standalone="true" />
<action name="procMemberDeleteImageMark" type="controller" standalone="true" />
@ -67,16 +67,17 @@
<action name="procMemberUpdateAuthMail" type="controller" standalone="true" />
<action name="procMemberResendAuthMail" type="controller" standalone="true" />
<action name="procMemberAdminInsert" type="controller" standalone="true" />
<action name="procMemberAdminInsert" type="controller" standalone="true" ruleset="insert" />
<action name="procMemberAdminDelete" type="controller" standalone="true" />
<action name="procMemberAdminInsertConfig" type="controller" standalone="true" />
<action name="procMemberAdminInsertGroup" type="controller" standalone="true" />
<action name="procMemberAdminUpdateGroup" type="controller" standalone="true" />
<action name="procMemberAdminUpdateMembersGroup" type="controller" standalone="true" />
<action name="procMemberAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
<action name="procMemberAdminInsertGroup" type="controller" standalone="true" ruleset="insertGroup" />
<action name="procMemberAdminUpdateGroup" type="controller" standalone="true" ruleset="updateGroup" />
<action name="procMemberAdminDeleteGroup" type="controller" standalone="true" ruleset="deleteGroup" />
<action name="procMemberAdminUpdateMembersGroup" type="controller" standalone="true" ruleset="manageMemberGroup" />
<action name="procMemberAdminDeleteMembers" type="controller" standalone="true" />
<action name="procMemberAdminInsertJoinForm" type="controller" standalone="true" />
<action name="procMemberAdminInsertJoinForm" type="controller" standalone="true" ruleset="insertJoinForm" />
<action name="procMemberAdminUpdateJoinForm" type="controller" standalone="true" />
<action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" />
<action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" ruleset="insertDeniedId" />
<action name="procMemberAdminUpdateDeniedID" type="controller" standalone="true" />
<action name="procMemberAdminUpdateGroupOrder" type="controller" standalone="true" />
</actions>

92
modules/member/member.admin.controller.php
View file

@ -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();
}
}
?>
?>

9
modules/member/member.controller.php
View file

@ -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;$i<count($group_srl_list);$i++) {
$output = $this->addMemberToGroup($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);

8
modules/member/ruleset/deleteGroup.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="group_srl" required="true" rule="number" />
</fields>
</ruleset>

11
modules/member/ruleset/insert.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="user_id" required="true" length="3:20" />
<field name="user_name" required="true" length="2:40" />
<field name="nick_name" required="true" length="2:40" />
<field name="email_address" required="true" length="1:200" rule="email" />
</fields>
</ruleset>

8
modules/member/ruleset/insertConfig.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="webmaster_name" required="true" length="2:40" />
</fields>
</ruleset>

8
modules/member/ruleset/insertDeniedId.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="user_id" required="true" />
</fields>
</ruleset>

8
modules/member/ruleset/insertGroup.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="title" required="true" />
</fields>
</ruleset>

10
modules/member/ruleset/insertJoinForm.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="column_type" required="true" />
<field name="column_name" required="true" rule="alpha" />
<field name="column_title" required="true" />
</fields>
</ruleset>

8
modules/member/ruleset/manageMemberGroup.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="group_srls" required="true" />
</fields>
</ruleset>

9
modules/member/ruleset/updateGroup.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="group_srl" required="true" rule="number" />
<field name="title" required="true" />
</fields>
</ruleset>

5
modules/member/tpl/denied_id_list.html
View file

@ -1,5 +1,4 @@
<!--#include("header.html")-->
<!--%import("filter/insert_denied_id.xml")-->
<!--%import("filter/update_denied_id.xml")-->
<!-- 금지아이디의 삭제와 관련된 form -->
@ -46,7 +45,9 @@
</div>
<!-- 금지 아이디 추가 -->
<form action="./" method="get" onsubmit="return procFilter(this, insert_denied_id)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="insertDeniedId" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminInsertDeniedID" />
<input type="hidden" name="page" value="{$page}" />
<div>

10
modules/member/tpl/group_list.html
View file

@ -1,4 +1,3 @@
<!--%import("filter/insert_group.xml")-->
<!--%import("filter/update_group.xml")-->
<!--#include("header.html")-->
@ -7,10 +6,9 @@
<!-- 그룹의 삭제와 관련된 form -->
<form id="fo_group_info" action="./" method="get">
<input type="hidden" name="act" value="procMemberAdminUpdateGroup" />
<form ruleset="deleteGroup" id="fo_group_info" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminDeleteGroup" />
<input type="hidden" name="group_srl" value="" />
<input type="hidden" name="mode" value="" />
</form>
<form id="fo_group_order" action="./" method="get">
@ -63,7 +61,9 @@
</form>
<!-- 그룹 추가 -->
<form action="./" method="get" onsubmit="return procFilter(this, insert_group)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="insertGroup" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminInsertGroup" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="group_srl" value="" />

5
modules/member/tpl/group_update_form.html
View file

@ -1,10 +1,11 @@
<!--#include("header.html")-->
<!--%import("filter/update_group.xml")-->
<!--%load_js_plugin("filebox")-->
<!-- 그룹 수정 -->
<!--@if($selected_group)-->
<form action="./" method="get" onsubmit="return procFilter(this, update_group)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="updateGroup" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminUpdateGroup" />
<input type="hidden" name="group_srl" value="{$selected_group->group_srl}" />
<input type="hidden" name="mode" value="update" />
<!--@if($selected_group->is_default=='Y')--><input type="hidden" name="is_default" value="Y" /><!--@end-->

10
modules/member/tpl/header.html
View file

@ -8,10 +8,10 @@
<div class="header4">
<ul class="localNavigation">
<li <!--@if($act=='dispMemberAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a></li>
<li <!--@if($act=='dispMemberAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminConfig')}">{$lang->cmd_module_config}</a></li>
<li <!--@if($act=='dispMemberAdminGroupList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminGroupList')}">{$lang->cmd_member_group}</a></li>
<li <!--@if($act=='dispMemberAdminJoinFormList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminJoinFormList')}">{$lang->cmd_manage_form}</a></li>
<li <!--@if($act=='dispMemberAdminDeniedIDList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminDeniedIDList')}">{$lang->cmd_manage_id}</a></li>
<li <!--@if($act=='dispMemberAdminList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a></li>
<li <!--@if($act=='dispMemberAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminConfig')}">{$lang->cmd_module_config}</a></li>
<li <!--@if($act=='dispMemberAdminGroupList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminGroupList')}">{$lang->cmd_member_group}</a></li>
<li <!--@if($act=='dispMemberAdminJoinFormList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminJoinFormList')}">{$lang->cmd_manage_form}</a></li>
<li <!--@if($act=='dispMemberAdminDeniedIDList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminDeniedIDList')}">{$lang->cmd_manage_id}</a></li>
</ul>
</div>

5
modules/member/tpl/insert_join_form.html
View file

@ -1,7 +1,8 @@
<!--#include("header.html")-->
<!--%import("filter/insert_join_form.xml")-->
<form id="fo_join_form" action="./" method="get" onsubmit="return procFilter(this, insert_join_form)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="insertJoinForm" id="fo_join_form" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminInsertJoinForm" />
<input type="hidden" name="member_join_form_srl" value="{$join_form->member_join_form_srl}" />
<input type="hidden" name="default_value" value="<!--@if(is_array($join_form->default_value))-->{implode($join_form->default_value,'|@|')}<!--@end-->" />

18
modules/member/tpl/insert_member.html
View file

@ -1,19 +1,16 @@
<!--#include("header.html")-->
<!--@if($member_info->member_srl)-->
<!--%import("filter/update_member.xml")-->
<!--@else-->
<!--%import("filter/insert.xml")-->
<!--@endif-->
<!--%import("css/member_admin.css")-->
<!--// datepicker javascript plugin load -->
<!--%load_js_plugin("ui.datepicker")-->
<!--%load_js_plugin("filebox")-->
<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, insert)">
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
<input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form id="fo_insert_member" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminInsert" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
<input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
<!--@if($member_info->member_srl)-->
<input type="hidden" name="user_id" value="{htmlspecialchars($member_info->user_id)}" />
<!--@end-->
@ -26,6 +23,7 @@
<td class="wide">
<!--@if($member_info->member_srl)-->
{htmlspecialchars($member_info->user_id)}
<input type="hidden" name="user_id" value="{$member_info->user_id}" class="inputTypeText" />
<!--@else-->
<input type="text" name="user_id" value="" class="inputTypeText" />
<p>{$lang->about_user_id}</p>
@ -139,7 +137,7 @@
<th scope="row"><div>{$lang->group}</div></th>
<td>
<!--@foreach($group_list as $key=>$val)-->
<input type="checkbox" name="group_srl_list" value="{$key}" id="group_{$key}" <!--@if($member_info->group_list[$key])-->checked="checked"<!--@end--> class="checkbox" />
<input type="checkbox" name="group_srl_list[]" value="{$key}" id="group_{$key}" <!--@if($member_info->group_list[$key])-->checked="checked"<!--@end--> class="checkbox" />
<label for="group_{$key}">{$val->title}</label>
<!--@end-->
<p>{$lang->about_group}</p>

3
modules/member/tpl/js/member_admin.js
View file

@ -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) {

7
modules/member/tpl/manage_member_group.html
View file

@ -1,11 +1,12 @@
<!--%import("filter/manage_member_group.xml")-->
<!--%import("js/member_admin.js")-->
<div id="popHeader" class="wide">
<h3 class="xeAdmin">{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})</h3>
</div>
<form action="./" method="get" id="fo_management" onsubmit="return procFilter(this, manage_member_group);">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="manageMemberGroup" action="./" method="post" id="fo_management">
<input type="hidden" name="act" value="procMemberAdminUpdateMembersGroup" />
<input type="hidden" name="member_srl" value="{$member_srls}" />
<div id="popBody">
@ -14,7 +15,7 @@
<td>
<!--@foreach($group_list as $key => $val)-->
<!--@if($val->is_admin != 'Y')-->
<input type="checkbox" value="{$key}" name="group_srls" id="member_group_{$key}"/> <label for="member_group_{$key}">{$val->title}</label> &nbsp;<br/>
<input type="checkbox" value="{$key}" name="group_srls[]" id="member_group_{$key}"/> <label for="member_group_{$key}">{$val->title}</label> &nbsp;<br/>
<!--@end-->
<!--@end-->
</td>

5
modules/member/tpl/member_config.html
View file

@ -1,9 +1,10 @@
<!--%import("filter/insert_config.xml")-->
<!--%import("../../editor/tpl/js/editor_module_config.js",optimized=false)-->
<!--#include("header.html")-->
<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form ruleset="insertConfig" action="./" method="post">
<input type="hidden" name="act" value="procMemberAdminInsertConfig" />
<input type="hidden" name="temp_srl" value="" />
<input type="hidden" name="agreement" value="{htmlspecialchars($config->agreement)}" />