|
From: Bart v. B. <ba...@us...> - 2001-12-15 11:30:45
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv2796
Modified Files:
sessions.php
Log Message:
Possible fix for a problem with query around line 172
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** sessions.php 2001/12/14 14:22:26 1.42
--- sessions.php 2001/12/15 11:30:41 1.43
***************
*** 83,88 ****
--- 83,90 ----
if( isset($sessiondata['autologinid']) )
{
+ // We have to login automagically
if( $sessiondata['autologinid'] == $auto_login_key )
{
+ // autologinid matches password
$login = 1;
$enable_autologin = 1;
***************
*** 92,109 ****
else
{
$login = 0;
$enable_autologin = 0;
$user_id = ANONYMOUS;
-
- $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
}
else
{
$login = 0;
$enable_autologin = 0;
$user_id = ANONYMOUS;
-
- $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
}
--- 94,109 ----
else
{
+ // No match; don't login, set as anonymous user
$login = 0;
$enable_autologin = 0;
$user_id = ANONYMOUS;
}
}
else
{
+ // Autologin is not set. Don't login, set as anonymous user
$login = 0;
$enable_autologin = 0;
$user_id = ANONYMOUS;
}
}
***************
*** 117,122 ****
$login = 0;
$enable_autologin = 0;
! $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
--- 117,125 ----
$login = 0;
$enable_autologin = 0;
+ }
! if( empty($sessiondata['lastvisit']) )
! {
! $sessiondata['lastvisit'] = $current_time;
}
***************
*** 170,174 ****
if(!$result)
{
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
}
}
--- 173,177 ----
if(!$result)
{
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
}
}
***************
*** 431,433 ****
}
! ?>
\ No newline at end of file
--- 434,436 ----
}
! ?>
|