[mxbb-commits] core/includes mx_functions_style.php, 1.17.2.22, 1.17.2.23

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

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

Modified Files:
      Tag: core28x
	mx_functions_style.php 
Log Message:
fix

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.17.2.22
retrieving revision 1.17.2.23
diff -C2 -d -r1.17.2.22 -r1.17.2.23
*** mx_functions_style.php	9 Mar 2008 11:35:05 -0000	1.17.2.22
--- mx_functions_style.php	9 Mar 2008 11:55:14 -0000	1.17.2.23
***************
*** 749,752 ****
--- 749,768 ----
  		$default_template_path = $module_root_path . $this->default_current_template_path;
  		$template_name = $this->template_name;
+ 		
+ 		//
+ 		// If use default template with difrent modules config file name
+ 		//
+ 		if (!empty($this->module_cfg_name[$module_root_path]))
+ 		{
+ 			$module_cfg_info = "<br />Custom module config file: " . $this->module_cfg_name[$module_root_path];
+ 			$default_cfg_file = $this->module_cfg_name[$module_root_path]; 
+ 			
+ 		}
+ 		else
+ 		{
+ 			$module_cfg_info = "<br />Custom module config file: Not set";
+ 			$default_cfg_file = false;
+ 		}
+ 		
  
  		@include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg');
***************
*** 759,764 ****
  			$current_template_path = $module_root_path . $this->cloned_current_template_path;
  			$template_name = $this->cloned_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $this->cloned_template_name . '.cfg');
  		}
  
--- 775,781 ----
  			$current_template_path = $module_root_path . $this->cloned_current_template_path;
  			$template_name = $this->cloned_template_name;
+ 			$default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->cloned_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $default_cfg_file  . '.cfg');
  		}
  
***************
*** 770,775 ****
  			$current_template_path = $module_root_path . $this->default_current_template_path;
  			$template_name = $this->default_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $this->default_template_name . '.cfg');
  		}
  		
--- 787,793 ----
  			$current_template_path = $module_root_path . $this->default_current_template_path;
  			$template_name = $this->default_template_name;
+ 			$default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->default_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $default_cfg_file . '.cfg');
  		}
  		
***************
*** 781,804 ****
  			$current_template_path = $module_root_path . $this->default_module_style;
  			$template_name = $this->default_module_style;
  
! 			@include($mx_root_path . $module_root_path . $this->default_module_style . '/' . $this->default_module_style . '.cfg');
! 		}		
! 		
! 		//
! 		// If use default template with difrent modules config file name
! 		//
! 		if ( (!$mx_template_config) &&	!empty($this->module_cfg_name[$module_root_path]))
! 		{
! 			$current_template_path = $module_root_path . $this->default_current_template_path;
! 			$template_name = $this->default_template_name;
! 			$module_cfg_info = "<br />Custom module config file: " . $this->module_cfg_name[$module_root_path];
! 			
! 			@include($module_root_path . $this->default_current_template_path . '/' . $this->module_cfg_name[$module_root_path] . '.cfg');
! 		}
! 		else
! 		{
! 			$module_cfg_info = "<br />Custom module config file: Not set";
  		}
! 
  		//
  		// We have no template to use - die
--- 799,807 ----
  			$current_template_path = $module_root_path . $this->default_module_style;
  			$template_name = $this->default_module_style;
+ 			$default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->default_module_style;
  
! 			@include($mx_root_path . $module_root_path . $this->default_module_style . '/' . $default_cfg_file . '.cfg');
  		}
! 		
  		//
  		// We have no template to use - die