fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2288 allow redirect after logout, only if the target URL is internal

Browse source
This commit is contained in:
Kijin Sung 2024-01-30 21:37:43 +09:00
parent a36d728ad9
commit 00db22abdb
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,12 +134,21 @@ class MemberController extends Member
// If a device key is present, unregister it. // If a device key is present, unregister it.
Rhymix\Modules\Member\Controllers\Device::getInstance()->autoUnregisterDevice($logged_info->member_srl); Rhymix\Modules\Member\Controllers\Device::getInstance()->autoUnregisterDevice($logged_info->member_srl);
// Set redirect URL.
$output = new BaseObject(); $output = new BaseObject();
$redirect_url = Context::get('redirect_url');
if ($redirect_url && Rhymix\Framework\URL::isInternalURL($redirect_url))
{
$output->redirect_url = $redirect_url;
}
else
{
$config = ModuleModel::getModuleConfig('member'); $config = ModuleModel::getModuleConfig('member');
if($config->after_logout_url) if($config->after_logout_url)
{ {
$output->redirect_url = $config->after_logout_url; $output->redirect_url = $config->after_logout_url;
} }
}
return $output; return $output;
} }

11
modules/member/member.view.php
View file

@ -897,12 +897,19 @@ class MemberView extends Member
// Redirect if not logged in. // Redirect if not logged in.
if(!Context::get('is_logged')) if(!Context::get('is_logged'))
{ {
$this->setRedirectUrl(getNotEncodedUrl('act', '')); $this->setRedirectUrl(getNotEncodedUrl('act', '', 'redirect_url', ''));
return; return;
} }
$output = MemberController::getInstance()->procMemberLogout(); $output = MemberController::getInstance()->procMemberLogout();
$this->setRedirectUrl(isset($output->redirect_url) ? $output->redirect_url : getNotEncodedUrl('act', '')); if (!empty($output->redirect_url))
{
$this->setRedirectUrl($output->redirect_url);
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('act', '', 'redirect_url', ''));
}
} }
/** /**