From 06cf8adc3558f32f6ba9c5f774eb08fe47c478a9 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Fri, 1 Feb 2013 02:01:55 +0000
Subject: [PATCH] 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
---
 modules/member/lang/lang.xml               |  4 ++++
 modules/member/member.admin.controller.php | 11 ++++++-----
 modules/member/tpl/default_config.html     |  8 ++++++++
 modules/member/tpl/signup_config.html      |  8 --------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml
index 61da90941..dfa7dcc16 100644
--- a/modules/member/lang/lang.xml
+++ b/modules/member/lang/lang.xml
@@ -662,6 +662,10 @@
 		<value xml:lang="tr"><![CDATA[Giriş yapmış Kullanıcılar]]></value>
 		<value xml:lang="vi"><![CDATA[Thành viên đăng nhập]]></value>
 	</item>
+	<item name="msg_mail_authorization">
+		<value xml:lang="ko"><![CDATA[메일 인증을 사용하려면 웸마스터의 이름과 메일주소가 유효해야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[메일 인증을 사용하려면 웸마스터의 이름과 메일주소가 유효해야 합니다.]]></value>
+	</item>
 	<item name="webmaster_name">
 		<value xml:lang="ko"><![CDATA[웹마스터 이름]]></value>
 		<value xml:lang="en"><![CDATA[Webmaster Name]]></value>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 5e30953ff..e37856a8b 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -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)))
 		{
diff --git a/modules/member/tpl/default_config.html b/modules/member/tpl/default_config.html
index 6bcb4b69d..360d007d1 100644
--- a/modules/member/tpl/default_config.html
+++ b/modules/member/tpl/default_config.html
@@ -11,6 +11,14 @@
 			<label class="x_inline" for="enable_join_no"><input type="radio" name="enable_join" id="enable_join_no" value="N" checked="checked"|cond="$config->enable_join != 'Y'" /> {$lang->cmd_no}</label>
 		</div>
 	</div>
+	<div class="x_control-group">
+		<div class="x_control-label">{$lang->enable_confirm}</div>
+		<div class="x_controls">
+			<label class="x_inline" for="enable_confirm_yes"><input type="radio" name="enable_confirm" id="enable_confirm_yes" value="Y" checked="checked"|cond="$config->enable_confirm == 'Y'" /> {$lang->cmd_yes}</label>
+			<label class="x_inline" for="enable_confirm_no"><input type="radio" name="enable_confirm" id="enable_confirm_no" value="N" checked="checked"|cond="$config->enable_confirm != 'Y'"/> {$lang->cmd_no}</label>
+			<p class="x_help-block">{$lang->about_enable_confirm}</p>
+		</div>
+	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="webmaster_name">{$lang->webmaster_name}</label>
 		<div class="x_controls">
diff --git a/modules/member/tpl/signup_config.html b/modules/member/tpl/signup_config.html
index 4151cd415..ac77d81ee 100644
--- a/modules/member/tpl/signup_config.html
+++ b/modules/member/tpl/signup_config.html
@@ -13,14 +13,6 @@
 	<input type="hidden" name="act" value="procMemberAdminInsertSignupConfig" />
 	<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
 	<input type="hidden" name="agreement" value="{$config->agreement}" />
-	<div class="x_control-group">
-		<div class="x_control-label">{$lang->enable_confirm}</div>
-		<div class="x_controls">
-			<label class="x_inline" for="enable_confirm_yes"><input type="radio" name="enable_confirm" id="enable_confirm_yes" value="Y" checked="checked"|cond="$config->enable_confirm == 'Y'" /> {$lang->cmd_yes}</label>
-			<label class="x_inline" for="enable_confirm_no"><input type="radio" name="enable_confirm" id="enable_confirm_no" value="N" checked="checked"|cond="$config->enable_confirm != 'Y'"/> {$lang->cmd_no}</label>
-			<p class="x_help-block">{$lang->about_enable_confirm}</p>
-		</div>
-	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="limit_day">{$lang->limit_day}</label>
 		<div class="x_controls">