[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.15,1.16

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_menu_nav.php 
Log Message:
This navigation business is complex :/

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_menu_nav.php	20 Aug 2006 13:02:42 -0000	1.15
--- mx_menu_nav.php	20 Aug 2006 14:21:12 -0000	1.16
***************
*** 106,112 ****
  
  $num_of_cats = count($navCategory);
- $hasCurrentMenu = false;
  foreach($navCategory as $cat_id => $catData)
  {
  	//
  	// Check if this Category contains any authorized menus, or any at all
--- 106,113 ----
  
  $num_of_cats = count($navCategory);
  foreach($navCategory as $cat_id => $catData)
  {
+ 	$hasCurrentMenu = false;
+ 
  	//
  	// Check if this Category contains any authorized menus, or any at all
***************
*** 130,133 ****
--- 131,156 ----
  			$catData[0]['cat_url'] = $menuData['page_id'];
  		}
+ 
+ 		//
+ 		// Highlight current menu
+ 		//
+ 		$catData[$key]['is_current'] = false;
+ 		if ( $menu_page_sync && !$hasCurrentMenu)
+ 		{
+ 			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
+ 			{
+ 				$catData[$key]['is_current'] = true;
+ 			}
+ 			else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0  )
+ 			{
+ 				$catData[$key]['is_current'] = true;
+ 			}
+ 			else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$catData[$key]['is_current']  )
+ 			{
+ 				$catData[$key]['is_current'] = true;
+ 			}
+ 			$hasCurrentMenu = $catData[$key]['is_current'];
+ 		}
+ 
  	}
  
***************
*** 172,176 ****
  	// Generate the fold/unfold categories switches
  	//
! 	$cat_on = $current_cat ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 );
  
  	$template->assign_block_vars('catrow', array(
--- 195,199 ----
  	// Generate the fold/unfold categories switches
  	//
! 	$cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 );
  
  	$template->assign_block_vars('catrow', array(
***************
*** 200,204 ****
  	foreach($catData as $key => $menuData)
  	{
- 		$isCurrentMenu = false;
  		//
  		// Find if user is allowed for view menu
--- 223,226 ----
***************
*** 220,263 ****
  		$action = mx_decode($action, $bbcode_uid, false);
  
- 		if ( $menu_page_sync && !$hasCurrentMenu)
- 		{
- 			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
- 			{
- 				$isCurrentMenu = true;
- 			}
- 			else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0  )
- 			{
- 				$isCurrentMenu = true;
- 			}
- 			else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$isCurrentMenu  )
- 			{
- 				$isCurrentMenu = true;
- 			}
- 			$hasCurrentMenu = $isCurrentMenu;
- 		}
- 
- 		$style = $isCurrentMenu ? 'cattitle' : 'genmed';
  
! 		/*
! 		if ( $menu_page_sync )
! 		{
! 			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
! 			{
! 				$style = 'cattitle';
! 			}
! 			else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 && !isset($HTTP_GET_VARS['dynamic_block']) )
! 			{
! 				$style = 'cattitle';
! 			}
! 			else
! 			{
! 				$style = 'genmed';
! 			}
! 		}
! 		else
! 		{
! 			$style = 'genmed';
! 		}
! 		*/
  
  		//
--- 242,247 ----
  		$action = mx_decode($action, $bbcode_uid, false);
  
  
! 		$style = $menuData['is_current'] ? 'cattitle' : 'genmed';
  
  		//
***************
*** 269,274 ****
  		if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) )
  		{
! 			$icon_url = ( $isCurrentMenu ) ? $icon_url_hot : $icon_tmp;
! 			$icon_style = ( $isCurrentMenu ) ? 'mx_icon_hot' : 'mx_icon';
  		}
  		else
--- 253,258 ----
  		if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) )
  		{
! 			$icon_url = ( $menuData['is_current'] ) ? $icon_url_hot : $icon_tmp;
! 			$icon_style = ( $menuData['is_current'] ) ? 'mx_icon_hot' : 'mx_icon';
  		}
  		else