1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00

Issue #343 partial fix - needs JS sorting properly, but should now be possible to log in using CHAP. CHAP didn't work at all for admin login. Also need to change challenge value on every page reload without losing track.

This commit is contained in:
SteveD
2013-06-09 20:53:44 +01:00
parent 9939deb3e1
commit 865adaa99f
5 changed files with 80 additions and 24 deletions

View File

@@ -578,17 +578,14 @@ if(isset($pref['lan_global_list']))
$sql->db_Mark_Time('Start: CHAPT challenge');
$sql->db_Mark_Time('Start: CHAP challenge');
e107::getSession()
->challenge() // Create a unique challenge string for CHAP login
->challenge() // Make sure there is a unique challenge string for CHAP login
->check(); // Token protection
//
// N: misc setups: online user tracking, cache
//
@@ -613,7 +610,9 @@ if(isset($pref['notify']) && $pref['notify'] == true)
// O: Start user session
//
$sql -> db_Mark_Time('Start: Init session');
init_session();
init_session(); // Set up a lot of the user-related constants
//DEPRECATED but necessary. BC Fix.
function getip()
@@ -929,6 +928,8 @@ if (isset($_POST['userlogin']) || isset($_POST['userlogin_x']))
// $usr = new userlogin($_POST['username'], $_POST['userpass'], $_POST['autologin'], varset($_POST['hashchallenge'],''));
}
// $_SESSION['ubrowser'] check not needed anymore - see session handler
// e_QUERY not defined in single entry mod
if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'session') && isset($_SESSION['ubrowser']) && ($_SESSION['ubrowser'] != $ubrowser))*/)
@@ -961,6 +962,7 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
{
session_destroy();
$_SESSION[e_COOKIE]='';
// @TODO: Need to destroy the session cookie as well (not done by session_destroy()
}
cookie(e_COOKIE, '', (time() - 2592000));