makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix autologin issues

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3006 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-11-02 21:44:36 +00:00
parent 97978b69f1
commit 5b73ad4cbd
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/session.php
View file

@ -121,7 +121,7 @@ class session
} }
// Create a new session // Create a new session
function create(&$user_id, &$autologin) function create(&$user_id, &$autologin, $set_autologin = false)
{ {
global $SID, $db, $config; global $SID, $db, $config;
@ -164,7 +164,7 @@ class session
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Check autologin request, is it valid? // Check autologin request, is it valid?
if ($this->data['user_password'] != $autologin || !$this->data['user_active'] || !$user_id) if (empty($this->data) || ($this->data['user_password'] != $autologin && !$set_autologin) || !$this->data['user_active'])
{ {
$autologin = ''; $autologin = '';
$this->data['user_id'] = $user_id = ANONYMOUS; $this->data['user_id'] = $user_id = ANONYMOUS;
@ -211,7 +211,7 @@ class session
$this->data['session_id'] = $this->session_id; $this->data['session_id'] = $this->session_id;
$sessiondata['autologinid'] = ($autologin && $user_id) ? $autologin : ''; $sessiondata['autologinid'] = ($autologin && $user_id != ANONYMOUS) ? $autologin : '';
$sessiondata['userid'] = $user_id; $sessiondata['userid'] = $user_id;
$this->set_cookie('data', serialize($sessiondata), $current_time + 31536000); $this->set_cookie('data', serialize($sessiondata), $current_time + 31536000);
@ -689,8 +689,8 @@ class auth
return false; return false;
} }
$autologin = (isset($autologin)) ? md5($password) : ''; $autologin = (!empty($autologin)) ? md5($password) : '';
return ($login['user_active']) ? $user->create($login['user_id'], $autologin) : false; return ($login['user_active']) ? $user->create($login['user_id'], $autologin, true) : false;
} }
} }

14
phpBB/login.php
View file

@ -38,21 +38,21 @@ extract($_POST);
$redirect = (!empty($redirect)) ? $_SERVER['QUERY_STRING'] : ''; $redirect = (!empty($redirect)) ? $_SERVER['QUERY_STRING'] : '';
// Do the login/logout/form/whatever // Do the login/logout/form/whatever
if ( isset($login) || isset($logout) ) if (isset($login) || isset($logout))
{ {
if ( isset($login) && !$user->data['user_id'] ) if (isset($login) && !$user->data['user_id'])
{ {
$autologin = ( !empty($autologin) ) ? true : false; $autologin = (!empty($autologin)) ? true : false;
// //
// Is the board disabled? Are we an admin? No, then back to the index we go // Is the board disabled? Are we an admin? No, then back to the index we go
// //
if ( $config['board_disable'] && !$auth->acl_get('a_') ) if ($config['board_disable'] && !$auth->acl_get('a_'))
{ {
redirect("index.$phpEx$SID"); redirect("index.$phpEx$SID");
} }
if ( !$auth->login($username, $password, $autologin) ) if (!$auth->login($username, $password, $autologin))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="3;url=' . "login.$phpEx$SID&amp;redirect=$redirect" . '">') 'META' => '<meta http-equiv="refresh" content="3;url=' . "login.$phpEx$SID&amp;redirect=$redirect" . '">')
@ -62,7 +62,7 @@ if ( isset($login) || isset($logout) )
message_die(MESSAGE, $message); message_die(MESSAGE, $message);
} }
} }
else if ( $user->data['user_id'] ) else if ($user->data['user_id'] != ANONYMOUS)
{ {
$user->destroy(); $user->destroy();
} }
@ -70,7 +70,7 @@ if ( isset($login) || isset($logout) )
// //
// Redirect to wherever we're supposed to go ... // Redirect to wherever we're supposed to go ...
// //
$redirect_url = ( $redirect ) ? preg_replace('/^.*?redirect=(.*?)&(.*?)$/', '\\1' . $SID . '&\\2', $redirect) : 'index.'.$phpEx; $redirect_url = ($redirect) ? preg_replace('/^.*?redirect=(.*?)&(.*?)$/', '\\1' . $SID . '&\\2', $redirect) : 'index.'.$phpEx;
redirect($redirect_url); redirect($redirect_url);
} }