[mxbb-commits] core/includes mx_functions_style.php,1.74,1.75

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
experimental setup() method for all backends

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** mx_functions_style.php	16 Jun 2008 20:26:24 -0000	1.74
--- mx_functions_style.php	26 Jun 2008 22:02:00 -0000	1.75
***************
*** 568,572 ****
  			{
  				// For logged in users, try the board default language next
! 				$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($board_config['default_lang'])), "'");
  			}
  			else
--- 568,572 ----
  			{
  				// For logged in users, try the board default language next
! 				$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->data['default_lang'])), "'");
  			}
  			else
***************
*** 628,654 ****
  		}
  
! 		//Load phpBB lang keys
! 		if ((@include $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx") === false)
  		{
! 			if ((@include $phpbb_lang_path . "lang_english/lang_main.$phpEx") === false)
  			{
! 				mx_message_die(GENERAL_ERROR, 'Language file ' . $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx" . ' couldn\'t be opened.');
! 			}
  		}
  
! 		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
! 
! 		//Load AdminCP lang keys
! 		if ( defined('IN_ADMIN') )
  		{
! 			if( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.'.$phpEx))
  			{
! 				$board_config['default_lang'] = 'english';
  			}
- 
- 			include($phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx"); // Also include phpBB admin lang keys
- 			include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . "/lang_admin.$phpEx"); // Also include mxP Admin lang keys
  		}
! 
  		//
  		// Mozilla navigation bar
--- 628,662 ----
  		}
  
! 		//Load MXP lang keys		
! 		if (defined('IN_ADMIN'))
  		{
! 			$phpbb_lang_file = (PORTAL_BACKEND == 'phpbb3') ? 'acp/common' : 'lang_admin';
! 			include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
! 
! 			if (PORTAL_BACKEND == 'phpbb3')
  			{
! 				include($phpbb_lang_path . 'lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);			
! 			}			
  		}
+ 		else
+ 		{
+ 			$phpbb_lang_file = (PORTAL_BACKEND == 'phpbb3') ? 'common' : 'lang_main';			
+ 		}
+ 		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);		
  
! 		if ((@include $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx") === false)
  		{
! 			if ((@include $phpbb_lang_path . "lang_english/lang_main.$phpEx") === false)
  			{
! 				mx_message_die(GENERAL_ERROR, 'Language file ' . $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
! 		
! 		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;		
! 		//Load lang keys
! 		$this->setup($phpbb_lang_file);	
! 		$lang = &$this->lang;
! 		
  		//
  		// Mozilla navigation bar