issue 1259 added modify success message of member module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10252 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-02-28 10:28:46 +00:00
parent fd803fab08
commit c462df0242

View file

@ -38,28 +38,28 @@
$args->password = Context::get('reset_password');
else unset($args->password);
// Remove some unnecessary variables from all the vars
$all_args = Context::getRequestVars();
unset($all_args->module);
unset($all_args->act);
unset($all_args->mid);
unset($all_args->error_return_url);
unset($all_args->success_return_url);
unset($all_args->ruleset);
if(!isset($args->limit_date)) $args->limit_date = "";
// Add extra vars after excluding necessary information from all the requested arguments
$extra_vars = delObjectVars($all_args, $args);
$args->extra_vars = serialize($extra_vars);
// Check if an original member exists having the member_srl
if($args->member_srl) {
// Create a member model object
$oMemberModel = &getModel('member');
// Get memebr profile
// Remove some unnecessary variables from all the vars
$all_args = Context::getRequestVars();
unset($all_args->module);
unset($all_args->act);
unset($all_args->mid);
unset($all_args->error_return_url);
unset($all_args->success_return_url);
unset($all_args->ruleset);
if(!isset($args->limit_date)) $args->limit_date = "";
// Add extra vars after excluding necessary information from all the requested arguments
$extra_vars = delObjectVars($all_args, $args);
$args->extra_vars = serialize($extra_vars);
// Check if an original member exists having the member_srl
if($args->member_srl) {
// Create a member model object
$oMemberModel = &getModel('member');
// Get memebr profile
$columnList = array('member_srl');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
// If no original member exists, make a new one
if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
}
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
// If no original member exists, make a new one
if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
}
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
@ -70,24 +70,24 @@
}
}
$oMemberController = &getController('member');
// Execute insert or update depending on the value of member_srl
if(!$args->member_srl) {
$oMemberController = &getController('member');
// Execute insert or update depending on the value of member_srl
if(!$args->member_srl) {
$args->password = Context::get('password');
$output = $oMemberController->insertMember($args);
$msg_code = 'success_registed';
} else {
$output = $oMemberController->updateMember($args);
$msg_code = 'success_updated';
}
$output = $oMemberController->insertMember($args);
$msg_code = 'success_registed';
} else {
$output = $oMemberController->updateMember($args);
$msg_code = 'success_updated';
}
if(!$output->toBool()) return $output;
// Save Signature
$signature = Context::get('signature');
$oMemberController->putSignature($args->member_srl, $signature);
// Return result
$this->add('member_srl', $args->member_srl);
$this->setMessage($msg_code);
if(!$output->toBool()) return $output;
// Save Signature
$signature = Context::get('signature');
$oMemberController->putSignature($args->member_srl, $signature);
// Return result
$this->add('member_srl', $args->member_srl);
$this->setMessage($msg_code);
$profile_image = $_FILES['profile_image'];
if (is_uploaded_file($profile_image['tmp_name'])){
@ -227,13 +227,15 @@
$this->_createFindAccountByQuestion($args->identifier);
}
$output = $oModuleController->updateModuleConfig('member', $args);
// default setting end
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
// default setting end
$this->setMessage('success_updated');
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');
$this->setRedirectUrl($returnUrl);
return;
}
}
}
function _createSignupRuleset($signupForm, $agreement = null){
@ -808,6 +810,8 @@
$output = $this->insertGroup($update_args);
}
$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');
$this->setRedirectUrl($returnUrl);