mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Possible fix for a problem with query around line 172
git-svn-id: file:///svn/phpbb/trunk@1582 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
db92033a32
commit
e829804aa9
1 changed files with 10 additions and 7 deletions
|
@ -82,8 +82,10 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea
|
||||||
{
|
{
|
||||||
if( isset($sessiondata['autologinid']) )
|
if( isset($sessiondata['autologinid']) )
|
||||||
{
|
{
|
||||||
|
// We have to login automagically
|
||||||
if( $sessiondata['autologinid'] == $auto_login_key )
|
if( $sessiondata['autologinid'] == $auto_login_key )
|
||||||
{
|
{
|
||||||
|
// autologinid matches password
|
||||||
$login = 1;
|
$login = 1;
|
||||||
$enable_autologin = 1;
|
$enable_autologin = 1;
|
||||||
|
|
||||||
|
@ -91,20 +93,18 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// No match; don't login, set as anonymous user
|
||||||
$login = 0;
|
$login = 0;
|
||||||
$enable_autologin = 0;
|
$enable_autologin = 0;
|
||||||
$user_id = ANONYMOUS;
|
$user_id = ANONYMOUS;
|
||||||
|
|
||||||
$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Autologin is not set. Don't login, set as anonymous user
|
||||||
$login = 0;
|
$login = 0;
|
||||||
$enable_autologin = 0;
|
$enable_autologin = 0;
|
||||||
$user_id = ANONYMOUS;
|
$user_id = ANONYMOUS;
|
||||||
|
|
||||||
$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -116,8 +116,11 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea
|
||||||
{
|
{
|
||||||
$login = 0;
|
$login = 0;
|
||||||
$enable_autologin = 0;
|
$enable_autologin = 0;
|
||||||
|
}
|
||||||
|
|
||||||
$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
|
if( empty($sessiondata['lastvisit']) )
|
||||||
|
{
|
||||||
|
$sessiondata['lastvisit'] = $current_time;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -169,7 +172,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea
|
||||||
$result = $db->sql_query($sql_insert);
|
$result = $db->sql_query($sql_insert);
|
||||||
if(!$result)
|
if(!$result)
|
||||||
{
|
{
|
||||||
message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
|
message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -430,4 +433,4 @@ function append_sid($url, $non_html_amp = false)
|
||||||
return($url);
|
return($url);
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Add table
Reference in a new issue