[mxbb-commits] core/modules/mx_coreblocks mx_blockcp.php,1.5,1.6

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

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

Modified Files:
	mx_blockcp.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_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mx_blockcp.php	2 Oct 2005 21:24:30 -0000	1.5
--- mx_blockcp.php	22 Oct 2005 10:51:02 -0000	1.6
***************
*** 143,160 ****
  // SUBMIT?
  //
! if( ($submit || $submit_pars) && !empty($mode) && !empty($action) )
  {
  	//
  	// Get vars
  	//
! 	$block_id = $mx_request_vars->request('id', MX_TYPE_INT, '');
  	$dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, '');
  	
! 	if( $submit )
  	{
  		//
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $block_id);
  	}
  
--- 143,177 ----
  // SUBMIT?
  //
! if( !empty($mode) && !empty($action) )
  {
  	//
  	// Get vars
  	//
! 	$id = $mx_request_vars->request('id', MX_TYPE_INT, '');
  	$dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, '');
  	
! 	if( !$submit_pars )
  	{
+ 		$module_id = $mx_request_vars->request('module_id', MX_TYPE_INT, '');
+ 		$function_id = $mx_request_vars->request('function_id', MX_TYPE_INT, '');
+ 					
  		//
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $id);
! 		
! 		//
! 		// If new block, load new block settings panel
! 		//
! 		if (is_array($result_message))
! 		{
! 			$block_id = $result_message['new_id'];
! 			$result_message = $result_message['text'];	
! 		}	
! 		
! 		if ($action == MX_DO_DELETE)
! 		{
! 			$block_id = '';
! 		}
  	}
  
***************
*** 164,172 ****
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($block_id);
  	}
  	
  	$has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : '';
! 	$message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&amp;portalpage=$portalpage$has_dyn_block_id&amp;sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>');
  	mx_message_die(GENERAL_MESSAGE, $message);	
  	
--- 181,189 ----
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($id);
  	}
  	
  	$has_dyn_block_id = $dynamic_block_id > 0 ? '&amp;dynamic_block='.$dynamic_block_id : '';
! 	$message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&amp;module_id=$module_id&amp;function_id=$function_id&amp;portalpage=$portalpage$has_dyn_block_id&amp;sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>');
  	mx_message_die(GENERAL_MESSAGE, $message);	
  	
***************
*** 238,241 ****
--- 255,259 ----
  ));
  
+ $mx_blockcp->blockcp_mode = 'mx_blockcp';
  $mx_blockcp->generate_cp($block_id, $new_block);