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

Fix unnecessary phone number verification when phone number is optional and user leaves it blank

Browse source
This commit is contained in:
Kijin Sung 2022-10-12 23:56:32 +09:00
parent 3012b0b4d7
commit b1eee629a2
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3742,9 +3742,20 @@ class memberController extends member
* @param object $original
* @return object
*/
protected function _checkPhoneNumber($config, $args, $mode = 'insert', $original = null)
protected function _checkPhoneNumber($config, &$args, $mode = 'insert', $original = null)
{
if ($config->phone_number_verify_by_sms === 'Y')
$required = false;
$verify = $config->phone_number_verify_by_sms === 'Y';
foreach ($config->signupForm as $formInfo)
{
if ($formInfo->name === 'phone_number' && $formInfo->isUse && $formInfo->required)
{
$required = true;
break;
}
}
if ($verify)
{
// Attempt to fill in the country code.
if ($config->phone_number_default_country && (!$args->phone_country || $config->phone_number_hide_country === 'Y'))
@ -3757,7 +3768,15 @@ class memberController extends member
}
if ($args->phone_country === 'KOR' && !Rhymix\Framework\Korea::isValidPhoneNumber($args->phone_number))
{
return new BaseObject(-1, 'msg_invalid_phone_number');
if ($required)
{
return new BaseObject(-1, 'msg_invalid_phone_number');
}
else
{
$args->phone_number = '';
return new BaseObject;
}
}
// If updating, check if the new info is the same as the old info.