[mxbb-commits] core/includes mx_functions_core.php, 1.69, 1.70 mx_functions_blockcp.php, 1.24, 1.25 mx_functions.php, 1.78, 1.79 page_header.php, 1.51, 1.52

[MW <jo...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10803/includes

Modified Files:
	mx_functions_core.php mx_functions_blockcp.php 
	mx_functions.php page_header.php 
Log Message:
Upgrading old type $HTML_*_VARS

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mx_functions_blockcp.php	9 Feb 2008 12:37:24 -0000	1.24
--- mx_functions_blockcp.php	9 Feb 2008 19:44:11 -0000	1.25
***************
*** 62,66 ****
  	function _controlpanel( $id, $new_block = false )
  	{
! 		global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_COOKIE_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images;
  
  		$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
--- 62,66 ----
  	function _controlpanel( $id, $new_block = false )
  	{
! 		global $blockcptemplate, $lang, $db, $board_config, $theme, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images;
  
  		$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
***************
*** 186,190 ****
  		//
  		$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode';
! 		$cookie_blockCP = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 'settings';
  
  		//
--- 186,190 ----
  		//
  		$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode';
! 		$cookie_blockCP = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 'settings';
  
  		//

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** page_header.php	9 Feb 2008 12:37:24 -0000	1.51
--- page_header.php	9 Feb 2008 19:44:11 -0000	1.52
***************
*** 32,36 ****
  	$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') ) )
--- 32,36 ----
  	$phpver = phpversion();
  
! 	$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  
  	if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
***************
*** 44,48 ****
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
--- 44,48 ----
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
***************
*** 583,587 ****
  // Determine if user have gecko/opera browser
  //
! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  if ( strstr($useragent, 'Gecko') )
  {
--- 583,587 ----
  // Determine if user have gecko/opera browser
  //
! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  if ( strstr($useragent, 'Gecko') )
  {
***************
*** 637,645 ****
  
  // 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
  // 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');
--- 637,645 ----
  
  // 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
  // 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');

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** mx_functions_core.php	9 Feb 2008 19:32:55 -0000	1.69
--- mx_functions_core.php	9 Feb 2008 19:44:11 -0000	1.70
***************
*** 419,423 ****
  	function _get_page_config( $id = '' )
  	{
! 		global $db, $HTTP_SESSION_VARS;
  
  		$this->pages_config = array();
--- 419,423 ----
  	function _get_page_config( $id = '' )
  	{
! 		global $db;
  
  		$this->pages_config = array();
***************
*** 542,546 ****
  	function _update_cache( )
  	{
! 		global $db, $HTTP_SESSION_VARS, $mx_root_path, $phpbb_root_path, $phpEx, $mx_use_cache, $portal_config;
  
  		$portal_cache_time = time();
--- 542,546 ----
  	function _update_cache( )
  	{
! 		global $db, $mx_root_path, $phpbb_root_path, $phpEx, $mx_use_cache, $portal_config;
  
  		$portal_cache_time = time();
***************
*** 2869,2873 ****
  	function _set_all()
  	{
! 		global $userdata, $mx_root_path, $mx_request_vars, $HTTP_COOKIE_VARS, $portal_config, $theme, $lang;
  		global $mx_block;
  
--- 2869,2873 ----
  	function _set_all()
  	{
! 		global $userdata, $mx_root_path, $mx_request_vars, $portal_config, $theme, $lang;
  		global $mx_block;
  
***************
*** 2922,2926 ****
  		// Generate the fold/unfold menu navigation switches (cookie based)
  		//
! 		$this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($HTTP_COOKIE_VARS['editCP_switch']) ) ? $HTTP_COOKIE_VARS['editCP_switch'] == 1 : true;
  	}
  
--- 2922,2926 ----
  		// Generate the fold/unfold menu navigation switches (cookie based)
  		//
! 		$this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($_COOKIE['editCP_switch']) ) ? $_COOKIE['editCP_switch'] == 1 : true;
  	}
  

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** mx_functions.php	9 Feb 2008 12:37:24 -0000	1.78
--- mx_functions.php	9 Feb 2008 19:44:11 -0000	1.79
***************
*** 445,452 ****
  function mx_url()
  {
! 	global $SID, $HTTP_SERVER_VARS;
  
  	$numargs = func_num_args();
! 	$url = $PHP_SELF . '?' . $HTTP_SERVER_VARS['QUERY_STRING'];
  	$url = parse_url($url);
  
--- 445,452 ----
  function mx_url()
  {
! 	global $SID;
  
  	$numargs = func_num_args();
! 	$url = $PHP_SELF . '?' . $_SERVER['QUERY_STRING'];
  	$url = parse_url($url);
  
***************
*** 553,557 ****
  function mx_session_start()
  {
! 	global $board_config, $HTTP_SERVER_VARS, $do_gzip_compress;
  
  	//
--- 553,557 ----
  function mx_session_start()
  {
! 	global $board_config, $do_gzip_compress;
  
  	//
***************
*** 579,583 ****
  		$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') ) )
--- 579,583 ----
  		$phpver = phpversion();
  
! 		$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  
  		if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
***************
*** 591,595 ****
  		else if ( $phpver > '4.0' )
  		{
! 			if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
  			{
  				if ( extension_loaded('zlib') )
--- 591,595 ----
  		else if ( $phpver > '4.0' )
  		{
! 			if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
  			{
  				if ( extension_loaded('zlib') )