Code from inc/language.php moved to function loadLanguageFile(), the include is now...

diff --git a/inc/language-functions.php b/inc/language-functions.php
index b416d32dc07b60e39a2e7d6741f0efa2346e04e1..5cde4b6ebe59fee6eaded2f5f8c65681dece0570 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -111,5 +111,36 @@ function setLanguage ($lang) {
        setSession('mx_lang', $lang);
 }
 
+// Load the current language file or fixes it to 'de'
+function loadLanguageFile () {
+       // Try to get language from session
+       $mx_lang = getSession('mx_lang');
+
+       // Set default language if it is not (yet) set
+       if (is_null($mx_lang)) $mx_lang = getConfig('DEFAULT_LANG');
+
+       // Generate filename
+       $INC = sprintf("inc/language/%s.php", SQL_ESCAPE($mx_lang));
+
+       // Look for file
+       if (!isIncludeReadable($INC)) {
+               // Switch to default (DO NOT CHANGE!!!)
+               setLanguage('de');
+               $INC = 'inc/language/de.php';
+
+               // And set it temporarily
+               setConfigEntry('DEFAULT_LANG', 'de');
+       } // END - if
+
+       // Load language file
+       loadIncludeOnce($INC);
+
+       // Check for installation mode
+       if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
+               // Load matching language file
+               loadInclude('inc/language/install_' . getSession('mx_lang') . '.php');
+       } // END - if
+}
+
 // [EOF]
 ?>

diff --git a/inc/language.php b/inc/language.php
index fdb0d6dbec9916950f6732e64124c3d7e543c7fe..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -1,78 +1,3 @@
 <?php
-/************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 07/10/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : language.php                                     *
- * -------------------------------------------------------------------- *
- * Short description : Language loader                                  *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Sprache-Lader                                    *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
-
-// Try to get language from session
-$mx_lang = getSession('mx_lang');
-
-// Set default language if it is not (yet) set
-if (is_null($mx_lang)) $mx_lang = getConfig('DEFAULT_LANG');
-
-// Generate filename
-$INC = sprintf("inc/language/%s.php", SQL_ESCAPE($mx_lang));
-
-// Look for file
-if (!isIncludeReadable($INC)) {
-       // Switch to default (DO NOT CHANGE!!!)
-       setLanguage('de');
-       $INC = 'inc/language/de.php';
-
-       // And set it temporarily
-       setConfigEntry('DEFAULT_LANG', 'de');
-} // END - if
-
-// Load language file
-loadIncludeOnce($INC);
-
-// Check for installation mode
-if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
-       // Load matching language file
-       loadInclude('inc/language/install_' . getSession('mx_lang') . '.php');
-}
-
-// Remove no more needed variables
-unset($mx_lang);
-unset($INC);
-
-//
+// @DEPRECATED
 ?>

diff --git a/inc/session.php b/inc/session.php
index 26e296685dcc2fb0cdc2164755e0013bb4149f69..ec9dff751e796fd1591ca9d9f989ae0e0b0f8fca 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -51,8 +51,8 @@ if (getConfig('session_save_path') != '') {
 // Start the session
 session_start();
 
-// Load language system
-loadIncludeOnce('inc/language.php');
+// Load language file(s)
+loadLanguageFile();
 
 // Load extensions here
 loadIncludeOnce('inc/load_extensions.php');