1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00

Various updates to session code inc. moving data away from config

git-svn-id: file:///svn/phpbb/trunk@730 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-23 15:23:47 +00:00
parent 5a3dbda86a
commit b607d1d858
3 changed files with 63 additions and 23 deletions

View File

@ -111,7 +111,11 @@ else
$board_config['board_email'] = stripslashes(str_replace("<br />", "\n", $config['email_sig']));
$board_config['board_email_from'] = stripslashes($config['email_from']);
$board_config['flood_interval'] = $config['flood_interval'];
$board_config['post_mod_time'] = $config['post_mod_time'];
$board_config['session_length'] = $config['session_length'];
$board_config['cookie_name'] = $config['cookie_name'];
$board_config['cookie_path'] = $config['cookie_path'];
$board_config['cookie_domain'] = $config['cookie_domain'];
$board_config['cookie_secure'] = $config['cookie_secure'];
$board_config['avatar_filesize'] = $config['avatar_filesize'];
$board_config['avatar_max_width'] = $config['avatar_max_width'];
$board_config['avatar_max_height'] = $config['avatar_max_height'];

View File

@ -22,20 +22,53 @@
*
***************************************************************************/
// Session data
$cookiename = "phpbb2";
$cookiedomain = "";
$cookiepath = "";
$cookiesecure = "";
$cookielife = 31536000;
$session_length = 300;
//putenv('SYBASE=/usr/freetds');
//dl('sybase_ct.so');
// DB connection config
$dbms = "mysql";
$dbhost = "localhost";
/*
//
// ODBC - Access (remote)
//
$dbms = "odbc";
$dbhost = "msaccess:odbctest";
$dbname = "";
$dbuser = "";
$dbpasswd = "";
$dbpasswd = "efx2KarizonaD";
*/
//
// MSSQL
//
$dbms = "mssql";
$dbhost = "Typhoon";
$dbname = "dev_starstreak_net";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
//
// MySQL (local)
//
$dbms = "mysql";
$dbhost = "localhost";
$dbname = "dev_starstreak_net";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
/*
//
// PostgreSQL (local)
//
$dbms = "postgres";
$dbhost = "";
$dbname = "dev_starstreak_net";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
*/
// DB table prefix
$table_prefix = "phpbb_";

View File

@ -81,13 +81,13 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
// Remove duplicate user_id from session table
// if IP is different ...
//
if( ( $login || $autologin ) && $user_id != ANONYMOUS )
/* if( ( $login || $autologin ) && $user_id != ANONYMOUS )
{
$sql_delete_same_user = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_ip <> '$user_ip'
AND session_user_id = $user_id";
$result = $db->sql_query($sql_delete_same_user);
}
}*/
//
// Try and pull the last time stored
@ -108,8 +108,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
$sql_insert = "INSERT INTO " . SESSIONS_TABLE . "
(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
VALUES
('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
$result = $db->sql_query($sql_insert);
if(!$result)
{
@ -141,10 +140,12 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
$sessiondata['userid'] = $user_id;
$sessiondata['sessionstart'] = $current_time;
$sessiondata['sessiontime'] = $current_time;
$serialised_cookiedata = serialize($sessiondata);
setcookie($cookiename, $serialised_cookiedata, ($current_time+$cookielife), $cookiepath, $cookiedomain, $cookiesecure);
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=".$sessiondata['sessionid'] : "";
$serialised_cookiedata = serialize($sessiondata);
setcookie($cookiename, $serialised_cookiedata, ($current_time + $cookielife), $cookiepath, $cookiedomain, $cookiesecure);
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $sessiondata['sessionid'] : "";
}
return $session_id;
@ -239,8 +240,10 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
//
$userdata['session_time'] = $current_time;
$sessiondata['sessiontime'] = $current_time;
$serialised_cookiedata = serialize($sessiondata);
setcookie($cookiename, $serialised_cookiedata, ($current_time+$cookielife), $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename, $serialised_cookiedata, ($current_time + $cookielife), $cookiepath, $cookiedomain, $cookiesecure);
return $userdata;
}
@ -264,9 +267,9 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
if(isset($sessiondata['userid']) && isset($sessiondata['autologinid']))
{
$sql = "SELECT u.*
FROM " . USERS_TABLE . " u
WHERE u.user_id = " . $sessiondata['userid'];
$sql = "SELECT *
FROM " . USERS_TABLE . "
WHERE user_id = " . $sessiondata['userid'];
$result = $db->sql_query($sql);
if (!$result)
{
@ -390,7 +393,7 @@ function append_sid($url)
{
global $SID;
if(!empty($SID) && !eregi("^http:", $url) && !eregi("sid=", $url))
if(!empty($SID) && !eregi("sid=", $url))
{
$url = ereg_replace("[&?]+$", "", $url);
$url .= ( (strpos($url, "?") != false) ? "&" : "?" ) . $SID;