phpbb-php5mod-cvs-checkins

[geocator <geo...@us...>]

Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13115/includes

Modified Files:
	page_header.php sessions.php usercp_activate.php 
	usercp_email.php usercp_register.php usercp_sendpasswd.php 
	usercp_viewprofile.php 
Log Message:
Say goodbye long array names.  Say hello superglobals.

Removed code in common.php to try to rename the variables at runtime.  No longer needed since we are renaming them.

Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_sendpasswd.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usercp_sendpasswd.php	29 Jul 2004 22:36:20 -0000	1.1
--- usercp_sendpasswd.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 28,35 ****
  }
  
! if ( isset($HTTP_POST_VARS['submit']) )
  {
! 	$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : '';
! 	$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : '';
  
  	$sql = "SELECT user_id, username, user_email, user_active, user_lang 
--- 28,35 ----
  }
  
! if ( isset($_POST['submit']) )
  {
! 	$username = ( !empty($_POST['username']) ) ? trim(strip_tags($_POST['username'])) : '';
! 	$email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : '';
  
  	$sql = "SELECT user_id, username, user_email, user_active, user_lang 

Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_email.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usercp_email.php	29 Jul 2004 22:36:20 -0000	1.1
--- usercp_email.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 34,40 ****
  }
  
! if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
  {
! 	$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? intval($HTTP_GET_VARS[POST_USERS_URL]) : intval($HTTP_POST_VARS[POST_USERS_URL]);
  }
  else
--- 34,40 ----
  }
  
! if ( !empty($_GET[POST_USERS_URL]) || !empty($_POST[POST_USERS_URL]) )
  {
! 	$user_id = ( !empty($_GET[POST_USERS_URL]) ) ? intval($_GET[POST_USERS_URL]) : intval($_POST[POST_USERS_URL]);
  }
  else
***************
*** 66,76 ****
  		}
  
! 		if ( isset($HTTP_POST_VARS['submit']) )
  		{
  			$error = FALSE;
  
! 			if ( !empty($HTTP_POST_VARS['subject']) )
  			{
! 				$subject = trim(stripslashes($HTTP_POST_VARS['subject']));
  			}
  			else
--- 66,76 ----
  		}
  
! 		if ( isset($_POST['submit']) )
  		{
  			$error = FALSE;
  
! 			if ( !empty($_POST['subject']) )
  			{
! 				$subject = trim(stripslashes($_POST['subject']));
  			}
  			else
***************
*** 80,86 ****
  			}
  
! 			if ( !empty($HTTP_POST_VARS['message']) )
  			{
! 				$message = trim(stripslashes($HTTP_POST_VARS['message']));
  			}
  			else
--- 80,86 ----
  			}
  
! 			if ( !empty($_POST['message']) )
  			{
! 				$message = trim(stripslashes($_POST['message']));
  			}
  			else
***************
*** 123,127 ****
  					$emailer->reset();
  
