[mxbb-commits] core/admin admin_mx_page_cp.php, 1.28, 1.29 admin_mx_block_cp.php, 1.19, 1.20 pagestart.php, 1.30, 1.31 admin_mx_module.php, 1.49, 1.50 page_header_admin.php, 1.23, 1.24 admin_mx_module_cp.php, 1.21, 1.22

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

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

Modified Files:
	admin_mx_page_cp.php admin_mx_block_cp.php pagestart.php 
	admin_mx_module.php page_header_admin.php 
	admin_mx_module_cp.php 
Log Message:
Upgrading old type $HTML_*_VARS

Index: admin_mx_page_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** admin_mx_page_cp.php	4 Feb 2008 15:44:44 -0000	1.28
--- admin_mx_page_cp.php	9 Feb 2008 19:45:34 -0000	1.29
***************
*** 51,55 ****
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id';
! 	$nav_page_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : '1';
  }
  
--- 51,55 ----
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id';
! 	$nav_page_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : '1';
  }
  
***************
*** 89,93 ****
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates';
! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array();
  
  // --------------------------------------------------------------------------------------------------------------------
--- 89,93 ----
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates';
! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array();
  
  // --------------------------------------------------------------------------------------------------------------------

Index: admin_mx_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** admin_mx_module.php	9 Feb 2008 12:44:32 -0000	1.49
--- admin_mx_module.php	9 Feb 2008 19:45:34 -0000	1.50
***************
*** 49,53 ****
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id';
! 	$nav_module_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : '';
  }
  
--- 49,53 ----
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id';
! 	$nav_module_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : '';
  }
  
***************
*** 89,93 ****
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates';
! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array();
  
  // --------------------------------------------------------------------------------------------------------------------
--- 89,93 ----
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates';
! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array();
  
  // --------------------------------------------------------------------------------------------------------------------

Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** page_header_admin.php	9 Feb 2008 17:14:21 -0000	1.23
--- page_header_admin.php	9 Feb 2008 19:45:35 -0000	1.24
***************
*** 31,35 ****
  	$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') ) )
--- 31,35 ----
  	$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') ) )
***************
*** 43,47 ****
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
--- 43,47 ----
  	else if ( $phpver > '4.0' )
  	{
! 		if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
  		{
  			if ( extension_loaded('zlib') )
***************
*** 145,149 ****
  // 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');
--- 145,149 ----
  // 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: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** admin_mx_module_cp.php	9 Feb 2008 12:44:32 -0000	1.21
--- admin_mx_module_cp.php	9 Feb 2008 19:45:35 -0000	1.22
***************
*** 44,48 ****
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id';
! 	$nav_module_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : '';
  }
  
--- 44,48 ----
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id';
! 	$nav_module_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : '';
  }
  
***************
*** 79,85 ****
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates';
! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array();
  
! $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array();
  
  if ($mx_request_vars->is_post('include_block_quickedit'))
--- 79,85 ----
  //
  $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates';
! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array();
  
! $sort_cookie = !empty($_COOKIE[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $_COOKIE[$board_config['cookie_name'] . '_pagesort']) : array();
  
  if ($mx_request_vars->is_post('include_block_quickedit'))

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** pagestart.php	9 Feb 2008 12:44:32 -0000	1.30
--- pagestart.php	9 Feb 2008 19:45:34 -0000	1.31
***************
*** 58,62 ****
  if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] )
  {
! 	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']);
  	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url);
  	$url = str_replace('//', '/', $url);
--- 58,62 ----
  if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] )
  {
! 	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']);
  	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url);
  	$url = str_replace('//', '/', $url);

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** admin_mx_block_cp.php	9 Feb 2008 12:44:32 -0000	1.19
--- admin_mx_block_cp.php	9 Feb 2008 19:45:34 -0000	1.20
***************
*** 89,93 ****
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id';
! 	$block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1;
  }
  else if ( empty($block_id) && $mx_request_vars->is_request('function_id') )
--- 89,93 ----
  {
  	$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id';
! 	$block_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 1;
  }
  else if ( empty($block_id) && $mx_request_vars->is_request('function_id') )