[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.3,1.4

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

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

Modified Files:
	mx_menu_nav.php 
Log Message:
Adding IP filter for pages
Merged module_def panels and parameters, now usable at the same time
Menu navigation fixes for highlights

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_menu_nav.php	1 Oct 2005 14:10:45 -0000	1.3
--- mx_menu_nav.php	12 Oct 2005 15:37:32 -0000	1.4
***************
*** 116,120 ****
  		$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;
  
--- 116,120 ----
  		$cat_target = ( $mx_nav_data[$menu_count]['cat_target'] == 0 ) ? '' : '_blank';
  	
! 		$cat_url_tmp = mx_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;
  
***************
*** 123,127 ****
  			'BLOCK_ID'		=> intval($block_id),
  			'CATEGORY'		=> $catt,
! 			'U_URL'			=> append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id),
  			'U_CAT_ICON'	=> $cat_icon,
  			'U_CAT_NAV'		=> $cat_nav_icon_url,
--- 123,127 ----
  			'BLOCK_ID'		=> intval($block_id),
  			'CATEGORY'		=> $catt,
! 			'U_URL'			=> mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id),
  			'U_CAT_ICON'	=> $cat_icon,
  			'U_CAT_NAV'		=> $cat_nav_icon_url,
***************
*** 165,169 ****
  	if ( $menu_page_sync )
  	{
! 		$style = ( $mx_nav_data[$menu_count]['block_id'] == $HTTP_GET_VARS['dynamic_block'] ) ? 'cattitle' : ( ( $mx_nav_data[$menu_count]['block_id'] == 0 && $mx_nav_data[$menu_count]['page_id'] == $page_id ) ? 'cattitle' : 'genmed' );
  	}
  	else
--- 165,180 ----
  	if ( $menu_page_sync )
  	{
! 		if ( $mx_nav_data[$menu_count]['block_id'] == $HTTP_GET_VARS['dynamic_block'] )
! 		{
! 			$style = 'cattitle';
! 		}
! 		else if ( $mx_nav_data[$menu_count]['page_id'] == $page_id && $mx_nav_data[$menu_count]['block_id'] == 0 && !isset($HTTP_GET_VARS['dynamic_block']) )
! 		{
! 			$style = 'cattitle';
! 		}
! 		else 
! 		{
! 			$style = 'genmed';
! 		}
  	}
  	else
***************
*** 189,201 ****
  	if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['block_id'] == 0 && $mx_nav_data[$menu_count]['link_target'] != 2 )
  	{
! 		$menu_link = append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id']);
  	}
  	else if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['link_target'] == 2 )
  	{
! 		$menu_link = append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id'] . '&' . $mx_nav_data[$menu_count]['menu_links']);
  	}
  	else if ( $mx_nav_data[$menu_count]['link_target'] == 2 )
  	{
! 		$menu_link = append_sid(PORTAL_URL . 'index.php?page=' . $page_id . '&' . $mx_nav_data[$menu_count]['menu_links']);
  	}
  	else if ( $mx_nav_data[$menu_count]['menu_links'] != '' )
--- 200,212 ----
  	if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['block_id'] == 0 && $mx_nav_data[$menu_count]['link_target'] != 2 )
  	{
! 		$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id']);
  	}
  	else if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['link_target'] == 2 )
  	{
! 		$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id'] . '&' . $mx_nav_data[$menu_count]['menu_links']);
  	}
  	else if ( $mx_nav_data[$menu_count]['link_target'] == 2 )
  	{
! 		$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_id . '&' . $mx_nav_data[$menu_count]['menu_links']);
  	}
  	else if ( $mx_nav_data[$menu_count]['menu_links'] != '' )
***************
*** 205,213 ****
  	else if ( $mx_nav_data[$menu_count]['page_id'] == 0 && $mx_nav_data[$menu_count]['block_id'] != 0 )
  	{
! 		$menu_link = append_sid(PORTAL_URL . 'index.php?page=' . $page_id . '&amp;dynamic_block=' . $mx_nav_data[$menu_count]['block_id']);
  	}
  	else if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['block_id'] != 0 )
  	{
! 		$menu_link = append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id'] . '&amp;dynamic_block=' . $mx_nav_data[$menu_count]['block_id']);
  	}
  	else
--- 216,224 ----
  	else if ( $mx_nav_data[$menu_count]['page_id'] == 0 && $mx_nav_data[$menu_count]['block_id'] != 0 )
  	{
! 		$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_id . '&amp;dynamic_block=' . $mx_nav_data[$menu_count]['block_id']);
  	}
  	else if ( $mx_nav_data[$menu_count]['page_id'] != 0 && $mx_nav_data[$menu_count]['block_id'] != 0 )
  	{
! 		$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $mx_nav_data[$menu_count]['page_id'] . '&amp;dynamic_block=' . $mx_nav_data[$menu_count]['block_id']);
  	}
  	else
***************
*** 223,227 ****
  		}
  		$row = $db->sql_fetchrow($result);
! 		$menu_link = append_sid(PORTAL_URL . $row['module_path'] . $row['function_file']);
  	}
  
--- 234,238 ----
  		}
  		$row = $db->sql_fetchrow($result);
! 		$menu_link = mx_append_sid(PORTAL_URL . $row['module_path'] . $row['function_file']);
  	}