Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes auth_session.php,1.3,1.4
|
From: Paul S. O. <ps...@us...> - 2002-06-22 15:17:29
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14587/includes
Modified Files:
auth_session.php
Log Message:
oops, that's what you get for not testing more thoroughly ...
Index: auth_session.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/auth_session.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth_session.php 11 Jun 2002 02:27:26 -0000 1.3
--- auth_session.php 22 Jun 2002 15:17:26 -0000 1.4
***************
*** 32,38 ****
$session_browser = ( !empty($HTTP_SERVER_VARS['HTTP_USER_AGENT']) ) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : $HTTP_ENV_VARS['HTTP_USER_AGENT'];
$this_page = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
! $this_query = ( !empty($HTTP_SERVER_VARS['QUERY_STRING']) ) ? explode('&', $HTTP_SERVER_VARS['QUERY_STRING']) : explode('&', $HTTP_ENV_VARS['QUERY_STRING']);
! array_shift($this_query);
! $this_page = $this_page . '&' . implode('&', $this_query);
if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data']) )
--- 32,36 ----
$session_browser = ( !empty($HTTP_SERVER_VARS['HTTP_USER_AGENT']) ) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : $HTTP_ENV_VARS['HTTP_USER_AGENT'];
$this_page = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
! $this_page .= '&' . ( ( !empty($HTTP_SERVER_VARS['QUERY_STRING']) ) ? $HTTP_SERVER_VARS['QUERY_STRING'] : $HTTP_ENV_VARS['QUERY_STRING'] );
if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data']) )
***************
*** 54,58 ****
if ( !empty($board_config['limit_load']) && file_exists('/proc/loadavg') )
{
! if ( $load = file('/proc/loadvg') )
{
$load = explode(' ', $load[0]);
--- 52,56 ----
if ( !empty($board_config['limit_load']) && file_exists('/proc/loadavg') )
{
! if ( $load = file('/proc/loadavg') )
{
$load = explode(' ', $load[0]);
***************
*** 139,155 ****
//
! // Limit 5 minute sessions
//
! $sql = "SELECT COUNT(*) AS sessions
! FROM " . SESSIONS_TABLE . "
! WHERE session_time >= " . ( $current_time - 3600 );
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Could not obtain ban information', '', __LINE__, __FILE__, $sql);
}
!
$row = $db->sql_fetchrow[$result];
! if ( intval($board_config['active_sessions']) && $row['sessions'] >= $board_config['active_sessions'] )
{
message_die(GENERAL_MESSAGE, 'Board_unavailable', 'Information');
--- 137,164 ----
//
! // Limit connections (for MySQL) or 5 minute sessions (for other DB's)
//
! switch ( DB_LAYER )
! {
! case 'mysql':
! case 'mysql4':
! $sql = "SELECT COUNT(*) AS sessions
! FROM " . SESSIONS_TABLE . "
! WHERE session_time >= " . ( $current_time - 3600 );
! break;
! default:
! $sql = "SELECT COUNT(*) AS sessions
! FROM " . SESSIONS_TABLE . "
! WHERE session_time >= " . ( $current_time - 3600 );
! break;
! }
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Could not obtain connection information', '', __LINE__, __FILE__, $sql);
}
!
$row = $db->sql_fetchrow[$result];
! if ( intval($board_config['active_sessions']) && $row['sessions'] >= intval($board_config['active_sessions']) )
{
message_die(GENERAL_MESSAGE, 'Board_unavailable', 'Information');
***************
*** 180,188 ****
FROM " . BANLIST_TABLE . "
WHERE ban_ip IN (
! '" . $user_ip_parts[1] . ".',
! '" . $user_ip_parts[1] . "." . $user_ip_parts[2] . ".',
! '" . $user_ip_parts[1] . "." . $user_ip_parts[2] . "." . $user_ip_parts[3] . ".',
! '" . $user_ip_parts[1] . "." . $user_ip_parts[2] . "." . $user_ip_parts[3] . "." . $user_ip_parts[4] . "')
! OR ban_userid = $user_id";
if ( $user_id != ANONYMOUS )
{
--- 189,197 ----
FROM " . BANLIST_TABLE . "
WHERE ban_ip IN (
! '" . $user_ip_parts[0] . ".',
! '" . $user_ip_parts[0] . "." . $user_ip_parts[1] . ".',
! '" . $user_ip_parts[0] . "." . $user_ip_parts[1] . "." . $user_ip_parts[2] . ".',
! '" . $user_ip_parts[0] . "." . $user_ip_parts[1] . "." . $user_ip_parts[2] . "." . $user_ip_parts[3] . "')
! OR ban_userid = " . $this->userdata['user_id'];
if ( $user_id != ANONYMOUS )
{
***************
*** 376,382 ****
$style = ( !$board_config['override_user_style'] && $this->userdata['user_id'] != ANONYMOUS && $this->userdata['user_style'] > 0 )? $this->userdata['user_style'] : $board_config['default_style'];
! $sql = "SELECT *
! FROM " . THEMES_TABLE . "
! WHERE themes_id = $style";
if ( !($result = $db->sql_query($sql)) )
{
--- 385,392 ----
$style = ( !$board_config['override_user_style'] && $this->userdata['user_id'] != ANONYMOUS && $this->userdata['user_style'] > 0 )? $this->userdata['user_style'] : $board_config['default_style'];
! $sql = "SELECT s.style_name, s.template_name, c.css_data, c.css_extra_data
! FROM " . STYLES_TABLE . " s, " . STYLES_CSS_TABLE . " c
! WHERE s.style_id = $style
! AND c.theme_id = s.style_id";
if ( !($result = $db->sql_query($sql)) )
{
***************
*** 389,392 ****
--- 399,407 ----
}
+ //
+ // Unserialize the extra data
+ //
+ $theme['css_extra_data'] = unserialize($theme['css_extra_data']);
+
$template_path = 'templates/' ;
$template_name = $theme['template_name'] ;
***************
*** 406,410 ****
$img_lang = ( file_exists($current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
! while( list($key, $value) = @each($images) )
{
if ( !is_array($value) )
--- 421,425 ----
$img_lang = ( file_exists($current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
! while ( list($key, $value) = @each($images) )
{
if ( !is_array($value) )
***************
*** 434,438 ****
$sql = "SELECT ag.forum_id, ag.auth_allow_deny, ao.auth_option
! FROM phpbb_user_group ug, phpbb_auth_groups ag, phpbb_auth_options ao
WHERE ug.user_id = " . $userdata['user_id'] . "
AND ag.group_id = ug.group_id
--- 449,453 ----
$sql = "SELECT ag.forum_id, ag.auth_allow_deny, ao.auth_option
! FROM " . USER_GROUP_TABLE . " ug, " . ACL_GROUPS_TABLE . " ag, " . ACL_OPTIONS_TABLE . " ao
WHERE ug.user_id = " . $userdata['user_id'] . "
AND ag.group_id = ug.group_id
***************
*** 455,459 ****
$sql = "SELECT au.forum_id, au.auth_allow_deny, ao.auth_option
! FROM phpbb_auth_users au, phpbb_auth_options ao
WHERE au.user_id = " . $userdata['user_id'] . "
AND ao.auth_option_id = au.auth_option_id";
--- 470,474 ----
$sql = "SELECT au.forum_id, au.auth_allow_deny, ao.auth_option
! FROM " . ACL_USERS_TABLE . " au, " . ACL_OPTIONS_TABLE . " ao
WHERE au.user_id = " . $userdata['user_id'] . "
AND ao.auth_option_id = au.auth_option_id";
***************
*** 567,573 ****
// Centralised login? May stay, may not ... depends if needed
//
! function login($username, $password)
{
! global $SID, $db, $board_config, $lang, $user_ip, $phpEx;
$result = false;
--- 582,592 ----
// Centralised login? May stay, may not ... depends if needed
//
! function login($username, $password, $autologin = false)
{
! global $SID, $db, $board_config, $lang, $user_ip;
! global $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
!
! $this_page = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
! $this_page .= '&' . ( ( !empty($HTTP_SERVER_VARS['QUERY_STRING']) ) ? $HTTP_SERVER_VARS['QUERY_STRING'] : $HTTP_ENV_VARS['QUERY_STRING'] );
$result = false;
***************
*** 585,590 ****
if ( $row['user_level'] != ADMIN && $board_config['board_disable'] )
{
! header($header_location . "index.$phpEx$SID");
! exit;
}
--- 604,609 ----
if ( $row['user_level'] != ADMIN && $board_config['board_disable'] )
{
! // header($header_location . "index.$phpEx$SID");
! // exit;
}
***************
*** 603,607 ****
if ( md5($password) == $row['user_password'] && $row['user_active'] )
{
! $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? md5($password) : '';
$user_ip_parts = explode('.', $user_ip);
--- 622,626 ----
if ( md5($password) == $row['user_password'] && $row['user_active'] )
{
! $autologin = ( isset($autologin) ) ? md5($password) : '';
$user_ip_parts = explode('.', $user_ip);
***************
*** 641,645 ****
//
$sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_user_id = " . $row['user_id'] . ", session_start = $current_time, session_time = $current_time, session_browser = '$session_browser', session_page = ''
WHERE session_id = '" . $userdata['session_id'] . "'";
if ( !$db->sql_query($sql) )
--- 660,664 ----
//
$sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_user_id = " . $row['user_id'] . ", session_start = $current_time, session_time = $current_time, session_browser = '$session_browser', session_page = '$this_page'
WHERE session_id = '" . $userdata['session_id'] . "'";
if ( !$db->sql_query($sql) )
***************
*** 661,674 ****
return $result;
- }
-
- //
- //
- // This routine is dead instead we just set a URL$SID for
- // appropriate URLs rather than this append stuff
- //
- function append_sid($url, $non_html_amp = false)
- {
- return $url;
}
--- 680,683 ----
|
