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

issue 2138 agreement data save file type (in ./files/member_extra_info/agreement.txt).

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10876 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-07-12 09:29:49 +00:00
parent ec06013652
commit 7d48d18252
2 changed files with 67 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

99
modules/member/member.class.php
View file

@ -67,43 +67,46 @@
global $lang;
$oMemberModel = &getModel('member');
$identifier = 'email_address';
$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$list_order = array();
foreach($items as $key){
unset($signupItem);
$signupItem->isDefaultForm = true;
$signupItem->name = $key;
$signupItem->title = $key;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = $signupItem->mustRequired;
$signupItem->isUse = $signupItem->mustRequired;
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
// Create a member controller object
$oMemberController = &getController('member');
$oMemberAdminController = &getAdminController('member');
if(!$args->signupForm || !is_array($args->signupForm))
{
$identifier = 'email_address';
$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$list_order = array();
foreach($items as $key){
unset($signupItem);
$signupItem->isDefaultForm = true;
$signupItem->name = $key;
$signupItem->title = $key;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = $signupItem->mustRequired;
$signupItem->isUse = $signupItem->mustRequired;
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
}
if ($signupItem->isIdentifier)
array_unshift($list_order, $signupItem);
else
$list_order[] = $signupItem;
}
if ($signupItem->isIdentifier)
array_unshift($list_order, $signupItem);
else
$list_order[] = $signupItem;
$args->signupForm = $list_order;
$args->identifier = $identifier;
$oModuleController->insertModuleConfig('member',$args);
// Create Ruleset File
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController->_createSignupRuleset($args->signupForm);
$oMemberAdminController->_createLoginRuleset($args->identifier);
$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
}
$args->signupForm = $list_order;
$args->identifier = $identifier;
$oModuleController->insertModuleConfig('member',$args);
// Create a member controller object
$oMemberController = &getController('member');
$oMemberAdminController = &getAdminController('member');
// Create Ruleset File
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController->_createSignupRuleset($args->signupForm);
$oMemberAdminController->_createLoginRuleset($args->identifier);
$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
$groups = $oMemberModel->getGroups();
if(!count($groups)) {
@ -193,11 +196,14 @@
if(!$oDB->isColumnExists("member", "list_order")) return true;
if(!$oDB->isIndexExists("member","idx_list_order")) return true;
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// check signup form ordering info
if (!$config->signupForm) return true;
// check agreement field exist
if ($config->agreement) return true;
if (!is_readable('./files/ruleset/insertMember.xml')) return true;
if (!is_readable('./files/ruleset/login.xml')) return true;
if (!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
@ -270,13 +276,24 @@
$oDB->addIndex("member","idx_list_order", array("list_order"));
}
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
$oModuleController = &getController('module');
// check agreement value exist
if($config->agreement)
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
$output = FileHandler::writeFile($agreement_file, $config->agreement);
unset($config->agreement);
$output = $oModuleController->updateModuleConfig('member', $config);
}
// check signup form ordering info
if (!$config->signupForm || !is_array($config->signupForm)){
global $lang;
$oModuleController = &getController('module');
$oMemberModel = &getModel('member');
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
@ -325,9 +342,9 @@
}
$config->signupForm = $list_order;
$config->identifier = $identifier;
unset($config->agreement);
$output = $oModuleController->updateModuleConfig('member', $config);
}
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController = &getAdminController('member');