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

Fix #1209 승인 거부된 회원과 이메일 미인증 회원을 구분

Browse source
This commit is contained in:
Kijin Sung 2019-11-23 11:15:31 +09:00
parent aba1830fb3
commit 726709f2fc
6 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -341,3 +341,4 @@ $lang->cmd_recent_visit = 'Recent Visit';
$lang->scrap_folder_create = 'New Folder';
$lang->scrap_folder_rename = 'Rename';
$lang->scrap_folder_delete = 'Delete';
$lang->member_unauthenticated = 'Unauthenticated';

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

@ -361,3 +361,4 @@ $lang->cmd_recent_visit = '최근 방문';
$lang->scrap_folder_create = '폴더 추가';
$lang->scrap_folder_rename = '이름 변경';
$lang->scrap_folder_delete = '삭제';
$lang->member_unauthenticated = '미인증';

40
modules/member/member.admin.view.php
View file

@ -116,12 +116,36 @@ class memberAdminView extends member
}
}
}
// Get list of new members who have not completed email auth
$check_list = array();
foreach ($output->data as $member)
{
if ($member->denied !== 'N')
{
$check_list[$member->member_srl] = false;
}
}
if (count($check_list))
{
$args2 = new stdClass;
$args2->member_srl = array_keys($check_list);
$output2 = executeQueryArray('member.getAuthMailType', $args2);
foreach ($output2->data as $item)
{
if ($item->is_register === 'Y')
{
$check_list[$item->member_srl] = true;
}
}
}
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
Context::set('page', $output->page);
Context::set('member_config', $oMemberModel->getMemberConfig());
Context::set('member_list', $output->data);
Context::set('new_member_check_list', $check_list);
Context::set('usedIdentifiers', $usedIdentifiers);
Context::set('page_navigation', $output->page_navigation);
Context::set('profileImageConfig', $config->profile_image);
@ -437,6 +461,22 @@ class memberAdminView extends member
$identifierForm->value = $member_info->{$member_config->identifier};
Context::set('identifierForm', $identifierForm);
$member_unauthenticated = false;
if ($member_info->member_srl && $member_info->denied !== 'N')
{
$args2 = new stdClass;
$args2->member_srl = $member_info->member_srl;
$output2 = executeQueryArray('member.getAuthMailType', $args2);
foreach ($output2->data as $item)
{
if ($item->is_register === 'Y')
{
$member_unauthenticated = true;
}
}
}
Context::set('member_unauthenticated', $member_unauthenticated);
$this->setTemplateFile('insert_member');
}

12
modules/member/queries/getAuthMailType.xml Normal file
View file

@ -0,0 +1,12 @@
<query id="getAuthMailType" action="select">
<tables>
<table name="member_auth_mail" />
</tables>
<columns>
<column name="member_srl" />
<column name="is_register" />
</columns>
<conditions>
<condition operation="in" column="member_srl" var="member_srl" notnull="notnull" />
</conditions>
</query>

7
modules/member/tpl/insert_member.html
View file

@ -72,8 +72,11 @@
<div class="x_control-group" cond="$member_srl">
<label class="x_control-label">{$lang->status}</label>
<div class="x_controls">
<label class="x_inline" for="appoval"><input type="radio" name="denied" id="appoval" value="N" checked="checked"|cond="$member_info->denied != 'Y'" > {$lang->approval}</label>
<label class="x_inline" for="deny"><input type="radio" name="denied" id="deny" value="Y" checked="checked"|cond="$member_info->denied == 'Y'" > {$lang->denied}</label>
<label class="x_inline" for="appoval"><input type="radio" name="denied" id="appoval" value="N" checked="checked"|cond="$member_info->denied == 'N'" /> {$lang->approval}</label>
<label class="x_inline" for="deny"><input type="radio" name="denied" id="deny" value="Y" checked="checked"|cond="$member_info->denied == 'Y' && !$member_unauthenticated" disabled="disabled"|cond="$member_unauthenticated" /> {$lang->denied}</label>
<!--@if($member_unauthenticated)-->
<label class="x_inline" for="deny2"><input type="radio" name="denied" id="deny2" value="Y" checked="checked"|cond="$member_info->denied == 'Y' && $member_unauthenticated" /> {$lang->member_unauthenticated}</label>
<!--@endif-->
</div>
</div>
<div class="x_control-group div_refused_reason">

6
modules/member/tpl/member_list.html
View file

@ -74,7 +74,11 @@
</td>
<td class="nowr">
<!--@if($member_info['denied']=='Y')-->
<span style="color:red;">{$lang->denied}</span>
<!--@if(isset($new_member_check_list[$member_info['member_srl']]) && $new_member_check_list[$member_info['member_srl']])-->
<span style="color:red;">{$lang->member_unauthenticated}</span>
<!--@else-->
<span style="color:red;">{$lang->denied}</span>
<!--@endif-->
<!--@elseif($member_info['limit_date'] && substr($member_info['limit_date'], 0, 8) >= date('Ymd'))-->
<span style="color:red;">{$lang->member_limited}</span>
<!--@else-->