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

issue 2856 move enable_confirm field to default config

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
modules/member/lang/lang.xml
View file

@ -662,6 +662,10 @@
<value xml:lang="tr"><![CDATA[Giriş yapmış Kullanıcılar]]></value> <value xml:lang="tr"><![CDATA[Giriş yapmış Kullanıcılar]]></value>
<value xml:lang="vi"><![CDATA[Thành viên đăng nhập]]></value> <value xml:lang="vi"><![CDATA[Thành viên đăng nhập]]></value>
</item> </item>
<item name="msg_mail_authorization">
<value xml:lang="ko"><![CDATA[메일 인증을 사용하려면 웸마스터의 이름과 메일주소가 유효해야 합니다.]]></value>
<value xml:lang="en"><![CDATA[메일 인증을 사용하려면 웸마스터의 이름과 메일주소가 유효해야 합니다.]]></value>
</item>
<item name="webmaster_name"> <item name="webmaster_name">
<value xml:lang="ko"><![CDATA[웹마스터 이름]]></value> <value xml:lang="ko"><![CDATA[웹마스터 이름]]></value>
<value xml:lang="en"><![CDATA[Webmaster Name]]></value> <value xml:lang="en"><![CDATA[Webmaster Name]]></value>

11
modules/member/member.admin.controller.php
View file

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

8
modules/member/tpl/default_config.html
View file

@ -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> <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> </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"> <div class="x_control-group">
<label class="x_control-label" for="webmaster_name">{$lang->webmaster_name}</label> <label class="x_control-label" for="webmaster_name">{$lang->webmaster_name}</label>
<div class="x_controls"> <div class="x_controls">

8
modules/member/tpl/signup_config.html
View file

@ -13,14 +13,6 @@
<input type="hidden" name="act" value="procMemberAdminInsertSignupConfig" /> <input type="hidden" name="act" value="procMemberAdminInsertSignupConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" /> <input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
<input type="hidden" name="agreement" value="{$config->agreement}" /> <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"> <div class="x_control-group">
<label class="x_control-label" for="limit_day">{$lang->limit_day}</label> <label class="x_control-label" for="limit_day">{$lang->limit_day}</label>
<div class="x_controls"> <div class="x_controls">