! 					if ( !empty($HTTP_POST_VARS['cc_email']) )
  					{
  						$emailer->from($userdata['user_email']);
--- 123,127 ----
  					$emailer->reset();
  
! 					if ( !empty($_POST['cc_email']) )
  					{
  						$emailer->from($userdata['user_email']);

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sessions.php	29 Jul 2004 22:36:20 -0000	1.1
--- sessions.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 28,32 ****
  {
  	global $db, $board_config;
! 	global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 28,32 ----
  {
  	global $db, $board_config;
! 	global $_COOKIE, $_GET, $SID;
  
  	$cookiename = $board_config['cookie_name'];
***************
*** 35,42 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
! 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array();
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 35,42 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) )
  	{
! 		$session_id = isset($_COOKIE[$cookiename . '_sid']) ? $_COOKIE[$cookiename . '_sid'] : '';
! 		$sessiondata = isset($_COOKIE[$cookiename . '_data']) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array();
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 44,48 ****
  	{
  		$sessiondata = array();
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}
--- 44,48 ----
  	{
  		$sessiondata = array();
! 		$session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}
***************
*** 201,205 ****
  {
  	global $db, $lang, $board_config;
! 	global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 201,205 ----
  {
  	global $db, $lang, $board_config;
! 	global $_COOKIE, $_GET, $SID;
  
  	$cookiename = $board_config['cookie_name'];
***************
*** 211,218 ****
  	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'])) : array();
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 211,218 ----
  	unset($userdata);
  
! 	if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) )
  	{
! 		$sessiondata = isset( $_COOKIE[$cookiename . '_data'] ) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array();
! 		$session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 220,224 ****
  	{
  		$sessiondata = array();
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}
--- 220,224 ----
  	{
  		$sessiondata = array();
! 		$session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}
***************
*** 335,339 ****
  {
  	global $db, $lang, $board_config;
! 	global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 335,339 ----
  {
  	global $db, $lang, $board_config;
! 	global $_COOKIE, $_GET, $SID;
  
  	$cookiename = $board_config['cookie_name'];
***************
*** 347,358 ****
  	// Pull cookiedata or grab the URI propagated sid
  	//
! 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
  	else
  	{
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}
--- 347,358 ----
  	// Pull cookiedata or grab the URI propagated sid
  	//
! 	if ( isset($_COOKIE[$cookiename . '_sid']) )
  	{
! 		$session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
  	else
  	{
! 		$session_id = ( isset($_GET['sid']) ) ? $_GET['sid'] : '';
  		$sessionmethod = SESSION_METHOD_GET;
  	}

Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_activate.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usercp_activate.php	29 Jul 2004 22:36:20 -0000	1.1
--- usercp_activate.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 30,34 ****
  $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey 
  	FROM " . USERS_TABLE . "
! 	WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]);
  if ( !($result = $db->sql_query($sql)) )
  {
--- 30,34 ----
  $sql = "SELECT user_active, user_id, username, user_email, user_newpasswd, user_lang, user_actkey 
  	FROM " . USERS_TABLE . "
! 	WHERE user_id = " . intval($_GET[POST_USERS_URL]);
  if ( !($result = $db->sql_query($sql)) )
  {
***************
*** 46,50 ****
  		message_die(GENERAL_MESSAGE, $lang['Already_activated']);
  	}
! 	else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != ''))
  	{
  		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';
--- 46,50 ----
  		message_die(GENERAL_MESSAGE, $lang['Already_activated']);
  	}
! 	else if ((trim($row['user_actkey']) == trim($_GET['act_key'])) && (trim($row['user_actkey']) != ''))
  	{
  		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usercp_register.php	29 Jul 2004 22:36:20 -0000	1.1
--- usercp_register.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 63,67 ****
  $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
  
! if ( $mode == 'register' && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
  {
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 63,67 ----
  $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
  
! if ( $mode == 'register' && !isset($_POST['agreed']) && !isset($_GET['agreed']) )
  {
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
***************
*** 72,76 ****
  }
  
! $coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE;
  
  //
--- 72,76 ----
  }
  
! $coppa = ( empty($_POST['coppa']) && empty($_GET['coppa']) ) ? 0 : TRUE;
  
  //
***************
*** 78,85 ****
  //
  if (
! 	isset($HTTP_POST_VARS['submit']) ||
! 	isset($HTTP_POST_VARS['avatargallery']) ||
! 	isset($HTTP_POST_VARS['submitavatar']) ||
! 	isset($HTTP_POST_VARS['cancelavatar']) ||
  	$mode == 'register' )
  {
--- 78,85 ----
  //
  if (
! 	isset($_POST['submit']) ||
! 	isset($_POST['avatargallery']) ||
! 	isset($_POST['submitavatar']) ||
! 	isset($_POST['cancelavatar']) ||
  	$mode == 'register' )
  {
***************
*** 90,95 ****
  	if ( $mode == 'editprofile' )
  	{
! 		$user_id = intval($HTTP_POST_VARS['user_id']);
! 		$current_email = trim(htmlspecialchars($HTTP_POST_VARS['current_email']));
  	}
  
--- 90,95 ----
  	if ( $mode == 'editprofile' )
  	{
! 		$user_id = intval($_POST['user_id']);
! 		$current_email = trim(htmlspecialchars($_POST['current_email']));
  	}
  
***************
*** 101,107 ****
  	while( list($var, $param) = @each($strip_var_list) )
  	{
! 		if ( !empty($HTTP_POST_VARS[$param]) )
  		{
! 			$$var = trim(htmlspecialchars($HTTP_POST_VARS[$param]));
  		}
  	}
--- 101,107 ----
  	while( list($var, $param) = @each($strip_var_list) )
  	{
! 		if ( !empty($_POST[$param]) )
  		{
! 			$$var = trim(htmlspecialchars($_POST[$param]));
  		}
  	}
***************
*** 111,117 ****
  	while( list($var, $param) = @each($trim_var_list) )
  	{
! 		if ( !empty($HTTP_POST_VARS[$param]) )
  		{
! 			$$var = trim($HTTP_POST_VARS[$param]);
  		}
  	}
--- 111,117 ----
  	while( list($var, $param) = @each($trim_var_list) )
  	{
! 		if ( !empty($_POST[$param]) )
  		{
! 			$$var = trim($_POST[$param]);
  		}
  	}
***************
*** 123,156 ****
  	validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
  
! 	$viewemail = ( isset($HTTP_POST_VARS['viewemail']) ) ? ( ($HTTP_POST_VARS['viewemail']) ? TRUE : 0 ) : 0;
! 	$allowviewonline = ( isset($HTTP_POST_VARS['hideonline']) ) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : TRUE ) : TRUE;
! 	$notifyreply = ( isset($HTTP_POST_VARS['notifyreply']) ) ? ( ($HTTP_POST_VARS['notifyreply']) ? TRUE : 0 ) : 0;
! 	$notifypm = ( isset($HTTP_POST_VARS['notifypm']) ) ? ( ($HTTP_POST_VARS['notifypm']) ? TRUE : 0 ) : TRUE;
! 	$popup_pm = ( isset($HTTP_POST_VARS['popup_pm']) ) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE;
  
  	if ( $mode == 'register' )
  	{
! 		$attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : $board_config['allow_sig'];
  
! 		$allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $board_config['allow_html'];
! 		$allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $board_config['allow_bbcode'];
! 		$allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $board_config['allow_smilies'];
  	}
  	else
  	{
! 		$attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : 0;
  
! 		$allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $userdata['user_allowhtml'];
! 		$allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $userdata['user_allowbbcode'];
! 		$allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $userdata['user_allowsmile'];
  	}
  
! 	$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
  
! 	if ( !empty($HTTP_POST_VARS['language']) )
  	{
! 		if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) )
  		{
! 			$user_lang = htmlspecialchars($HTTP_POST_VARS['language']);
  		}
  		else
--- 123,156 ----
  	validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
  
! 	$viewemail = ( isset($_POST['viewemail']) ) ? ( ($_POST['viewemail']) ? TRUE : 0 ) : 0;
! 	$allowviewonline = ( isset($_POST['hideonline']) ) ? ( ($_POST['hideonline']) ? 0 : TRUE ) : TRUE;
! 	$notifyreply = ( isset($_POST['notifyreply']) ) ? ( ($_POST['notifyreply']) ? TRUE : 0 ) : 0;
! 	$notifypm = ( isset($_POST['notifypm']) ) ? ( ($_POST['notifypm']) ? TRUE : 0 ) : TRUE;
! 	$popup_pm = ( isset($_POST['popup_pm']) ) ? ( ($_POST['popup_pm']) ? TRUE : 0 ) : TRUE;
  
  	if ( $mode == 'register' )
  	{
! 		$attachsig = ( isset($_POST['attachsig']) ) ? ( ($_POST['attachsig']) ? TRUE : 0 ) : $board_config['allow_sig'];
  
! 		$allowhtml = ( isset($_POST['allowhtml']) ) ? ( ($_POST['allowhtml']) ? TRUE : 0 ) : $board_config['allow_html'];
! 		$allowbbcode = ( isset($_POST['allowbbcode']) ) ? ( ($_POST['allowbbcode']) ? TRUE : 0 ) : $board_config['allow_bbcode'];
! 		$allowsmilies = ( isset($_POST['allowsmilies']) ) ? ( ($_POST['allowsmilies']) ? TRUE : 0 ) : $board_config['allow_smilies'];
  	}
  	else
  	{
! 		$attachsig = ( isset($_POST['attachsig']) ) ? ( ($_POST['attachsig']) ? TRUE : 0 ) : 0;
  
! 		$allowhtml = ( isset($_POST['allowhtml']) ) ? ( ($_POST['allowhtml']) ? TRUE : 0 ) : $userdata['user_allowhtml'];
! 		$allowbbcode = ( isset($_POST['allowbbcode']) ) ? ( ($_POST['allowbbcode']) ? TRUE : 0 ) : $userdata['user_allowbbcode'];
! 		$allowsmilies = ( isset($_POST['allowsmilies']) ) ? ( ($_POST['allowsmilies']) ? TRUE : 0 ) : $userdata['user_allowsmile'];
  	}
  
! 	$user_style = ( isset($_POST['style']) ) ? intval($_POST['style']) : $board_config['default_style'];
  
! 	if ( !empty($_POST['language']) )
  	{
! 		if ( preg_match('/^[a-z_]+$/i', $_POST['language']) )
  		{
! 			$user_lang = htmlspecialchars($_POST['language']);
  		}
  		else
***************
*** 165,169 ****
  	}
  
! 	$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
  
  	$sql = "SELECT config_value
--- 165,169 ----
  	}
  
! 	$user_timezone = ( isset($_POST['timezone']) ) ? doubleval($_POST['timezone']) : $board_config['board_timezone'];
  
  	$sql = "SELECT config_value
***************
*** 176,193 ****
  	$row = $db->sql_fetchrow($result);
  	$board_config['default_dateformat'] = $row['config_value'];
! 	$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['dateformat'])) : $board_config['default_dateformat'];
  
! 	$user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarselect']) : ( ( isset($HTTP_POST_VARS['avatarlocal'])  ) ? htmlspecialchars($HTTP_POST_VARS['avatarlocal']) : '' );
  
! 	$user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['avatarremoteurl'])) : '';
! 	$user_avatar_upload = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim($HTTP_POST_VARS['avatarurl']) : ( ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '' );
! 	$user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : '';
! 	$user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0;
! 	$user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : '';
  
  	$user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : '';
  	$user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : '';
  
! 	if ( (isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar'])) && (!isset($HTTP_POST_VARS['submit'])) )
  	{
  		$username = stripslashes($username);
--- 176,193 ----
  	$row = $db->sql_fetchrow($result);
  	$board_config['default_dateformat'] = $row['config_value'];
! 	$user_dateformat = ( !empty($_POST['dateformat']) ) ? trim(htmlspecialchars($_POST['dateformat'])) : $board_config['default_dateformat'];
  
! 	$user_avatar_local = ( isset($_POST['avatarselect']) && !empty($_POST['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($_POST['avatarselect']) : ( ( isset($_POST['avatarlocal'])  ) ? htmlspecialchars($_POST['avatarlocal']) : '' );
  
! 	$user_avatar_remoteurl = ( !empty($_POST['avatarremoteurl']) ) ? trim(htmlspecialchars($_POST['avatarremoteurl'])) : '';
! 	$user_avatar_upload = ( !empty($_POST['avatarurl']) ) ? trim($_POST['avatarurl']) : ( ( $_FILES['avatar']['tmp_name'] != "none") ? $_FILES['avatar']['tmp_name'] : '' );
! 	$user_avatar_name = ( !empty($_FILES['avatar']['name']) ) ? $_FILES['avatar']['name'] : '';
! 	$user_avatar_size = ( !empty($_FILES['avatar']['size']) ) ? $_FILES['avatar']['size'] : 0;
! 	$user_avatar_filetype = ( !empty($_FILES['avatar']['type']) ) ? $_FILES['avatar']['type'] : '';
  
  	$user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : '';
  	$user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : '';
  
! 	if ( (isset($_POST['avatargallery']) || isset($_POST['submitavatar']) || isset($_POST['cancelavatar'])) && (!isset($_POST['submit'])) )
  	{
  		$username = stripslashes($username);
***************
*** 211,215 ****
  		$user_dateformat = stripslashes($user_dateformat);
  
! 		if ( !isset($HTTP_POST_VARS['cancelavatar']))
  		{
  			$user_avatar = $user_avatar_local;
--- 211,215 ----
  		$user_dateformat = stripslashes($user_dateformat);
  
! 		if ( !isset($_POST['cancelavatar']))
  		{
  			$user_avatar = $user_avatar_local;
***************
*** 232,236 ****
  // Did the user submit? In this case build a query to update the users profile in the DB
  //
! if ( isset($HTTP_POST_VARS['submit']) )
  {
  	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
--- 232,236 ----
  // Did the user submit? In this case build a query to update the users profile in the DB
  //
! if ( isset($_POST['submit']) )
  {
  	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
***************
*** 386,390 ****
  	$avatar_sql = '';
  
! 	if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
  	{
  		$avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
--- 386,390 ----
  	$avatar_sql = '';
  
! 	if ( isset($_POST['avatardel']) && $mode == 'editprofile' )
  	{
  		$avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
***************
*** 687,691 ****
  
  }
! else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) && !isset($HTTP_POST_VARS['submitavatar']) && !isset($HTTP_POST_VARS['cancelavatar']) )
  {
  	$user_id = $userdata['user_id'];
--- 687,691 ----
  
  }
! else if ( $mode == 'editprofile' && !isset($_POST['avatargallery']) && !isset($_POST['submitavatar']) && !isset($_POST['cancelavatar']) )
  {
  	$user_id = $userdata['user_id'];
***************
*** 742,750 ****
  }
  
! if( isset($HTTP_POST_VARS['avatargallery']) && !$error )
  {
  	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
  
! 	$avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? htmlspecialchars($HTTP_POST_VARS['avatarcategory']) : '';
  
  	$template->set_filenames(array(
--- 742,750 ----
  }
  
! if( isset($_POST['avatargallery']) && !$error )
  {
  	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
  
! 	$avatar_category = ( !empty($_POST['avatarcategory']) ) ? htmlspecialchars($_POST['avatarcategory']) : '';
  
  	$template->set_filenames(array(

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/page_header.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** page_header.php	29 Jul 2004 22:36:19 -0000	1.1
--- page_header.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 47,51 ****
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
--- 47,51 ----
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
***************
*** 463,467 ****
  
  // Add no-cache control for cookies if they are set
! //$c_no_cache = (isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : '';
  
  // Work around for "current" Apache 2 + PHP module which seems to not
--- 463,467 ----
  
  // Add no-cache control for cookies if they are set
! //$c_no_cache = (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : '';
  
  // Work around for "current" Apache 2 + PHP module which seems to not

Index: usercp_viewprofile.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_viewprofile.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usercp_viewprofile.php	29 Jul 2004 22:36:20 -0000	1.1
--- usercp_viewprofile.php	30 Jul 2004 02:12:38 -0000	1.2
***************
*** 28,36 ****
  }
  
! if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS )
  {
  	message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  }
! $profiledata = get_userdata($HTTP_GET_VARS[POST_USERS_URL]);
  
  $sql = "SELECT *
--- 28,36 ----
  }
  
! if ( empty($_GET[POST_USERS_URL]) || $_GET[POST_USERS_URL] == ANONYMOUS )
  {
  	message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  }
! $profiledata = get_userdata($_GET[POST_USERS_URL]);
  
  $sql = "SELECT *