[mxbb-commits] core/modules/mx_navmenu/includes navmenu_functions.php, 1.8, 1.9

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

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

Modified Files:
	navmenu_functions.php 
Log Message:
BlockCP - updated what features should be adminCP options only
Schemas - no point updating the module INSERTS with full spec
Sitelog - updated sitemap and pagination
mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions
Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom
...more to come ;)
Tinymce updates wherever needed - admin has full interface, users less options.
mx_users - bugfix for renaming users

Index: navmenu_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** navmenu_functions.php	19 Nov 2007 16:39:56 -0000	1.8
--- navmenu_functions.php	30 Jan 2008 09:10:58 -0000	1.9
***************
*** 134,138 ****
  
  /**
!  * Enter description here...
   *
   * @access public
--- 134,138 ----
  
  /**
!  * UserCP Panel
   *
   * @access public
***************
*** 203,207 ****
  
  /**
!  * Enter description here...
   *
   * @access public
--- 203,207 ----
  
  /**
!  * UserCP Panel
   *
   * @access public
***************
*** 354,359 ****
  						'BLOCK_ID'				=> intval($block_id),
  						'CATEGORY'				=> $catt,
- 						'CATEGORY_URL'			=> $cat_url,
  						'CATEGORY_NAME'			=> $cat,
  						'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  						'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
--- 354,359 ----
  						'BLOCK_ID'				=> intval($block_id),
  						'CATEGORY'				=> $catt,
  						'CATEGORY_NAME'			=> $cat,
+ 						'U_CATEGORY_URL'		=> $cat_url,
  						'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  						'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
***************
*** 366,374 ****
  						// Overall Nav
  						//
! 						'U_MENU_MODULE'			=> $cat_url,
! 						'U_LINK_TARGET'			=> $link_target,
! 						'MENU_NAME'				=> $cat,
! 						'MENU_DESC'				=> $desc,
! 						'MENU_STYLE'			=> $style,
  
  					));
--- 366,374 ----
  						// Overall Nav
  						//
! 						'U_CATEGORY_URL'			=> $cat_url,
! 						'U_CATEGORY_URL_TARGET'		=> $link_target,
! 						'CATEGORY_NAME'				=> $cat,
! 						'CATEGORY_DESC'				=> $desc,
! 						'CATEGORY_STYLE'			=> $style,
  
  					));
***************
*** 383,395 ****
  						$link_target = ( true ) ? '' : '_blank';
  
! 						$template->assign_block_vars('modulerow_cat', array(
  							//
  							// Overall Nav
  							//
! 							'U_MENU_MODULE'			=> $cat_url,
! 							'U_LINK_TARGET'			=> $link_target,
! 							'MENU_NAME'				=> $cat,
! 							'MENU_DESC'				=> $desc,
! 							'MENU_STYLE'			=> $style,
  
  						));
--- 383,396 ----
  						$link_target = ( true ) ? '' : '_blank';
  
! 						$template->assign_block_vars('menurow_cat', array(
  							//
  							// Overall Nav
  							//
! 							'U_CATEGORY_URL'		=> $cat_url,
! 							'U_CATEGORY_URL_TARGET' => $link_target,
! 							'CATEGORY_NAME'			=> $cat,
! 							'CATEGORY_DESC'			=> $desc,
! 							'CATEGORY_STYLE'		=> $style,
! 							'CURRENT' 				=> $is_current ? '-current' : '',
  
  						));
***************
*** 465,478 ****
  		'MENU_DESC'			=> $desc,
  		'MENU_SEP'			=> $menu_sep,
! 		'U_MENU_MODULE'		=> $menu_link,
! 		'U_LINK_TARGET'		=> $link_target,
! 		'U_MENU_ICON'		=> $menu_icon
  	);
  
! 	$template->assign_block_vars('catrow.modulerow', $menu_array);
  
  	if ($current_parent_page)
  	{
! 		$template->assign_block_vars('modulerow', $menu_array);
  	}
  }
--- 466,480 ----
  		'MENU_DESC'			=> $desc,
  		'MENU_SEP'			=> $menu_sep,
! 		'U_MENU_URL'		=> $menu_link,
! 		'U_MENU_URL_TARGET'		=> $link_target,
! 		'U_MENU_ICON'		=> $menu_icon,
! 		'CURRENT' 			=> $is_current ? '-current' : '',
  	);
  
! 	$template->assign_block_vars('catrow.menurow', $menu_array);
  
  	if ($current_parent_page)
  	{
! 		$template->assign_block_vars('menurow', $menu_array);
  	}
  }