From a9cc4543fe940100d87de5c7f8d9cef659f8fbfd Mon Sep 17 00:00:00 2001 From: devjin Date: Mon, 5 Sep 2011 07:44:03 +0000 Subject: [PATCH] add member moduleconfig git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9028 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.admin.view.php | 83 ---------------------------- modules/member/member.class.php | 57 +++++++++++++++++++ 2 files changed, 57 insertions(+), 83 deletions(-) diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index a385a8860..200a35d45 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -90,46 +90,6 @@ // Get join form list which is additionally set $extendItems = $oMemberModel->getJoinFormList(); - // check signup form ordering info - if (!$config->signupForm || !is_array($config->signupForm)){ - $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', 'password', 'find_account_question'); - $orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name'); - $orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday'); - $list_order = array(); - foreach($items as $key){ - unset($signupItem); - $signupItem->isDefaultForm = true; - $signupItem->name = $key; - $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); - if ($signupItem->imageType){ - $signupItem->max_width = $config->{$key.'_max_width'}; - $signupItem->max_height = $config->{$key.'_max_height'}; - } - $list_order[] = $signupItem; - } - 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; - } - $config->signupForm = $list_order; - } Context::set('config',$config); // list of skins for member module @@ -212,49 +172,6 @@ $formTags = array(); global $lang; - if (!$member_config->signupForm || !is_array($member_config->signupForm)){ - $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', 'password', 'find_account_question'); - $orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name'); - $orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday'); - $list_order = array(); - foreach($items as $key){ - unset($signupItem); - $signupItem->isDefaultForm = true; - $signupItem->name = $key; - $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); - if ($signupItem->imageType){ - $signupItem->max_width = $config->{$key.'_max_width'}; - $signupItem->max_height = $config->{$key.'_max_height'}; - } - $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; - } - } - $member_config->signupForm = $list_order; - } - foreach($member_config->signupForm as $no=>$formInfo){ if (!$formInfo->isUse)continue; if ($formInfo->name == 'email_address') continue; diff --git a/modules/member/member.class.php b/modules/member/member.class.php index bf24732c5..2232d622e 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -147,6 +147,11 @@ if(!$oDB->isColumnExists("member", "list_order")) return true; if(!$oDB->isIndexExists("member","idx_list_order")) return true; + $oMemberModel = &getModel('member'); + $config = $oMemberModel->getMemberConfig(); + // check signup form ordering info + if (!$config->signupForm) return true; + return false; } @@ -213,6 +218,58 @@ $oDB->addIndex("member","idx_list_order", array("list_order")); } + $oMemberModel = &getModel('member'); + $config = $oMemberModel->getMemberConfig(); + + // check signup form ordering info + if (!$config->signupForm || !is_array($config->signupForm)){ + global $lang; + $oModuleController = &getController('module'); + // Get join form list which is additionally set + $extendItems = $oMemberModel->getJoinFormList(); + + $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', 'password', 'find_account_question'); + $orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name'); + $orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday'); + $list_order = array(); + foreach($items as $key){ + unset($signupItem); + $signupItem->isDefaultForm = true; + $signupItem->name = $key; + $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); + if ($signupItem->imageType){ + $signupItem->max_width = $config->{$key.'_max_width'}; + $signupItem->max_height = $config->{$key.'_max_height'}; + } + $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; + } + } + $config->signupForm = $list_order; + $output = $oModuleController->updateModuleConfig('member', $config); + } + return new Object(0, 'success_updated'); }