Skip to content

Commit b607d1d

Browse files
author
Paul S. Owen
committed
Various updates to session code inc. moving data away from config
git-svn-id: file:///svn/phpbb/trunk@730 89ea8834-ac86-4346-8a33-228a782c2dd0
1 parent 5a3dbda commit b607d1d

3 files changed

Lines changed: 62 additions & 22 deletions

File tree

‎phpBB/common.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@
111111
$board_config['board_email'] = stripslashes(str_replace("<br />", "\n", $config['email_sig']));
112112
$board_config['board_email_from'] = stripslashes($config['email_from']);
113113
$board_config['flood_interval'] = $config['flood_interval'];
114-
$board_config['post_mod_time'] = $config['post_mod_time'];
114+
$board_config['session_length'] = $config['session_length'];
115+
$board_config['cookie_name'] = $config['cookie_name'];
116+
$board_config['cookie_path'] = $config['cookie_path'];
117+
$board_config['cookie_domain'] = $config['cookie_domain'];
118+
$board_config['cookie_secure'] = $config['cookie_secure'];
115119
$board_config['avatar_filesize'] = $config['avatar_filesize'];
116120
$board_config['avatar_max_width'] = $config['avatar_max_width'];
117121
$board_config['avatar_max_height'] = $config['avatar_max_height'];

‎phpBB/config.php‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,53 @@
2222
*
2323
***************************************************************************/
2424

25-
// Session data
26-
$cookiename = "phpbb2";
27-
$cookiedomain = "";
28-
$cookiepath = "";
29-
$cookiesecure = "";
30-
$cookielife = 31536000;
31-
$session_length = 300;
25+
//putenv('SYBASE=/usr/freetds');
26+
//dl('sybase_ct.so');
3227

3328
// DB connection config
34-
$dbms = "mysql";
35-
$dbhost = "localhost";
29+
30+
/*
31+
//
32+
// ODBC - Access (remote)
33+
//
34+
$dbms = "odbc";
35+
$dbhost = "msaccess:odbctest";
3636
$dbname = "";
3737
$dbuser = "";
38-
$dbpasswd = "";
38+
$dbpasswd = "efx2KarizonaD";
39+
*/
40+
41+
42+
//
43+
// MSSQL
44+
//
45+
$dbms = "mssql";
46+
$dbhost = "Typhoon";
47+
$dbname = "dev_starstreak_net";
48+
$dbuser = "devhttp";
49+
$dbpasswd = "efx2KarizonaD";
50+
51+
52+
//
53+
// MySQL (local)
54+
//
55+
$dbms = "mysql";
56+
$dbhost = "localhost";
57+
$dbname = "dev_starstreak_net";
58+
$dbuser = "devhttp";
59+
$dbpasswd = "efx2KarizonaD";
60+
61+
62+
/*
63+
//
64+
// PostgreSQL (local)
65+
//
66+
$dbms = "postgres";
67+
$dbhost = "";
68+
$dbname = "dev_starstreak_net";
69+
$dbuser = "devhttp";
70+
$dbpasswd = "efx2KarizonaD";
71+
*/
3972

4073
// DB table prefix
4174
$table_prefix = "phpbb_";

‎phpBB/includes/sessions.php‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
8181
// Remove duplicate user_id from session table
8282
// if IP is different ...
8383
//
84-
if( ( $login || $autologin ) && $user_id != ANONYMOUS )
84+
/* if( ( $login || $autologin ) && $user_id != ANONYMOUS )
8585
{
8686
$sql_delete_same_user = "DELETE FROM " . SESSIONS_TABLE . "
8787
WHERE session_ip <> '$user_ip'
8888
AND session_user_id = $user_id";
8989
$result = $db->sql_query($sql_delete_same_user);
90-
}
90+
}*/
9191

9292
//
9393
// Try and pull the last time stored
@@ -108,8 +108,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
108108

109109
$sql_insert = "INSERT INTO " . SESSIONS_TABLE . "
110110
(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
111-
VALUES
112-
('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
111+
VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
113112
$result = $db->sql_query($sql_insert);
114113
if(!$result)
115114
{
@@ -141,10 +140,12 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
141140
$sessiondata['userid'] = $user_id;
142141
$sessiondata['sessionstart'] = $current_time;
143142
$sessiondata['sessiontime'] = $current_time;
143+
144144
$serialised_cookiedata = serialize($sessiondata);
145-
setcookie($cookiename, $serialised_cookiedata, ($current_time+$cookielife), $cookiepath, $cookiedomain, $cookiesecure);
146145

147-
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=".$sessiondata['sessionid'] : "";
146+
setcookie($cookiename, $serialised_cookiedata, ($current_time + $cookielife), $cookiepath, $cookiedomain, $cookiesecure);
147+
148+
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $sessiondata['sessionid'] : "";
148149
}
149150

150151
return $session_id;
@@ -239,8 +240,10 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
239240
//
240241
$userdata['session_time'] = $current_time;
241242
$sessiondata['sessiontime'] = $current_time;
243+
242244
$serialised_cookiedata = serialize($sessiondata);
243-
setcookie($cookiename, $serialised_cookiedata, ($current_time+$cookielife), $cookiepath, $cookiedomain, $cookiesecure);
245+
246+
setcookie($cookiename, $serialised_cookiedata, ($current_time + $cookielife), $cookiepath, $cookiedomain, $cookiesecure);
244247

245248
return $userdata;
246249
}
@@ -264,9 +267,9 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
264267

265268
if(isset($sessiondata['userid']) && isset($sessiondata['autologinid']))
266269
{
267-
$sql = "SELECT u.*
268-
FROM " . USERS_TABLE . " u
269-
WHERE u.user_id = " . $sessiondata['userid'];
270+
$sql = "SELECT *
271+
FROM " . USERS_TABLE . "
272+
WHERE user_id = " . $sessiondata['userid'];
270273
$result = $db->sql_query($sql);
271274
if (!$result)
272275
{
@@ -390,7 +393,7 @@ function append_sid($url)
390393
{
391394
global $SID;
392395

393-
if(!empty($SID) && !eregi("^http:", $url) && !eregi("sid=", $url))
396+
if(!empty($SID) && !eregi("sid=", $url))
394397
{
395398
$url = ereg_replace("[&?]+$", "", $url);
396399
$url .= ( (strpos($url, "?") != false) ? "&" : "?" ) . $SID;

0 commit comments

Comments
 (0)