[mxbb-commits] core/modules/mx_navmenu/admin mx_module_defs.php,1.9,1.10

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

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

Modified Files:
	mx_module_defs.php 
Log Message:
massive update, for mxBB 2.8.1 rc1

- most "easy to solve" bugs reported are fixed
- optimized adminCP
- mod_rewrite
- Page IP filter
- optimized blockCP
- removed old files

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mx_module_defs.php	12 Oct 2005 15:37:32 -0000	1.9
--- mx_module_defs.php	22 Oct 2005 10:51:03 -0000	1.10
***************
*** 20,28 ****
   
  /********************************************************************************\
! | Class: mx_blockcp_parameter
! | The mx_blockcp_parameter object provides extra module block parameters, added to the standard core parameters.
! | 
! | Usage examples:
! | 
  \********************************************************************************/
  
--- 20,25 ----
   
  /********************************************************************************\
! | Class: mx_module_defs
! | The mx_module_defs object provides additional module block parameters...
  \********************************************************************************/
  
***************
*** 82,92 ****
  	function display_module_parameters( $parameter_data, $block_id )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars;
  
  		$parameter_id = $parameter_data['parameter_id'];
  		
- 		//$parameter_value = isset($HTTP_POST_VARS['preview']) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS[$parameter_data['parameter_name']]))) : $parameter_data['parameter_value'];
- 		//$portalpage = isset($HTTP_GET_VARS['portalpage']) ? intval($HTTP_GET_VARS['portalpage']) : intval($HTTP_POST_VARS['portalpage']);
- 
  		//
  		// Load states
--- 79,86 ----
  	function display_module_parameters( $parameter_data, $block_id )
  	{
! 		global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage;
  
  		$parameter_id = $parameter_data['parameter_id'];
  		
  		//
  		// Load states
***************
*** 196,213 ****
  		// DO IT DO IT
  		
- 		//
- 		// Start page proper
- 		//
- 		if (file_exists($mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl'))
- 		{
- 			$module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl';
- 		}
- 		else 
- 		{
- 			$module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/subSilver' . '/admin/mx_module_parameters.tpl';
- 		}
- 		
  		$template->set_filenames(array(
! 			'parameter' => $module_template_file)
  		);
  				
--- 190,195 ----
  		// DO IT DO IT
  		
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_module_parameters.tpl')
  		);
  				
***************
*** 371,378 ****
  			$mode = MX_MENU_CAT_TYPE;
  			$action = $new_cat ? MX_DO_INSERT : MX_DO_UPDATE;
! 			$deletemode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_DELETE . '&id=' . $cat_id . '&block_id=' . $block_id;
  
! 			$upmode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_MOVE . '&id=' . $cat_id . '&block_id=' . $block_id . '&block_order=' . $block_order . '&move=-15';
! 			$downmode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_MOVE . '&id=' . $cat_id . '&block_id=' . $block_id . '&block_order=' . $block_order . '&move=15';
  			
  			//
--- 353,360 ----
  			$mode = MX_MENU_CAT_TYPE;
  			$action = $new_cat ? MX_DO_INSERT : MX_DO_UPDATE;
! 			$deletemode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_DELETE . '&id=' . $cat_id . '&block_id=' . $block_id . '&portalpage=' . $portalpage. '&dynamic_block=' . $dynamic_block_id;
  
! 			$upmode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_MOVE . '&id=' . $cat_id . '&block_id=' . $block_id . '&block_order=' . $block_order . '&move=-15' . '&portalpage=' . $portalpage. '&dynamic_block=' . $dynamic_block_id;
! 			$downmode = '?panel_mode=' . $mode . '&panel_action=' . MX_DO_MOVE . '&id=' . $cat_id . '&block_id=' . $block_id . '&block_order=' . $block_order . '&move=15' . '&portalpage=' . $portalpage. '&dynamic_block=' . $dynamic_block_id;
  			
  			//
***************
*** 383,386 ****
--- 365,370 ----
  											<input type="hidden" name="id" value="' . $cat_id . '" />
  											<input type="hidden" name="block_id" value="' . $block_id . '" />
+ 											<input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" />
+ 											<input type="hidden" name="portalpage" value="' . $portalpage . '" />			
  											<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  
***************
*** 390,393 ****
--- 374,379 ----
  											<input type="hidden" name="block_id" value="' . $block_id . '" />
  											<input type="hidden" name="from_id" value="' . $cat_id . '" />
+ 											<input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" />
+ 											<input type="hidden" name="portalpage" value="' . $portalpage . '" />			
  											<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';