Electric Boogaloo 2: Logout update
This commit is contained in:
parent
61c4076786
commit
09cbba9ac6
6 changed files with 96 additions and 45 deletions
|
|
@ -38,7 +38,7 @@ class Session {
|
|||
'skey' => $session,
|
||||
'started' => time(),
|
||||
'expire' => time() + 604800,
|
||||
'remember' => $remember
|
||||
'remember' => $remember ? '1' : '0'
|
||||
]);
|
||||
|
||||
// Return the session key
|
||||
|
|
@ -86,7 +86,7 @@ class Session {
|
|||
return false;
|
||||
|
||||
// Run the query
|
||||
Database::delete('sessions', [($key ? 'skey' : 'id'), [$sessionId, '=']]);
|
||||
Database::delete('sessions', [($key ? 'skey' : 'id') => [$sessionId, '=']]);
|
||||
|
||||
// Return true if key was found and deleted
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ class Users {
|
|||
return false;
|
||||
|
||||
// Remove the active session from the database
|
||||
if(!Session::deleteSession($id, true))
|
||||
if(!Session::deleteSession(Session::$sessionId, true))
|
||||
return false;
|
||||
|
||||
// Set cookies
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ $renderData = array(
|
|||
'version' => SAKURA_VERSION,
|
||||
'urls' => Configuration::getLocalConfig('urls'),
|
||||
'charset' => Configuration::getConfig('charset'),
|
||||
'currentpage' => $_SERVER['PHP_SELF'],
|
||||
'currentpage' => '//'. $_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF'],
|
||||
'recaptcha_public' => Configuration::getConfig('recaptcha_public'),
|
||||
'resources' => '//'. Configuration::getLocalConfig('urls')['content'] .'/data/'. strtolower(Templates::$_TPL)
|
||||
],
|
||||
|
|
|
|||
|
|
@ -55,8 +55,12 @@
|
|||
</div>
|
||||
<div class="menu-ucp" id="navMenuUser">
|
||||
<!-- User menu, displayed on right side of the bar. -->
|
||||
<a class="menu-item" id="headerLoginLink" href="http://{{ sakura.urls.main }}/login" title="Login to Flashii">Login</a>
|
||||
<a class="menu-item" href="http://{{ sakura.urls.main }}/register" title="Create an account">Register</a>
|
||||
{% if user.checklogin %}
|
||||
<a class="menu-item" href="http://{{ sakura.urls.main }}/logout?mode=logout&time={{ php.time }}&session={{ php.sessionid }}&redirect={{ sakura.currentpage }}" title="End your login session">Logout</a>
|
||||
{% else %}
|
||||
<a class="menu-item" id="headerLoginLink" href="http://{{ sakura.urls.main }}/login" title="Login to Flashii">Login</a>
|
||||
<a class="menu-item" href="http://{{ sakura.urls.main }}/register" title="Create an account">Register</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="menu-mob">
|
||||
<a class="menu-item" id="mobileNavToggle" href="javascript:;" onclick="mobileMenu(true);">Open Menu</a>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Options +FollowSymLinks -Indexes
|
|||
RewriteRule ^feedback?/?$ http://forum.flash.moe/viewforum.php?f=22
|
||||
RewriteRule ^credits?/?$ credits.php
|
||||
RewriteRule ^index?/?$ index.php
|
||||
RewriteRule ^login?/?$|register?/?$|forgotpassword?/?|authenticate?/?$ authenticate.php
|
||||
RewriteRule ^login?/?$|logout?/?$|register?/?$|forgotpassword?/?|authenticate?/?$ authenticate.php
|
||||
RewriteRule ^donate?/?$ donate.php
|
||||
RewriteRule ^contact?/?$ contact.php
|
||||
|
||||
|
|
|
|||
|
|
@ -16,56 +16,103 @@ if(
|
|||
isset($_REQUEST['session'])
|
||||
) {
|
||||
|
||||
switch($_REQUEST['mode']) {
|
||||
// Continue
|
||||
$continue = true;
|
||||
|
||||
// Login processing
|
||||
case 'login':
|
||||
// Compare time and session so we know the link isn't forged
|
||||
if($_REQUEST['time'] < time() - 1000) {
|
||||
|
||||
// Attempt login
|
||||
$login = Users::login($_REQUEST['username'], $_REQUEST['password'], isset($_REQUEST['remember']));
|
||||
$renderData['page'] = [
|
||||
'title' => 'Action failed',
|
||||
'redirect' => '/authenticate',
|
||||
'message' => 'Timestamps differ too much, please try again.'
|
||||
];
|
||||
|
||||
// Array containing "human understandable" messages
|
||||
$messages = [
|
||||
'USER_NOT_EXIST' => 'The user you tried to log into does not exist.',
|
||||
'INCORRECT_PASSWORD' => 'The password you entered was invalid.',
|
||||
'DEACTIVATED' => 'Your account is deactivated.',
|
||||
'LEGACY_SUCCESS' => 'Login successful! Taking you to the password changing page...',
|
||||
'LOGIN_SUCESS' => 'Login successful!'
|
||||
];
|
||||
// Prevent
|
||||
$continue = false;
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Login',
|
||||
'redirect' => ($login[0] ? $_REQUEST['redirect'] : '/authenticate'),
|
||||
'message' => $messages[$login[1]]
|
||||
];
|
||||
}
|
||||
|
||||
break;
|
||||
// Match session ids for the same reason
|
||||
if($_REQUEST['session'] != session_id()) {
|
||||
|
||||
// Registration processing
|
||||
case 'register':
|
||||
$renderData['page'] = [
|
||||
'title' => 'Action failed',
|
||||
'redirect' => '/authenticate',
|
||||
'message' => 'Session IDs do not match.'
|
||||
];
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Register on Flashii',
|
||||
'redirect' => $_SERVER['PHP_SELF'],
|
||||
'message' => 'what'
|
||||
];
|
||||
// Prevent
|
||||
$continue = false;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
// Unforgetting passwords
|
||||
case 'forgotpassword':
|
||||
if($continue) {
|
||||
switch($_REQUEST['mode']) {
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Forgot Password',
|
||||
'redirect' => $_SERVER['PHP_SELF'],
|
||||
'message' => 'what'
|
||||
];
|
||||
case 'logout':
|
||||
|
||||
break;
|
||||
// Attempt logout
|
||||
$logout = Users::logout();
|
||||
|
||||
// Add page specific data
|
||||
$renderData['page'] = [
|
||||
'title' => 'Logout',
|
||||
'redirect' => ($logout ? $_REQUEST['redirect'] : '/authenticate'),
|
||||
'message' => $logout ? 'You are now logged out.' : 'Logout failed.'
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
// Login processing
|
||||
case 'login':
|
||||
|
||||
// Attempt login
|
||||
$login = Users::login($_REQUEST['username'], $_REQUEST['password'], isset($_REQUEST['remember']));
|
||||
|
||||
// Array containing "human understandable" messages
|
||||
$messages = [
|
||||
'USER_NOT_EXIST' => 'The user you tried to log into does not exist.',
|
||||
'INCORRECT_PASSWORD' => 'The password you entered was invalid.',
|
||||
'DEACTIVATED' => 'Your account is deactivated.',
|
||||
'LEGACY_SUCCESS' => 'Login successful! Taking you to the password changing page...',
|
||||
'LOGIN_SUCESS' => 'Login successful!'
|
||||
];
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Login',
|
||||
'redirect' => ($login[0] ? $_REQUEST['redirect'] : '/authenticate'),
|
||||
'message' => $messages[$login[1]]
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
// Registration processing
|
||||
case 'register':
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Register on Flashii',
|
||||
'redirect' => $_SERVER['PHP_SELF'],
|
||||
'message' => 'what'
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
// Unforgetting passwords
|
||||
case 'forgotpassword':
|
||||
|
||||
// Add page specific things
|
||||
$renderData['page'] = [
|
||||
'title' => 'Forgot Password',
|
||||
'redirect' => $_SERVER['PHP_SELF'],
|
||||
'message' => 'what'
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// Print page contents or if the AJAX request is set only display the render data
|
||||
|
|
|
|||
Reference in a new issue