diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-12-15 11:30:41 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-12-15 11:30:41 +0000 |
| commit | e829804aa943515371b34cf524083b223a72a840 (patch) | |
| tree | f1b2a2c4554b16774c72c0213af6a95b1ca129ac /phpBB/includes | |
| parent | db92033a3211e203838f88227242d64059494013 (diff) | |
| download | forums-e829804aa943515371b34cf524083b223a72a840.tar forums-e829804aa943515371b34cf524083b223a72a840.tar.gz forums-e829804aa943515371b34cf524083b223a72a840.tar.bz2 forums-e829804aa943515371b34cf524083b223a72a840.tar.xz forums-e829804aa943515371b34cf524083b223a72a840.zip | |
Possible fix for a problem with query around line 172
git-svn-id: file:///svn/phpbb/trunk@1582 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/sessions.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php index 1c4fe4cdaa..d3069b3a99 100644 --- a/phpBB/includes/sessions.php +++ b/phpBB/includes/sessions.php @@ -82,8 +82,10 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea { if( isset($sessiondata['autologinid']) ) { + // We have to login automagically if( $sessiondata['autologinid'] == $auto_login_key ) { + // autologinid matches password $login = 1; $enable_autologin = 1; @@ -91,20 +93,18 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea } else { + // No match; don't login, set as anonymous user $login = 0; $enable_autologin = 0; $user_id = ANONYMOUS; - - $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time; } } else { + // Autologin is not set. Don't login, set as anonymous user $login = 0; $enable_autologin = 0; $user_id = ANONYMOUS; - - $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time; } } else @@ -116,8 +116,11 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_crea { $login = 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); 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); } -?>
\ No newline at end of file +?> |