[mxbb-commits] core/includes mx_functions_core.php,1.133,1.134

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15752

Modified Files:
	mx_functions_core.php 
Log Message:


Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** mx_functions_core.php	25 Jun 2013 17:14:48 -0000	1.133
--- mx_functions_core.php	25 Jun 2013 18:15:06 -0000	1.134
***************
*** 2190,2257 ****
  	 * @return unknown
  	 */
! 	function _get_custom_module_parameters($parameter_data, $block_id)
! 	{
! 		global $mx_root_path, $phpEx;
! 
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) )
! 		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx );
! 
! 			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);
! 				}
! 			}
! 		}
! 
! 		return $mx_module_defs->is_panel;
! 	}
! 
! 	/**
! 	 * load custom module panels
! 	 *
! 	 * @access private
! 	 * @param unknown_type $parameter_data
! 	 * @param unknown_type $block_id
! 	 */
! 	function _get_custom_module_panels($parameter_data, $block_id)
! 	{
! 		global $mx_root_path, $phpEx;
! 
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) )
! 		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx );
! 
! 			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);
! 				}
! 			}
! 		}
! 	}	
! 
! 	/**
! 	 * Load custom module parameters
! 	 *
! 	 * @access private
! 	 * @param unknown_type $parameter_data
! 	 * @param unknown_type $block_id
! 	 * @return unknown
! 	 */
! 	function _get_custom_module_parameters3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "admin/{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
--- 2190,2200 ----
  	 * @return unknown
  	 */
! 	function _get_custom_module_parameters($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
***************
*** 2262,2268 ****
  				}
  			}
! 			return $mx_module_defs->is_parameter;
! 		}
! 		return false;		
  	}
  
--- 2205,2210 ----
  				}
  			}
! 			//return $mx_module_defs->is_parameter;
! 		}				
  	}
  
***************
*** 2274,2284 ****
  	 * @param unknown_type $block_id
  	 */
! 	function _get_custom_module_panels3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "admin/{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
--- 2216,2226 ----
  	 * @param unknown_type $block_id
  	 */
! 	function _get_custom_module_panels($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
***************
*** 2291,2295 ****
  			return $mx_module_defs->is_panel;
  		}
- 		return false;
  	}
  	
--- 2233,2236 ----