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

Fix #469 show warning if email confirmation is required

Browse source
This commit is contained in:
Kijin Sung 2016-06-08 23:34:16 +09:00
parent 6f527cc2ad
commit 614cc6e8d1
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/member/lang/en.php
View file

@ -46,6 +46,7 @@ $lang->enable_join = 'Accept New Members';
$lang->enable_confirm = 'Email Activation';
$lang->enable_find_account_question = 'Account recovery using question/answer';
$lang->enable_ssl = 'Enable SSL';
$lang->msg_email_confirmation_required = 'A confirmation e-mail will be sent. Please check your email address carefully.';
$lang->security_sign_in = 'Sign in using enhanced security';
$lang->limit_day = 'Temporary Limit Date';
$lang->limit_day_description = 'Description for Temporary Limit Date';

1
modules/member/lang/ko.php
View file

@ -46,6 +46,7 @@ $lang->enable_join = '회원 가입 허가';
$lang->enable_confirm = '메일 인증 사용';
$lang->enable_find_account_question = '질문/답변 인증 사용';
$lang->enable_ssl = 'SSL 기능 사용';
$lang->msg_email_confirmation_required = '인증 메일이 발송되니 정확하게 입력해 주시기 바랍니다.';
$lang->security_sign_in = '보안로그인 사용';
$lang->limit_day = '임시 제한 일자';
$lang->limit_day_description = '임시 제한 일자 설명';

2
modules/member/member.view.php
View file

@ -208,7 +208,7 @@ class memberView extends member
$oMemberAdminView = getAdminView('member');
$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
Context::set('formTags', $formTags);
Context::set('email_confirmation_required', $member_config->enable_confirm);
// Editor of the module set for signing by calling getEditor
foreach($formTags as $formTag) {

12
modules/member/skins/default/signup_form.html
View file

@ -26,6 +26,9 @@
<label for="{$identifierForm->name}" class="control-label"><em style="color:red">*</em> {$identifierForm->title}</label>
<div class="controls">
<input type="text"|cond="$identifierForm->name!='email_address'" type="email"|cond="$identifierForm->name=='email_address'" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" required />
<p class="help-inline" cond="$identifierForm->name == 'email_address' && $email_confirmation_required == 'Y'">
{$lang->msg_email_confirmation_required}
</p>
</div>
</div>
<div class="control-group">
@ -43,8 +46,13 @@
</div>
<div class="control-group" loop="$formTags=>$formTag">
<label for="{$formTag->name}" class="control-label">{$formTag->title}</label>
<div class="controls" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
<div class="controls" cond="$formTag->name =='signature'">
<div class="controls" cond="$formTag->name != 'signature'">
{$formTag->inputTag}
<p class="help-inline" cond="$formTag->name == 'email_address' && $email_confirmation_required == 'Y'">
{$lang->msg_email_confirmation_required}
</p>
</div>
<div class="controls" cond="$formTag->name == 'signature'">
<input type="hidden" name="signature" value="" />
{$editor}
<style scoped>