[mxbb-commits] core/includes mx_functions_blockcp.php,1.29,1.30

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22271/includes

Modified Files:
	mx_functions_blockcp.php 
Log Message:
update

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mx_functions_blockcp.php	10 Jan 2009 16:15:11 -0000	1.29
--- mx_functions_blockcp.php	29 Jul 2009 06:31:38 -0000	1.30
***************
*** 66,70 ****
  		$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
  
! 		$dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, '');
  		$virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, 0);
  
--- 66,70 ----
  		$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
  
! 		$dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, 0);
  		$virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, 0);
  
***************
*** 87,92 ****
  
  		$block_id = $id;
! 		$module_id = $mx_request_vars->is_request('module_id') ? $mx_request_vars->request('module_id', MX_TYPE_INT, '') : mx_parent_data($block_id, 'module_id');
! 		$function_id = $mx_request_vars->is_request('function_id') ? $mx_request_vars->request('function_id', MX_TYPE_INT, '') : mx_parent_data($block_id, 'function_id');
  
  		//
--- 87,92 ----
  
  		$block_id = $id;
! 		$module_id = $mx_request_vars->is_request('module_id') ? $mx_request_vars->request('module_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'module_id');
! 		$function_id = $mx_request_vars->is_request('function_id') ? $mx_request_vars->request('function_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'function_id');
  
  		//
***************
*** 137,144 ****
  		// Now get started
  		//
! 		$functionlist = get_list_formatted('function_list', $function_id);
  
  		/*
- 		//
  		// Populate missing parameters (if any)
  		//
--- 137,144 ----
  		// Now get started
  		//
! 		$functionlist = get_list_formatted('function_list', $function_id, '', '', true);
  
+ 		
  		/*
  		// Populate missing parameters (if any)
  		//
***************
*** 575,584 ****
  	 * @param unknown_type $id
  	 */
! 	function generate_cp( $id = '' )
  	{
! 		$newBlock = $id == 'noBlock' ? true : false;
! 		$block_id = $id == 'noBlock' ? '' : $id;
  
! 		$this->_controlpanel($block_id, $newBlock );
  	}
  
--- 575,584 ----
  	 * @param unknown_type $id
  	 */
! 	function generate_cp($id = '')
  	{
! 		$newBlock = ($id == 'noBlock') ? true : false;
! 		$block_id = ($id == 'noBlock') ? '' : $id;
  
! 		$this->_controlpanel($block_id, $newBlock);
  	}