fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Redirect always to configured URL after signup, even if email confirmation is enabled. Fix #726, #949, #1735

Browse source
This commit is contained in:
Kijin Sung 2023-08-03 21:43:05 +09:00
parent eccb54ca42
commit de9a5bce35
1 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -857,42 +857,46 @@ class MemberController extends Member
// Register device
Rhymix\Modules\Member\Controllers\Device::getInstance()->autoRegisterDevice($args->member_srl, false);
// Results
$this->add('member_srl', $args->member_srl);
if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
if($config->enable_confirm == 'Y')
{
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
$this->setMessage($msg);
return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new BaseObject(-12, $msg));
}
else $this->setMessage('success_registed');
// Call a trigger (after)
$this->add('member_srl', $args->member_srl);
ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
self::clearMemberCache($args->member_srl);
// Redirect
if ($config->redirect_url)
if($config->redirect_url)
{
$returnUrl = $config->redirect_url;
$this->setRedirectUrl($config->redirect_url);
if ($config->enable_confirm === 'Y')
{
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
return new BaseObject(-12, $msg);
}
}
elseif (Context::get('success_return_url'))
elseif($config->enable_confirm === 'Y')
{
$returnUrl = Context::get('success_return_url');
}
elseif (isset($_SESSION['member_auth_referer']))
{
$returnUrl = $_SESSION['member_auth_referer'];
unset($_SESSION['member_auth_referer']);
$this->setRedirectUrl(getNotEncodedUrl('', 'act', 'dispMemberLoginForm'));
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
return new BaseObject(-12, $msg);
}
else
{
$returnUrl = getNotEncodedUrl('');
}
$this->setMessage('success_registed');
$this->setRedirectUrl($returnUrl);
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
elseif (isset($_SESSION['member_auth_referer']))
{
$redirect_url = $_SESSION['member_auth_referer'];
unset($_SESSION['member_auth_referer']);
$this->setRedirectUrl($redirect_url);
}
else
{
$this->setRedirectUrl(getNotEncodedUrl(''));
}
}
}
function procMemberModifyInfoBefore()