[mxbb-commits] core/includes mx_functions_blockcp.php,1.1,1.2 mx_functions_core.php,1.1,1.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27477/includes

Modified Files:
	mx_functions_blockcp.php mx_functions_core.php 
Log Message:
minor fixes

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_functions_blockcp.php	20 Aug 2005 18:19:11 -0000	1.1
--- mx_functions_blockcp.php	20 Aug 2005 18:48:49 -0000	1.2
***************
*** 429,433 ****
  		// Load and display additional blockcp panels (if any)
  		//
! 		$this->get_blockcp_panels($block_id);
  				
  		//
--- 429,433 ----
  		// Load and display additional blockcp panels (if any)
  		//
! 		$this->load_block_panels($block_id);
  				
  		//
***************
*** 436,440 ****
  		if (!empty($this->block_parameters))
  		{
! 			$this->get_blockcp_parameters($block_id);
  		}
  		
--- 436,440 ----
  		if (!empty($this->block_parameters))
  		{
! 			$this->load_block_parameters($block_id);
  		}
  		

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_functions_core.php	20 Aug 2005 18:19:11 -0000	1.1
--- mx_functions_core.php	20 Aug 2005 18:48:49 -0000	1.2
***************
*** 967,981 ****
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' );
  			
! 			if (class_exists('mx_blockcp_parameter'))
  			{
! 				$mx_blockcp_parameter = new mx_blockcp_parameter();
  				
! 				if ( method_exists( $mx_blockcp_parameter,  'display_custom_edit' ) )
  				{
! 					$mx_blockcp_parameter->display_custom_edit($parameter_data, $block_id);
  				}
  			}
--- 967,981 ----
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' );
  			
! 			if (class_exists('mx_module_defs'))
  			{
! 				$mx_module_defs = new mx_module_defs();
  				
! 				if ( method_exists( $mx_module_defs,  'display_module_parameters' ) )
  				{
! 					$mx_module_defs->display_module_parameters($parameter_data, $block_id);
  				}
  			}
***************
*** 990,1004 ****
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' );
  			
! 			if (class_exists('mx_blockcp_parameter'))
  			{
! 				$mx_blockcp_parameter = new mx_blockcp_parameter();
  				
! 				if ( method_exists( $mx_blockcp_parameter,  'display_custom_panel' ) )
  				{
! 					$mx_blockcp_parameter->display_custom_panel($parameter_data, $block_id);
  				}
  			}
--- 990,1004 ----
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' );
  			
! 			if (class_exists('mx_module_defs'))
  			{
! 				$mx_module_defs = new mx_module_defs();
  				
! 				if ( method_exists( $mx_module_defs,  'display_module_panels' ) )
  				{
! 					$mx_module_defs->display_module_panels($parameter_data, $block_id);
  				}
  			}
***************
*** 1013,1027 ****
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_blockcp_parameter.php' );
  			
! 			if (class_exists('mx_blockcp_parameter'))
  			{
! 				$mx_blockcp_parameter = new mx_blockcp_parameter();
  				
! 				if ( method_exists( $mx_blockcp_parameter,  'submit_custom_pars' ) )
  				{
! 					$parameter_custom = $mx_blockcp_parameter->submit_custom_pars($parameter_data, $block_id);
  				}
  			}
--- 1013,1027 ----
  		global $mx_root_path;
  		
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' ) )
  		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.php' );
  			
! 			if (class_exists('mx_module_defs'))
  			{
! 				$mx_module_defs = new mx_module_defs();
  				
! 				if ( method_exists( $mx_module_defs,  'submit_module_parameters' ) )
  				{
! 					$parameter_custom = $mx_module_defs->submit_module_parameters($parameter_data, $block_id);
  				}
  			}
***************
*** 1144,1148 ****
  	// display additional panels in the add/edit page
  	// ===================================================
! 	function get_blockcp_panels( $block_id = false )
  	{
  		global $template, $blockcptemplate, $board_config;
--- 1144,1148 ----
  	// display additional panels in the add/edit page
  	// ===================================================
! 	function load_block_panels( $block_id = false )
  	{
  		global $template, $blockcptemplate, $board_config;
***************
*** 1169,1173 ****
  	// display parameter field and data in the add/edit page
  	// ===================================================
! 	function get_blockcp_parameters( $block_id = false )
  	{
  		global $template, $blockcptemplate, $board_config;
--- 1169,1173 ----
  	// display parameter field and data in the add/edit page
  	// ===================================================
! 	function load_block_parameters( $block_id = false )
  	{
  		global $template, $blockcptemplate, $board_config;
***************
*** 1245,1249 ****
  		
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);		
  		
--- 1245,1249 ----
  		
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);		
  		
***************
*** 1266,1270 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1266,1270 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1291,1295 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1291,1295 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1312,1316 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1312,1316 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1333,1337 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1333,1337 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1364,1368 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1364,1368 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1387,1391 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  				
--- 1387,1391 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  				
***************
*** 1410,1414 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  		
--- 1410,1414 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  		
***************
*** 1440,1444 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  		
--- 1440,1444 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  		
***************
*** 1470,1474 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  		
--- 1470,1474 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);
  		
***************
*** 1509,1513 ****
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_blockcp_parameter.tpl')
  		);
  		
--- 1509,1513 ----
  
  		$template->set_filenames(array(
! 			'parameter' => 'admin/mx_core_parameters.tpl')
  		);