fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-26 22:02:13 +09:00
Code Issues Projects Releases Packages Wiki Activity

Close Connection when there is no connection value.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2013-09-25 15:29:32 +00:00
parent 034a5c0288
commit f70ce644ce
1410 changed files with 7188 additions and 53541 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,11 +195,15 @@ class memberAdminController extends member
if($args->redirect_url)
{
$tmpArgs = new stdClass();
$tmpArgs->menu_item_srl = (int)$args->redirect_url;
$output = executeQuery('module.getModuleInfoByMenuItemSrl', $tmpArgs);
$oModuleModel = getModel('module');
$redirectModuleInfo = $oModuleModel->getModuleInfoByModuleSrl($args->redirect_url, array('mid'));
$args->redirect_url = Context::getDefaultUrl().$output->data->mid;
if(!$redirectModuleInfo)
{
return new Object('-1', 'msg_exist_selected_module');
}
$args->redirect_url = Context::getDefaultUrl().$redirectModuleInfo->mid;
}
$args->profile_image = $args->profile_image ? 'Y' : 'N';
@ -277,6 +281,7 @@ class memberAdminController extends member
unset($args->agreement);
}
$output = $oModuleController->updateModuleConfig('member', $args);
// default setting end
@ -455,7 +460,7 @@ class memberAdminController extends member
}
else if($formInfo->name == 'password')
{
$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="3:20" /></field>';
$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="6:20" /></field>';
$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
}
else if($formInfo->name == 'find_account_question')
@ -1125,21 +1130,10 @@ class memberAdminController extends member
* Set group config
* @return void
*/
function procMemberAdminGroupConfig()
public function procMemberAdminGroupConfig()
{
$vars = Context::getRequestVars();
if(is_array($vars->group_titles))
{
foreach($vars->group_titles AS $key=>$value)
{
if(!$value)
{
return new Object(-1,'msg_insert_group_name');
}
}
}
$oMemberModel = &getModel('member');
$oModuleController = &getController('module');
@ -1149,32 +1143,47 @@ class memberAdminController extends member
unset($config->agreement);
$output = $oModuleController->updateModuleConfig('member', $config);
// group data save
$defaultGroup = $oMemberModel->getDefaultGroup(0);
$defaultGroupSrl = $defaultGroup->group_srl;
$group_srls = $vars->group_srls;
foreach($group_srls as $order=>$group_srl)
{
$isInsert = false;
$update_args = new stdClass();
$update_args->title = $vars->group_titles[$order];
$update_args->is_default = ($vars->defaultGroup == $group_srl)?'Y':'N';
$update_args->description = $vars->descriptions[$order];
$update_args->image_mark = $vars->image_marks[$order];
$update_args->list_order = $order + 1;
if(is_numeric($group_srl))
{
if(!$update_args->title) continue;
if(is_numeric($group_srl)) {
$update_args->group_srl = $group_srl;
$output = $this->updateGroup($update_args);
}
else
else {
$update_args->group_srl = getNextSequence();
$output = $this->insertGroup($update_args);
}
if($vars->defaultGroup == $group_srl) {
$defaultGroupSrl = $update_args->group_srl;
}
}
$this->setMessage('success_updated');
//set default group
$default_args = $oMemberModel->getGroup($defaultGroupSrl);
$default_args->is_default = 'Y';
$default_args->group_srl = $defaultGroupSrl;
$output = $this->updateGroup($default_args);
$this->setMessage(Context::getLang('success_updated').' ('.Context::getLang('msg_insert_group_name_detail').')');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
$this->setRedirectUrl($returnUrl);
}
/**
* Set group order
* @return void