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

Add status column to member table #1806 #1896

Browse source
This commit is contained in:
Kijin Sung 2023-06-20 23:47:40 +09:00
parent c3fdee7350
commit 26a0ec66ff
16 changed files with 196 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,9 +29,9 @@ class MemberAdminController extends Member
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','is_admin','denied','status','description','group_srl_list','limit_date');
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig ();
$config = $oMemberModel->getMemberConfig();
$getVars = array();
if($config->signupForm)
{
@ -80,7 +80,7 @@ class MemberAdminController extends Member
{
$output = executeQuery('member.getMemberInfoByMemberSrl', ['member_srl' => $args->member_srl], ['extra_vars']);
$extra_vars = ($output->data && $output->data->extra_vars) ? unserialize($output->data->extra_vars) : new stdClass;
foreach($this->nouse_extra_vars as $key)
foreach(self::NOUSE_EXTRA_VARS as $key)
{
unset($extra_vars->$key);
}
@ -99,12 +99,22 @@ class MemberAdminController extends Member
$extra_vars->{$formInfo->name} = $all_args->{$formInfo->name};
}
}
foreach($this->admin_extra_vars as $key)
foreach(self::ADMIN_EXTRA_VARS as $key)
{
$extra_vars->{$key} = escape(utf8_clean($all_args->{$key} ?? ''));
}
$args->extra_vars = serialize($extra_vars);
// Normalize denied and status columns
if ($args->status === 'APPROVED')
{
$args->denied = 'N';
}
else
{
$args->denied = 'Y';
}
// Delete invalid or past limit dates #1334
if (!isset($args->limit_date))
{
@ -1030,6 +1040,7 @@ class MemberAdminController extends Member
if($var->denied)
{
$args->denied = $var->denied;
$args->status = $var->denied === 'Y' ? 'DENIED' : 'APPROVED';
$output = executeQuery('member.updateMemberDeniedInfo', $args);
if(!$output->toBool())
{