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

Ensure consistent handling of non-numeric symbols in phone numbers and country codes

Browse source
This commit is contained in:
Kijin Sung 2019-08-03 22:16:32 +09:00
parent 2029a6357e
commit 2cde47c5d1
2 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -568,7 +568,7 @@ class memberAdminView extends member
{
if($country->calling_code)
{
$inputTag .= '<option value="' . $country->calling_code . '"' . ($country->calling_code === $match_country ? ' selected="selected"' : '') . '>';
$inputTag .= '<option value="' . $country->calling_code . '"' . (str_replace('-', '', $country->calling_code) === $match_country ? ' selected="selected"' : '') . '>';
$inputTag .= escape(Context::get('lang_type') === 'ko' ? $country->name_korean : $country->name_english) . ' (+' . $country->calling_code . ')</option>';
}
}

40
modules/member/member.controller.php
View file

@ -623,7 +623,7 @@ class memberController extends member
}
if ($val === 'phone_number')
{
$args->phone_country = trim(preg_replace('/[^0-9-]/', '', Context::get('phone_country')), '-');
$args->phone_country = preg_replace('/[^0-9]/', '', Context::get('phone_country'));
}
}
@ -865,7 +865,7 @@ class memberController extends member
}
if ($val === 'phone_number')
{
$args->phone_country = trim(preg_replace('/[^0-9-]/', '', Context::get('phone_country')), '-');
$args->phone_country = preg_replace('/[^0-9-]/', '', Context::get('phone_country'));
}
}
@ -2144,24 +2144,24 @@ class memberController extends member
{
if(preg_match('/^\+([0-9-]+)\.([0-9.-]+)$/', $user_id, $matches))
{
$phone_country = preg_replace('/[^0-9]/', '', $matches[1]);
$user_id = preg_replace('/[^0-9]/', '', $matches[2]);
$user_id = $matches[2];
$phone_country = $matches[1];
if($config->phone_number_hide_country === 'Y')
{
$phone_country = $config->phone_number_default_country;
}
}
elseif($config->phone_number_default_country)
{
$phone_country = $config->phone_number_default_country;
$user_id = preg_replace('/[^0-9]/', '', $user_id);
}
else
{
return $this->recordLoginError(-1, 'invalid_user_id');
}
if($config->phone_number_hide_country)
{
$phone_country = $config->phone_number_default_country;
}
$user_id = preg_replace('/[^0-9]/', '', $user_id);
$phone_country = preg_replace('/[^0-9]/', '', $phone_country);
$member_info = $oMemberModel->getMemberInfoByPhoneNumber($user_id, $phone_country);
if(!$user_id || strtolower($member_info->phone_number) !== $user_id)
{
@ -2565,16 +2565,14 @@ class memberController extends member
$args->phone_country = trim(preg_replace('/[^0-9-]/', '', $args->phone_country), '-');
$args->phone_number = preg_replace('/[^0-9]/', '', $args->phone_number);
$args->phone_type = '';
if ($config->phone_number_hide_country || (!$args->phone_country && $config->phone_number_default_country))
if ($config->phone_number_hide_country === 'Y' || (!$args->phone_country && $config->phone_number_default_country))
{
$args->phone_country = $config->phone_number_default_country;
}
if ($args->phone_country == '82')
$args->phone_country = str_replace('-', '', $args->phone_country);
if ($args->phone_country == '82' && !Rhymix\Framework\Korea::isValidPhoneNumber($args->phone_number))
{
if (!Rhymix\Framework\Korea::isValidPhoneNumber($args->phone_number))
{
$args->phone_number = Rhymix\Framework\Korea::formatPhoneNumber($args->phone_number);
}
return new BaseObject(-1, 'msg_invalid_phone_number');
}
}
else
@ -2790,16 +2788,14 @@ class memberController extends member
$args->phone_country = trim(preg_replace('/[^0-9-]/', '', $args->phone_country), '-');
$args->phone_number = preg_replace('/[^0-9]/', '', $args->phone_number);
$args->phone_type = '';
if ($config->phone_number_hide_country || (!$args->phone_country && $config->phone_number_default_country))
if ($config->phone_number_hide_country === 'Y' || (!$args->phone_country && $config->phone_number_default_country))
{
$args->phone_country = $config->phone_number_default_country;
}
if ($args->phone_country == '82')
$args->phone_country = str_replace('-', '', $args->phone_country);
if ($args->phone_country == '82' && !Rhymix\Framework\Korea::isValidPhoneNumber($args->phone_number))
{
if (!Rhymix\Framework\Korea::isValidPhoneNumber($args->phone_number))
{
return new BaseObject(-1, 'msg_invalid_phone_number');
}
return new BaseObject(-1, 'msg_invalid_phone_number');
}
}
else