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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,16 +101,20 @@
*
* @return void
**/
function dispMemberAdminConfig() {
global $lang; // retrieve configuration via module model instance
function dispMemberAdminConfig()
{
$oModuleModel = &getModel('module');
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
Context::set('config',$config);
// Get a layout list
$oLayoutModel = &getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
// list of skins for member module
$skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list', $skin_list);
@ -131,9 +135,27 @@
$editor = $oEditorModel->getEditor(0, $option);
Context::set('editor', $editor);
// get denied ID list
$denied_list = $oMemberModel->getDeniedIDs();
Context::set('deniedIDs', $denied_list);
$signupForm = $config->signupForm;
foreach($signupForm as $val)
{
if($val->name == 'user_id')
{
$userIdInfo = $val;
break;
}
}
if($userIdInfo->isUse)
{
// get denied ID list
Context::set('useUserID', 1);
$denied_list = $oMemberModel->getDeniedIDs();
Context::set('deniedIDs', $denied_list);
}
// get denied NickName List
$deniedNickNames = $oMemberModel->getDeniedNickNames();
Context::set('deniedNickNames', $deniedNickNames);
$security = new Security();
$security->encodeHTML('config..');
@ -313,7 +335,7 @@
$extentionReplace = array('tel_0' => $extendForm->value[0],
'tel_1' => $extendForm->value[1],
'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" />';
$template = '<input type="text" name="%column_name%[]" value="%tel_0%" size="4" maxlength="4" style="width:30px" />-<input type="text" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:30px" />-<input type="text" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:30px" />';
}elseif($extendForm->column_type == 'textarea'){
$template = '<textarea name="%column_name%" rows="8" cols="42">%value%</textarea>';
}elseif($extendForm->column_type == 'checkbox'){