diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-05 11:38:10 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-05 11:38:10 +0000 |
| commit | 1eeecbd0757551d7d7f68ee1bff13f3987f8b004 (patch) | |
| tree | e7788c219c656fd40164f636138afa43d7d0c45b /phpBB | |
| parent | 3dc658f3eaa27800736b1a56f3f8609d30bf3033 (diff) | |
| download | forums-1eeecbd0757551d7d7f68ee1bff13f3987f8b004.tar forums-1eeecbd0757551d7d7f68ee1bff13f3987f8b004.tar.gz forums-1eeecbd0757551d7d7f68ee1bff13f3987f8b004.tar.bz2 forums-1eeecbd0757551d7d7f68ee1bff13f3987f8b004.tar.xz forums-1eeecbd0757551d7d7f68ee1bff13f3987f8b004.zip | |
wrong field name, oops
git-svn-id: file:///svn/phpbb/trunk@2932 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/session.php | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index bd8384cbf4..c00e2cf307 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -50,7 +50,7 @@ class session { } // Load limit check (if applicable) - if ( !empty($board_config['limit_load']) && file_exists('/proc/loadavg') ) + if ( $board_config['limit_load'] && file_exists('/proc/loadavg') ) { if ( $load = @file('/proc/loadavg') ) { @@ -196,7 +196,7 @@ class session { } $db->sql_return_on_error(false); - $userdata['session_id'] = $session_id; + $userdata['session_id'] = $this->session_id; $sessiondata['autologinid'] = ( $autologin && $user_id ) ? $autologin : ''; $sessiondata['userid'] = $user_id; @@ -227,7 +227,7 @@ class session { // Delete existing session, update last visit info first! $sql = "UPDATE " . USERS_TABLE . " - SET user_lastvisit = " . intval($userdata['session_time']) . ", user_session_page = '" . $userdata['session_page'] . "' + SET user_lastvisit = " . intval($userdata['session_time']) . " WHERE user_id = " . $userdata['user_id']; $db->sql_query($sql); @@ -241,14 +241,6 @@ class session { return true; } - // Set a cookie - function set_cookie($name, $cookiedata, $cookietime) - { - global $board_config; - - setcookie($board_config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); - } - // Garbage collection function gc(&$current_time) { @@ -266,7 +258,7 @@ class session { $del_sessions = 0; while ( $row = $db->sql_fetchrow($result) ) { - if ( $row['user_session_id'] ) + if ( $row['session_user_id'] ) { $sql = "UPDATE " . USERS_TABLE . " SET user_lastvisit = " . $row['recent_time'] . " @@ -300,6 +292,14 @@ class session { return; } + // Set a cookie + function set_cookie($name, $cookiedata, $cookietime) + { + global $board_config; + + setcookie($board_config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + } + // Taken over by user class ... for now at least function configure($userdata, $lang_set = false) { @@ -474,7 +474,6 @@ class user return strtr(@gmdate($this->date_format, $gmepoch + (3600 * $this->timezone) + $this->dst), $lang_dates); } - } // Will be keeping my eye of 'other products' to ensure these things don't |