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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,6 @@
$security = new Security();
$security->encodeHTML('member_config..');
$security->encodeHTML('memberInfo.user_name', 'memberInfo.nick_name', 'memberInfo.find_account_answer', 'memberInfo.description','memberInfo.group_list..');
$security->encodeHTML('extend_form_list...');
$this->setTemplateFile('member_info');
@ -178,7 +177,7 @@
$security->encodeHTML('extend_form_list..');
$security->encodeHTML('extend_form_list..default_value.');
$formTags = $this->_getMemberInputTag($memberInfo);
$formTags = $this->_getMemberInputTag($memberInfo, true);
Context::set('formTags', $formTags);
$member_config = $oMemberModel->getMemberConfig();
@ -190,7 +189,7 @@
$this->setTemplateFile('insert_member');
}
function _getMemberInputTag($memberInfo){
function _getMemberInputTag($memberInfo, $isAdmin = false){
$oMemberModel = &getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
@ -205,8 +204,15 @@
if ($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
unset($formTag);
$inputTag = '';
$formTag->title = $formInfo->title;
if ($formInfo->required || $formInfo->mustRequired && $formInfo->name != 'password') $formTag->title = $formTag->title.' <em style="color:red">*</em>';
$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
if($isAdmin)
{
if($formInfo->mustRequired) $formTag->title = $formTag->title.' <em style="color:red">*</em>';
}
else
{
if ($formInfo->required && $formInfo->name != 'password') $formTag->title = $formTag->title.' <em style="color:red">*</em>';
}
$formTag->name = $formInfo->name;
if($formInfo->isDefaultForm){
@ -279,7 +285,7 @@
'tel_2' => $extendForm->value[2]);
$template = '<input type="text" name="%column_name%[]" value="%tel_0%" size="4" />-<input type="text" name="%column_name%[]" value="%tel_1%" size="4" />-<input type="text" name="%column_name%[]" value="%tel_2%" size="4" />';
}elseif($extendForm->column_type == 'textarea'){
$template = '<textarea name="%column_name%">%value%</textarea>';
$template = '<textarea name="%column_name%" rows="8" cols="42">%value%</textarea>';
}elseif($extendForm->column_type == 'checkbox'){
$template = '';
if($extendForm->default_value){