Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/includes
Modified Files:
page_header.php sessions.php usercp_avatar.php
Log Message:
2.0.14.3
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** page_header.php 30 Jul 2004 02:12:38 -0000 1.2
--- page_header.php 16 Apr 2005 21:02:23 -0000 1.3
***************
*** 36,40 ****
$phpver = phpversion();
! $useragent = (isset($_SERVER["HTTP_USER_AGENT"]) ) ? $_SERVER["HTTP_USER_AGENT"] : $HTTP_USER_AGENT;
if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
--- 36,40 ----
$phpver = phpversion();
! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
***************
*** 467,471 ****
// Work around for "current" Apache 2 + PHP module which seems to not
// cope with private cache control setting
! if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2'))
{
header ('Cache-Control: no-cache, pre-check=0, post-check=0');
--- 467,471 ----
// Work around for "current" Apache 2 + PHP module which seems to not
// cope with private cache control setting
! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) )
{
header ('Cache-Control: no-cache, pre-check=0, post-check=0');
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sessions.php 28 Feb 2005 00:58:11 -0000 1.4
--- sessions.php 16 Apr 2005 21:02:23 -0000 1.5
***************
*** 52,55 ****
--- 52,56 ----
{
$session_id = '';
+ $page_id = 0;
}
***************
*** 92,95 ****
--- 93,101 ----
$enable_autologin = 0;
$user_id = $userdata['user_id'] = ANONYMOUS;
+
+ $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS;
+ $result = $db->sql_query($sql);
+ $userdata = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
}
}
***************
*** 100,103 ****
--- 106,114 ----
$enable_autologin = 0;
$user_id = $userdata['user_id'] = ANONYMOUS;
+
+ $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS;
+ $result = $db->sql_query($sql);
+ $userdata = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
}
}
***************
*** 230,233 ****
--- 241,245 ----
}
+ $thispage_id = (int) $thispage_id
//
// Does a session exist?
Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_avatar.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usercp_avatar.php 22 Feb 2005 01:21:02 -0000 1.2
--- usercp_avatar.php 16 Apr 2005 21:02:23 -0000 1.3
***************
*** 233,242 ****
}
! $move_file($avatar_filename, './' . $board_config['avatar_path'] . "/$new_filename");
! }
! if (!is_uploaded_file($avatar_filename))
! {
! message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
}
--- 233,243 ----
}
! if (!is_uploaded_file($avatar_filename))
! {
! message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
! }
!
! $move_file($avatar_filename, './' . $board_config['avatar_path'] . "/$new_filename");
}
|