Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.74,1.75 sessions.php,1.38,1.39
|
From: Paul S. O. <ps...@us...> - 2001-12-05 00:21:00
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv16782/includes
Modified Files:
page_header.php sessions.php
Log Message:
New session code, probably still dodgy, fix for login failed message, search updates, highlighting URI messup fixes, max limit for ranks
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** page_header.php 2001/11/27 17:36:04 1.74
--- page_header.php 2001/12/05 00:20:56 1.75
***************
*** 242,246 ****
"PRIVATE_MESSAGE_INFO_UNREAD" => $l_privmsgs_text_unread,
"PRIVATE_MESSAGE_NEW_FLAG" => $s_privmsg_new,
! "LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
"PRIVMSG_IMG" => $icon_pm,
--- 242,247 ----
"PRIVATE_MESSAGE_INFO_UNREAD" => $l_privmsgs_text_unread,
"PRIVATE_MESSAGE_NEW_FLAG" => $s_privmsg_new,
! "LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
! "CURRENT_TIME" => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
"PRIVMSG_IMG" => $icon_pm,
***************
*** 294,299 ****
"L_BY" => $lang['by'],
"L_LOGIN_LOGOUT" => $l_login_logout,
- "L_SEARCH_UNANSWERED" => $lang['Search_unanswered'],
- "L_SEARCH_SELF" => $lang['Search_your_posts'],
"U_INDEX" => append_sid("index.".$phpEx),
--- 295,298 ----
***************
*** 310,315 ****
"U_MEMBERSLIST" => append_sid("memberlist.".$phpEx),
"U_GROUP_CP" => append_sid("groupcp.".$phpEx),
- "U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),
- "U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch"),
"S_CONTENT_DIRECTION" => $lang['DIRECTION'],
--- 309,312 ----
***************
*** 319,323 ****
"S_TIMEZONE" => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
- "S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
--- 316,319 ----
***************
*** 390,392 ****
$template->pparse("overall_header");
! ?>
--- 386,388 ----
$template->pparse("overall_header");
! ?>
\ No newline at end of file
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** sessions.php 2001/11/29 02:26:29 1.38
--- sessions.php 2001/12/05 00:20:56 1.39
***************
*** 27,34 ****
// Returns the new session ID on success.
//
! function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0, $autologin = 0)
{
! global $db, $lang, $board_config, $phpEx;
global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
--- 27,34 ----
// Returns the new session ID on success.
//
! function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_create = 0, $enable_autologin = 0)
{
! global $db, $board_config;
global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
***************
*** 38,44 ****
$cookiesecure = $board_config['cookie_secure'];
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
{
! $sessiondata = isset($HTTP_COOKIE_VARS[$cookiename]) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
--- 38,44 ----
$cookiesecure = $board_config['cookie_secure'];
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
{
! $sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : "";
$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
***************
*** 69,73 ****
if (!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", __LINE__, __FILE__, $sql);
}
--- 69,73 ----
if (!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", "", __LINE__, __FILE__, $sql);
}
***************
*** 83,99 ****
else
{
- if( $user_id == ANONYMOUS )
- {
- $login = 0;
- $autologin = 0;
- }
-
//
// Try and pull the last time stored
// in a cookie, if it exists
//
! if( $sessionmethod == SESSION_METHOD_GET && $user_id != ANONYMOUS )
{
! $sql = "SELECT user_lastvisit
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
--- 83,99 ----
else
{
//
// Try and pull the last time stored
// in a cookie, if it exists
//
! if( $user_id != ANONYMOUS )
{
! //
! // This is a 'work-around' since I managed to
! // freeze the schema without re-visiting sessions,
! // what's needed is a session timer in the user table
! // + the user_lastvisit ... damn damn damn damn and blast
! //
! $sql = "SELECT user_autologin_key, user_lastvisit
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
***************
*** 105,121 ****
$row = $db->sql_fetchrow($result);
! $sessiondata['lastvisit'] = $row['user_lastvisit'];
}
else
{
! $sessiondata['lastvisit'] = (!empty($sessiondata['sessiontime'])) ? $sessiondata['sessiontime'] : $current_time;
}
$sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
! WHERE (session_id = '" . $session_id . "')
! AND (session_ip = '$user_ip')";
$result = $db->sql_query($sql);
--- 105,155 ----
$row = $db->sql_fetchrow($result);
+
+ $sessiondata['lastvisit'] = $row['user_lastvisit'];
+
+ if( $auto_create )
+ {
+ if( isset($sessiondata['autologinid']) )
+ {
+ if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
+ {
+ $login = 1;
+ $enable_autologin = 1;
+ }
+ 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;
+ }
+ }
+ else
+ {
+ $login = 1;
+ }
}
else
{
! $login = 0;
! $enable_autologin = 0;
!
! $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
$sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login
! WHERE session_id = '" . $session_id . "'
! AND session_ip = '$user_ip'";
$result = $db->sql_query($sql);
***************
*** 130,160 ****
if(!$result)
{
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
}
}
! if( $autologin && $sessionmethod = SESSION_METHOD_COOKIE )
{
! mt_srand( (double) microtime() * 1000000);
! $autologin_key = md5(uniqid(mt_rand()));
! $sql_auto = "UPDATE " . USERS_TABLE . "
! SET user_autologin_key = '$autologin_key'
WHERE user_id = $user_id";
$result = $db->sql_query($sql_auto);
if(!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", __LINE__, __FILE__, $sql);
}
-
- $sessiondata['autologinid'] = $autologin_key;
}
$sessiondata['userid'] = $user_id;
- $sessiondata['sessionstart'] = $current_time;
- $sessiondata['sessiontime'] = $current_time;
$serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename, $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
--- 164,197 ----
if(!$result)
{
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
}
}
! if( $user_id != ANONYMOUS )
{
! $autologin_sql = "";
! if( $enable_autologin && $sessionmethod = SESSION_METHOD_COOKIE )
! {
! mt_srand( (double) microtime() * 1000000);
! $autologin_key = md5(uniqid(mt_rand()));
! $sessiondata['autologinid'] = $autologin_key;
! $autologin_sql = ", user_autologin_key = '$autologin_key'";
! }
!
! $sql_auto = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . time() . $autologin_sql . "
WHERE user_id = $user_id";
$result = $db->sql_query($sql_auto);
if(!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
}
}
$sessiondata['userid'] = $user_id;
$serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
***************
*** 181,187 ****
$cookiesecure = $board_config['cookie_secure'];
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
{
! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
--- 218,227 ----
$cookiesecure = $board_config['cookie_secure'];
! $current_time = time();
! unset($userdata);
!
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
{
! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : "";
$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
***************
*** 190,199 ****
else
{
! $session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
$sessionmethod = SESSION_METHOD_GET;
}
- $current_time = time();
- unset($userdata);
//
--- 230,237 ----
else
{
! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
$sessionmethod = SESSION_METHOD_GET;
}
//
***************
*** 212,218 ****
AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
! if (!$result)
{
! message_die(CRITICAL_ERROR, "Error doing DB query userdata row fetch : session_pagestart", __LINE__, __FILE__, $sql);
}
--- 250,256 ----
AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Error doing DB query userdata row fetch : session_pagestart", "", __LINE__, __FILE__, $sql);
}
***************
*** 224,233 ****
if( isset($userdata['user_id']) )
{
! $SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
! $sessiondata['sessiontime'] = $current_time;
! $serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename, $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
//
// Only update session DB a minute or so after last update
--- 262,282 ----
if( isset($userdata['user_id']) )
{
! $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
! if( empty($HTTP_COOKIE_VARS[$cookiename . '_data']) )
! {
! if( !empty($userdata['user_autologin']) && $sessionmethod = SESSION_METHOD_COOKIE )
! {
! $sessiondata['autologinid'] = $autologin_key;
! }
! $sessiondata['userid'] = $user_id;
! $sessiondata['lastvisit'] = $userdata['session_last_visit'];
+ $serialised_cookiedata = serialize($sessiondata);
+ // session_send_cookie("_data", $serialised_cookiedata, ($current_time + 31536000));
+ setcookie($board_config['cookie_name'] . "_data", $serialised_cookiedata, ($current_time + 31536000), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ setcookie($board_config['cookie_name'] . "_sid", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"], 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ }
+
//
// Only update session DB a minute or so after last update
***************
*** 241,250 ****
AND session_user_id = " . $userdata['user_id'];
$result = $db->sql_query($sql);
! if(!$result)
{
! message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", __LINE__, __FILE__, $sql);
}
! if( $sessionmethod == SESSION_METHOD_GET )
{
$sql = "UPDATE " . USERS_TABLE . "
--- 290,299 ----
AND session_user_id = " . $userdata['user_id'];
$result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
}
! if( $user_id != ANONYMOUS )
{
$sql = "UPDATE " . USERS_TABLE . "
***************
*** 252,273 ****
WHERE user_id = " . $userdata['user_id'];
$result = $db->sql_query($sql);
! if(!$result)
{
! message_die(CRITICAL_ERROR, "Error updating users table : session_pagestart (GET)", __LINE__, __FILE__, $sql);
}
}
- $userdata['session_time'] = $current_time;
-
//
// Delete expired sessions
//
$expiry_time = $current_time - $board_config['session_length'];
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_time < $expiry_time";
$result = $db->sql_query($sql);
! if(!$result)
{
! message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", __LINE__, __FILE__, $sql);
}
--- 301,320 ----
WHERE user_id = " . $userdata['user_id'];
$result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Error updating users table : session_pagestart (GET)", "", __LINE__, __FILE__, $sql);
}
}
//
// Delete expired sessions
//
$expiry_time = $current_time - $board_config['session_length'];
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_time < $expiry_time";
$result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
}
***************
*** 282,285 ****
--- 329,335 ----
}
}
+ else
+ {
+ }
//
// If we reach here then no (valid) session exists. So we'll create a new one,
***************
*** 287,342 ****
//
! $login = 0;
! $autologin = 0;
! if( isset($sessiondata['userid']) && isset($sessiondata['autologinid']) )
{
! $sql = "SELECT user_id, user_autologin_key
! FROM " . USERS_TABLE . "
! WHERE user_id = " . $sessiondata['userid'];
! $result = $db->sql_query($sql);
! if (!$result)
! {
! message_die(CRITICAL_ERROR, "Error doing DB query userdata row fetch (non-session) : session_pagestart", __LINE__, __FILE__, $sql);
! }
!
! $userdata = $db->sql_fetchrow($result);
!
! if($userdata['user_autologin_key'])
! {
! if($userdata['user_autologin_key'] == $sessiondata['autologinid'])
! {
! //
! // We have a match, and not the kind you light ...
! //
! $login = 1;
! $autologin = 1;
! $user_id = $sessiondata['userid'];
! }
! else
! {
! unset($userdata);
! $user_id = ANONYMOUS;
! }
! }
! else
! {
! unset($userdata);
! $user_id = ANONYMOUS;
! }
}
else
{
- unset($userdata);
- $user_id = ANONYMOUS;
- }
-
- $result_id = session_begin($user_id, $user_ip, $thispage_id, $session_length, $login, $autologin);
- if(!$result_id)
- {
- message_die(CRITICAL_ERROR, "Error creating user session : session_pagestart", __LINE__, __FILE__, $sql);
- }
- else
- {
$sql = "SELECT u.*, s.*
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
--- 337,349 ----
//
! $user_id = ( isset($sessiondata['userid']) ) ? $sessiondata['userid'] : ANONYMOUS;
! $result_id = session_begin($user_id, $user_ip, $thispage_id, $board_config['session_length'], TRUE);
! if( !$result_id )
{
! message_die(CRITICAL_ERROR, "Error creating user session : session_pagestart", "", __LINE__, __FILE__, $sql);
}
else
{
$sql = "SELECT u.*, s.*
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
***************
*** 345,351 ****
AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
! if (!$result)
{
! message_die(CRITICAL_ERROR, "Error doing DB query userdata row fetch : session_pagestart new user", __LINE__, __FILE__, $sql);
}
--- 352,358 ----
AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
! if ( !$result )
{
! message_die(CRITICAL_ERROR, "Error doing DB query userdata row fetch : session_pagestart new user", "", __LINE__, __FILE__, $sql);
}
***************
*** 355,359 ****
return $userdata;
! } // session_check()
//
--- 362,366 ----
return $userdata;
! } // session_pagestart()
//
***************
*** 371,379 ****
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
{
! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
$sessionmethod = SESSION_METHOD_COOKIE;
--- 378,391 ----
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
+
+ $current_time = time();
! //
! // Pull cookiedata or grab the URI propagated sid
! //
! if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
{
! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : "";
! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : "";
$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 385,418 ****
$sessionmethod = SESSION_METHOD_GET;
}
- $current_time = time();
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_logged_in = 0, session_user_id = -1, session_time = $current_time
! WHERE (session_id = '" . $session_id . "')
! AND (session_user_id = $user_id)";
! $result = $db->sql_query($sql, BEGIN_TRANSACTION);
! if (!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't delete user session : session_end", __LINE__, __FILE__, $sql);
}
! if( isset($sessiondata['autologinid']) )
{
$sql = "UPDATE " . USERS_TABLE . "
! SET user_autologin_key = ''
WHERE user_id = $user_id";
$result = $db->sql_query($sql, END_TRANSACTION);
if (!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't reset user autologin key : session_end", __LINE__, __FILE__, $sql);
}
! $sessiondata['autologinid'] = "";
}
! $sessiondata['sessionend'] = $current_time;
$serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename, $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
--- 397,443 ----
$sessionmethod = SESSION_METHOD_GET;
}
! //
! // Delete existing session
! //
! $sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_id = '$session_id'
! AND session_user_id = $user_id";
! $result = $db->sql_query($sql);
! if(!$result)
{
! message_die(CRITICAL_ERROR, "Error removing user session : session_end", "", __LINE__, __FILE__, $sql);
}
! //
! // If a registered user then update their last visit
! // and autologin (if necessary) details
! //
! if( $user_id != ANONYMOUS )
{
+ $autologin_sql = "";
+ if( isset($sessiondata['autologinid']) && $sessionmethod = SESSION_METHOD_COOKIE )
+ {
+ unset($sessiondata['autologinid']);
+ $autologin_sql = ", user_autologin_key = ''";
+ }
+
$sql = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . time() . $autologin_sql . "
WHERE user_id = $user_id";
$result = $db->sql_query($sql, END_TRANSACTION);
if (!$result)
{
! message_die(CRITICAL_ERROR, "Couldn't reset user autologin key : session_end", "", __LINE__, __FILE__, $sql);
}
!
}
! $sessiondata['userid'] = ANONYMOUS;
! $sessiondata['lastvisit'] = $current_time;
$serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! setcookie($cookiename . '_sid', '', 0, $cookiepath, $cookiedomain, $cookiesecure);
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
***************
*** 423,426 ****
--- 448,480 ----
//
+ // This checks to see if we're @ the 20 cookie limit
+ // if we are it re-sends the session id. This isn't a great
+ // solution but it does work, although resulting in
+ // more cookies being sent than necessary. Will re-evaluate
+ // this in 2.2
+ //
+ function session_send_cookie($append_name, $set_value, $last_time)
+ {
+ global $board_config;
+ global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
+
+ setcookie($board_config['cookie_name'] . $append_name, $set_value, $last_time, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+
+ $cookie_count = 0;
+ while( list(, $value) = each($HTTP_COOKIE_VARS) )
+ {
+ $cookie_count += count($value);
+ }
+
+ if( $cookie_count == 20 )
+ {
+ setcookie($board_config['cookie_name'] . "_sid", stripslashes($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"]), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ }
+
+ return;
+ }
+
+ //
+ //
// Append $SID to a url. Borrowed from phplib and modified. This is an
// extra routine utilised by the session code above and acts as a wrapper
***************
*** 432,438 ****
global $SID;
! if(!empty($SID) && !eregi("sid=", $url))
{
! $url .= ( (strpos($url, "?") != false) ? ( ( $non_html_amp ) ? "&" : "&" ) : "?" ) . $SID;
}
--- 486,492 ----
global $SID;
! if( !empty($SID) && !eregi("sid=", $url) )
{
! $url .= ( ( strpos($url, "?") != false ) ? ( ( $non_html_amp ) ? "&" : "&" ) : "?" ) . $SID;
}
|
