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

Prevent infinite redirect and add logout link to sitelock message

Browse source
This commit is contained in:
Kijin Sung 2016-02-09 11:37:43 +09:00
parent 6db7068245
commit 28095d7b6d
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/context/Context.class.php
View file

@ -1435,7 +1435,7 @@ class Context
{ {
return; return;
} }
elseif (self::get('act') === 'procMemberLogin') elseif (in_array(self::get('act'), array('procMemberLogin', 'dispMemberLogout')))
{ {
return; return;
} }
@ -1455,6 +1455,7 @@ class Context
define('_XE_SITELOCK_', TRUE); define('_XE_SITELOCK_', TRUE);
define('_XE_SITELOCK_TITLE_', config('lock.title')); define('_XE_SITELOCK_TITLE_', config('lock.title'));
define('_XE_SITELOCK_MESSAGE_', config('lock.message')); define('_XE_SITELOCK_MESSAGE_', config('lock.message'));
unset($_SESSION['XE_VALIDATOR_RETURN_URL']);
// Load the sitelock template. // Load the sitelock template.
if(FileHandler::exists(RX_BASEDIR . 'common/tpl/sitelock.user.html')) if(FileHandler::exists(RX_BASEDIR . 'common/tpl/sitelock.user.html'))

5
modules/message/skins/xedition/system_message.html
View file

@ -44,6 +44,9 @@
<div cond="$is_logged"> <div cond="$is_logged">
<div class="login-body"> <div class="login-body">
<p><a class="button" href="{getUrl()}">{$lang->cmd_back}</a></p> <p><a class="button" href="{getUrl()}">{$lang->cmd_back}</a></p>
</p> </div>
<div class="login-footer">
<a href="{getUrl('', 'act', 'dispMemberLogout')}">{$lang->cmd_logout}</a>
</div>
</div> </div>
</div> </div>