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

fixed install message css error

Browse source 
remove whitespace in member info
error install member module (created rulset file)
error null check memberInfo 


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9504 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-10-06 03:00:39 +00:00
parent 51a84b0148
commit 3ff9d7af44
6 changed files with 72 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/install/tpl/css/install.css
View file

@ -112,16 +112,5 @@ html{height:100%;background:url(../img/bgHtml.gif) repeat-x 0 0}
.agreement a{color:#6CF;text-decoration:underline;vertical-align:middle}
.agreement em{color:#f60}
.agreement p{line-height:1.5}
/* Message */
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}
body>.message{margin:1em}
.message p{margin:1em 0 !important}
.message em{font-style:normal;color:#e00}
.message.info,
.message.error,
.message.update{padding-left:55px}
.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em}
.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em}
.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em}
/* Waiting for server response */
.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px}

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

@ -61,6 +61,15 @@
if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
}
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
foreach($checkInfos as $val){
if(isset($args->{$val})){
$args->{$val} = str_replace($replaceStr, '', $args->{$val});
}
}
$oMemberController = &getController('member');
// Execute insert or update depending on the value of member_srl
if(!$args->member_srl) {
@ -239,10 +248,14 @@
foreach($signupForm as $formInfo){
if ($formInfo->required || $formInfo->mustRequired){
if($formInfo->name == 'password')
$fields[] = '<field name="password" ><if test="$act == \'procMemberInsert\'" attr="required" value="true" /></field>';
$fields[] = '<field name="password" length="3:20" ><if test="$act == \'procMemberInsert\'" attr="required" value="true" /></field>';
else if($formInfo->name == 'find_account_question'){
$fields[] = '<field name="find_account_question" required="true" />';
$fields[] = '<field name="find_account_answer" required="true" />';
$fields[] = '<field name="find_account_answer" required="true" length=":250"/>';
}else if($formInfo->name == 'email_address'){
$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
}else if($formInfo->name == 'user_id'){
$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
}else{
$fields[] = sprintf('<field name="%s" required="true" />', $formInfo->name);
}
@ -271,11 +284,11 @@
$fields[] = '<field name="password" required="true" />';
$xml_buff = sprintf($buff, implode('', $fields));
filehandler::writefile($xml_file, $xml_buff);
Filehandler::writeFile($xml_file, $xml_buff);
$validator = new validator($xml_file);
$validator->setcachedir('files/cache');
$validator->getjspath();
$validator = new Validator($xml_file);
$validator->setCacheDir('files/cache');
$validator->getJsPath();
}
function _createFindAccountByQuestion($identifier){
@ -296,11 +309,11 @@
$fields[] = '<field name="find_account_answer" required="true" length=":250"/>';
$xml_buff = sprintf($buff, implode('', $fields));
filehandler::writefile($xml_file, $xml_buff);
Filehandler::writeFile($xml_file, $xml_buff);
$validator = new validator($xml_file);
$validator->setcachedir('files/cache');
$validator->getjspath();
$validator = new Validator($xml_file);
$validator->setCacheDir('files/cache');
$validator->getJsPath();
}
/**

5
modules/member/member.admin.view.php
View file

@ -56,6 +56,7 @@
$config = $oMemberModel->getMemberConfig();
$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
$usedIdentifiers = array();
foreach($config->signupForm as $signupItem){
if (!count($memberIdentifiers)) break;
if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse)){
@ -190,7 +191,9 @@
function _getMemberInputTag($memberInfo){
$oMemberModel = &getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
$memberInfo = get_object_vars($memberInfo);
if ($memberInfo)
$memberInfo = get_object_vars($memberInfo);
$member_config = $oMemberModel->getMemberConfig();
$formTags = array();
global $lang;

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

@ -56,14 +56,9 @@
global $lang;
$oMemberModel = &getModel('member');
$extendItems = $oMemberModel->getJoinFormList();
$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');
$orgRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$orgUse = array('email_address', 'nick_name', 'password', 'find_account_question');
$list_order = array();
foreach($items as $key){
unset($signupItem);
@ -72,8 +67,8 @@
$signupItem->title = $lang->{$key};
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = in_array($key, $orgRequireds);
$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
$signupItem->required = $signupItem->mustRequired;
$signupItem->isUse = $signupItem->mustRequired;
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
@ -84,32 +79,21 @@
else
$list_order[] = $signupItem;
}
if (is_array($extendItems)){
foreach($extendItems as $form_srl=>$item_info){
unset($signupItem);
$signupItem->name = $item_info->column_name;
$signupItem->title = $item_info->column_title;
$signupItem->type = $item_info->column_type;
$signupItem->member_join_form_srl = $form_srl;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->required = ($item_info->required == 'Y');
$signupItem->isUse = ($item_info->is_active == 'Y');
$signupItem->description = $item_info->description;
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
}
$list_order[] = $signupItem;
}
}
$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)) {
// Set an administrator, regular member(group1), and associate member(group2)
@ -202,6 +186,10 @@
// check signup form ordering info
if (!$config->signupForm) 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;
return false;
}
@ -326,6 +314,16 @@
$output = $oModuleController->updateModuleConfig('member', $config);
}
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController = &getAdminController('member');
if (!is_readable('./files/ruleset/insertMember.xml'))
$oMemberAdminController->_createSignupRuleset($config->signupForm);
if (!is_readable('./files/ruleset/login.xml'))
$oMemberAdminController->_createLoginRuleset($config->identifier);
if (!is_readable('./files/ruleset/find_member_account_by_question.xml'))
$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
return new Object(0, 'success_updated');
}

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

@ -523,6 +523,15 @@
if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
if (!$args->user_name) $args->user_name = $args->member_srl;
if (!$args->nick_name) $args->nick_name = $args->member_srl;
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
foreach($checkInfos as $val){
if(isset($args->{$val})){
$args->{$val} = str_replace($replaceStr, '', $args->{$val});
}
}
$output = $this->insertMember($args);
if(!$output->toBool()) return $output;
@ -600,6 +609,15 @@
$args->extra_vars = serialize($extra_vars);
// Create a member model object
$oMemberModel = &getModel('member');
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
foreach($checkInfos as $val){
if(isset($args->{$val})){
$args->{$val} = str_replace($replaceStr, '', $args->{$val});
}
}
// Execute insert or update depending on the value of member_srl
$output = $this->updateMember($args);
if(!$output->toBool()) return $output;

4
modules/module/module.class.php
View file

@ -20,6 +20,7 @@
// Create a directory to use in the module module
FileHandler::makeDir('./files/cache/module_info');
FileHandler::makeDir('./files/cache/triggers');
FileHandler::makeDir('./files/ruleset');
// Insert site information into the sites table
$args->site_srl = 0;
$output = $oDB->executeQuery('module.getSite', $args);
@ -76,6 +77,8 @@
if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
if(!is_dir('./files/ruleset')) return true;
return false;
}
@ -311,6 +314,7 @@
if(!$oDB->isColumnExists("module_config", "site_srl")){
$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
}
FileHandler::makeDir('./files/ruleset');
return new Object(0, 'success_updated');
}