Fix #1334 hide limit_date if it's in the past

This commit is contained in:
Kijin Sung 2020-07-02 16:22:35 +09:00
parent dd603639e0
commit 10d15b3470
2 changed files with 15 additions and 1 deletions

View file

@ -98,10 +98,19 @@ class memberAdminController extends member
unset($all_args->use_editor);
unset($all_args->use_html);
unset($all_args->reset_password);
if(!isset($args->limit_date)) $args->limit_date = "";
$extra_vars = delObjectVars($all_args, $args);
$args->extra_vars = serialize($extra_vars);
// Delete invalid or past limit dates #1334
if (!isset($args->limit_date))
{
$args->limit_date = '';
}
elseif ($args->limit_date < date('Ymd'))
{
$args->limit_date = '';
}
// remove whitespace
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
foreach($checkInfos as $val)

View file

@ -461,6 +461,11 @@ class memberAdminView extends member
$identifierForm->value = $member_info->{$member_config->identifier};
Context::set('identifierForm', $identifierForm);
if ($member_info->limit_date < date('Ymd'))
{
$member_info->limit_date = '';
}
$member_unauthenticated = false;
if ($member_info->member_srl && $member_info->denied !== 'N')
{