[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.28,1.29

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

Update of /cvsroot/mxbb/core/modules/mx_navmenu
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28768/modules/mx_navmenu

Modified Files:
	mx_menu_nav.php 
Log Message:
part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mx_menu_nav.php	6 Feb 2008 23:44:03 -0000	1.28
--- mx_menu_nav.php	9 Feb 2008 12:49:19 -0000	1.29
***************
*** 142,146 ****
  		if (!$hasCurrentMenu)
  		{
! 			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
  			{
  				$catData[$key]['is_current'] = true;
--- 142,146 ----
  		if (!$hasCurrentMenu)
  		{
! 			if ($mx_request_vars->is_get('dynamic_block') ? $menuData['block_id'] == $mx_request_vars->get('dynamic_block', MX_TYPE_INT) : false )
  			{
  				$catData[$key]['is_current'] = true;
***************
*** 186,195 ****
  	// For overall_header navigation
  	// - is this current page category?
! 	$current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || ( isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) ) ? true : false;
  
  	//
  	// Update cookie - if this was a cat link
  	//
! 	if ( (isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) || $current_cat)
  	{
  		setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
--- 186,195 ----
  	// For overall_header navigation
  	// - is this current page category?
! 	$current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || $mx_request_vars->is_get('cat_link') ? $mx_request_vars->get('cat_link', MX_TYPE_INT) == $cat_id : false) ? true : false;
  
  	//
  	// Update cookie - if this was a cat link
  	//
! 	if ( $mx_request_vars->is_get('cat_link') ? $mx_request_vars->get('cat_link', MX_TYPE_INT) == $cat_id : false || $current_cat)
  	{
  		setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);