issue 2856 move enable_confirm field to default config

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12655 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2013-02-01 02:01:55 +00:00
parent 4f98afb467
commit 06cf8adc35
4 changed files with 18 additions and 13 deletions

View file

@ -146,10 +146,16 @@ class memberAdminController extends member
{
$args = Context::gets(
'enable_join',
'enable_confirm',
'webmaster_name',
'webmaster_email'
);
if((!$args->webmaster_name || !$args->webmaster_email) && $args->enable_confirm == 'Y')
{
return new Object(-1, 'msg_mail_authorization');
}
$oModuleController = getController('module');
$output = $oModuleController->updateModuleConfig('member', $args);
@ -166,7 +172,6 @@ class memberAdminController extends member
$oModuleController = getController('module');
$args = Context::gets(
'enable_confirm',
'limit_day',
'agreement',
'redirect_url',
@ -180,10 +185,6 @@ class memberAdminController extends member
$usable_list = Context::get('usable_list');
$all_args = Context::getRequestVars();
if($args->enable_confirm !='Y')
{
$args->enable_confirm = 'N';
}
$args->limit_day = (int)$args->limit_day;
if(!trim(strip_tags($args->agreement)))
{