From 3ff7552ef9be3f43778fbef96f14bd1c4e76fd83 Mon Sep 17 00:00:00 2001 From: devjin Date: Mon, 6 Aug 2012 09:34:35 +0000 Subject: [PATCH] add a function that created signupform. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@10983 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.admin.controller.php | 55 ++++++++++++++++ modules/member/member.admin.view.php | 4 +- modules/member/member.class.php | 77 ++-------------------- 3 files changed, 61 insertions(+), 75 deletions(-) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index ce1551a7e..2b488272f 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -250,6 +250,61 @@ $this->setRedirectUrl($returnUrl); } + function createSignupForm($identifier) + { + global $lang; + $oMemberModel = &getModel('member'); + + // 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', 'nick_name','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 = $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->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 (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; + } + } + + return $list_order; + } + /** * Create ruleset file of signup * @param object $signupForm (user define signup form) diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index d00f31778..04d948b5f 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -106,9 +106,7 @@ $oModuleModel = &getModel('module'); $oMemberModel = &getModel('member'); $config = $oMemberModel->getMemberConfig(); - // Get join form list which is additionally set - $extendItems = $oMemberModel->getJoinFormList(); - + Context::set('config',$config); // list of skins for member module diff --git a/modules/member/member.class.php b/modules/member/member.class.php index c538b1ead..0c91d49cb 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -83,29 +83,8 @@ 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; - } - $args->signupForm = $list_order; + + $args->signupForm = $oMemberAdminController->createSignupForm($identifier); $args->identifier = $identifier; $oModuleController->insertModuleConfig('member',$args); @@ -302,57 +281,12 @@ $output = $oModuleController->updateModuleConfig('member', $config); } + $oMemberAdminController = &getAdminController('member'); // check signup form ordering info if (!$config->signupForm || !is_array($config->signupForm)){ - global $lang; - $oMemberModel = &getModel('member'); - // Get join form list which is additionally set - $extendItems = $oMemberModel->getJoinFormList(); - $identifier = 'user_id'; - $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', '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 = $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->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 (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; + + $config->signupForm = $oMemberAdminController->createSignupForm($identifier); $config->identifier = $identifier; unset($config->agreement); $output = $oModuleController->updateModuleConfig('member', $config); @@ -367,7 +301,6 @@ } 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'))