[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.1,1.2

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

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

Modified Files:
	mx_menu_nav.php 
Log Message:
adding fixes for mxBB 2.8 RC 6

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_menu_nav.php	20 Aug 2005 18:19:12 -0000	1.1
--- mx_menu_nav.php	20 Sep 2005 15:30:59 -0000	1.2
***************
*** 117,121 ****
  		$cat_target = ( $mx_nav_data[$menu_count]['cat_target'] == 0 ) ? '' : '_blank';
  	
! 		$cat_url_tmp = append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['cat_url']);
  		$catt = ( $mx_nav_data[$menu_count]['cat_url'] != 0 ) ? '<a class="genmed" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="genmed">' . $cat . '</span></a>' : $cat;
  
--- 117,121 ----
  		$cat_target = ( $mx_nav_data[$menu_count]['cat_target'] == 0 ) ? '' : '_blank';
  	
! 		$cat_url_tmp = append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['cat_url'] . '&cat_link=' . intval($cat_id));
  		$catt = ( $mx_nav_data[$menu_count]['cat_url'] != 0 ) ? '<a class="genmed" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="genmed">' . $cat . '</span></a>' : $cat;
  
***************
*** 130,137 ****
  		));
  
  		// Generate the fold/unfold categories switches
! 		if ( !empty($HTTP_COOKIE_VARS['phpbbCategory_' . $block_id . $cat_id]) )
  		{
! 			$cat_on = $HTTP_COOKIE_VARS['phpbbCategory_' . $block_id . $cat_id];
  		}
  		else
--- 130,146 ----
  		));
  
+ 		//
+ 		// Update cookie - if this was a cat link
+ 		//
+ 		if (isset($HTTP_GET_VARS['cat_link']) && intval($HTTP_GET_VARS['cat_link']) == $cat_id)
+ 		{
+ 			setcookie('phpbbCategory_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ 			$HTTP_COOKIE_VARS['phpbbCategory_' . $block_id . $cat_id] = 1;
+ 		}
+ 		
  		// Generate the fold/unfold categories switches
! 		if ( isset($HTTP_COOKIE_VARS['phpbbCategory_' . $block_id . $cat_id]) )
  		{
! 			$cat_on = $HTTP_COOKIE_VARS['phpbbCategory_' . $block_id . $cat_id] == 1;
  		}
  		else