[mxbb-commits] core/includes mx_functions_style.php, 1.131, 1.132 page_header.php, 1.73, 1.74

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

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

Modified Files:
	mx_functions_style.php page_header.php 
Log Message:

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** page_header.php	17 Jun 2013 21:29:51 -0000	1.73
--- page_header.php	24 Jun 2013 02:12:37 -0000	1.74
***************
*** 274,278 ****
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
  	//
! 	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : '',
  	'T_BODY_BACKGROUND' => isset($mx_user->theme['body_background']) ? $mx_user->theme['body_background'] : '',
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
--- 274,278 ----
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
  	//
! 	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css',
  	'T_BODY_BACKGROUND' => isset($mx_user->theme['body_background']) ? $mx_user->theme['body_background'] : '',
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
***************
*** 336,340 ****
  	'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_STYLESHEET_LINK'	=> (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->theme['template_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&amp;id=" . $mx_user->theme['style_id'] . '&amp;lang=' . $mx_user->encode_lang($board_config['default_lang']),
! 	'T_MXBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_GECKO_STYLESHEET' => 'gecko.css',

--- 336,340 ----
  	'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_STYLESHEET_LINK'	=> (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->theme['template_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&amp;id=" . $mx_user->theme['style_id'] . '&amp;lang=' . $mx_user->encode_lang($board_config['default_lang']),
! 	'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css',
  	'T_GECKO_STYLESHEET' => 'gecko.css',

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** mx_functions_style.php	17 Jun 2013 02:51:56 -0000	1.131
--- mx_functions_style.php	24 Jun 2013 02:12:37 -0000	1.132
***************
*** 1165,1168 ****
--- 1165,1169 ----
  		global $board_config, $template, $phpbb_root_path, $mx_root_path;

+ 		//unset($GLOBALS['MX_TEMPLATE_CONFIG']);
  		$mx_template_config = false;

***************
*** 1179,1184 ****
  			print('template config filename ' . $template_config_filename . ' couldn\'t be opened.');
  		}
! 		
! 		// We include common temlate config file here to not load it every time a module template config file is included		
  		$this->theme['body_bgcolor'] = $theme['body_bgcolor'];
  		$this->theme['body_text'] = $theme['body_text'];
--- 1180,1185 ----
  			print('template config filename ' . $template_config_filename . ' couldn\'t be opened.');
  		}
! 		// We include common temlate config file here to not load it every time a module template config file is included
! 		/*
  		$this->theme['body_bgcolor'] = $theme['body_bgcolor'];
  		$this->theme['body_text'] = $theme['body_text'];
***************
*** 1198,1201 ****
--- 1199,1204 ----
  		$this->theme['fontcolor1'] = $theme['fontcolor1']; // Main font color
  		$this->theme['fontcolor2'] = $theme['fontcolor2'];
+ 		*/
+ 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;

  		/* Removed since in 3.0.x+ our default template is no style
***************
*** 1738,1745 ****
  		$template_config_d = TEMPLATE_CONFIG;

! 		@include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg');
  		if (!$mx_template_config)
  		{
! 			@include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $moduleCfgFile . '.cfg');
  		}

--- 1741,1755 ----
  		$template_config_d = TEMPLATE_CONFIG;

! 		//@define('MX_TEMPLATE_CONFIG', false);
! 		$mx_template_config = false;
! 		
! 		if (@file_exists($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg'))
! 		{
! 			include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg');
! 		}
! 		
  		if (!$mx_template_config)
  		{
! 			@require($mx_root_path . $module_root_path . $this->current_template_path . '/' . $moduleCfgFile . '.cfg');
  		}

***************
*** 1752,1759 ****
  			$template_name = $this->cloned_template_name;

! 			@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1762,1769 ----
  			$template_name = $this->cloned_template_name;

! 			@require($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1767,1774 ****
  			$template_name = $this->default_template_name;

! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1777,1784 ----
  			$template_name = $this->default_template_name;

! 			@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1784,1791 ****
  			$template_name = $this->default_template_name;

! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name2 . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1794,1801 ----
  			$template_name = $this->default_template_name;

! 			@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name2 . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1798,1802 ****
  			mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->default_current_template_path .  '/' . $template_name . '.cfg' . " style config file " .	"<br /> current_template_path: " . $mx_root_path . $module_root_path . $current_template_path_d  . '/' . $template_name_d . '.cfg' . "<br /> cloned_template_path: " . $mx_root_path . $module_root_path . $cloned_template_path_d . "<br /> default_template_path: " . $mx_root_path . $module_root_path . $default_template_path_d . "<br /> template_name: " . $template_name_d . "<br /> template_config: "  . $template_config_d . "", '', __LINE__, __FILE__);
  		}
! 
  		$img_lang = ( file_exists($mx_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';

--- 1808,1812 ----
  			mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->default_current_template_path .  '/' . $template_name . '.cfg' . " style config file " .	"<br /> current_template_path: " . $mx_root_path . $module_root_path . $current_template_path_d  . '/' . $template_name_d . '.cfg' . "<br /> cloned_template_path: " . $mx_root_path . $module_root_path . $cloned_template_path_d . "<br /> default_template_path: " . $mx_root_path . $module_root_path . $default_template_path_d . "<br /> template_name: " . $template_name_d . "<br /> template_config: "  . $template_config_d . "", '', __LINE__, __FILE__);
  		}
! 		
  		$img_lang = ( file_exists($mx_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';

***************
*** 1825,1831 ****
  		$images = &$mx3_images;

! 		// We include common temlate config file here to not load it every time a module template config file is included		
! 		$this->theme = &$theme;		
! 
  		unset($mx_images);		
  	}
--- 1835,1841 ----
  		$images = &$mx3_images;

! 		// We include common temlate config file here to not load it every time a module template config file is included
! 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;		
! 		//$this->theme = &$theme;
  		unset($mx_images);		
  	}