X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flanguage.php;h=fdb0d6dbec9916950f6732e64124c3d7e543c7fe;hb=211058a32ac0f0eaa69987158f41d8102663ec4d;hp=fc7f73c1b71aecc9ec7d8eeb243ced27d2784756;hpb=7f104f6fe558bb56b4205241435a2357c2feece1;p=mailer.git

diff --git a/inc/language.php b/inc/language.php
index fc7f73c1b7..fdb0d6dbec 100644
--- a/inc/language.php
+++ b/inc/language.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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                  *
@@ -33,31 +38,41 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// Set default language
-if (empty($mx_lang)) $mx_lang = DEFAULT_LANG;
+// 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
-$file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
-if (!FILE_READABLE($file)) {
+if (!isIncludeReadable($INC)) {
 	// Switch to default (DO NOT CHANGE!!!)
-	set_session("mx_lang", "de");
-	$mx_lang = "de";
-	$file = sprintf("%sinc/language/%s.php", PATH, "de");
+	setLanguage('de');
+	$INC = 'inc/language/de.php';
+
+	// And set it temporarily
+	setConfigEntry('DEFAULT_LANG', 'de');
 } // END - if
 
 // Load language file
-require($file);
-unset($file);
+loadIncludeOnce($INC);
 
 // Check for installation mode
-if (isBooleanConstantAndTrue('mxchange_installing')) {
+if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
 	// Load matching language file
-	require(PATH."inc/language/install_".$mx_lang.".php");
+	loadInclude('inc/language/install_' . getSession('mx_lang') . '.php');
 }
 
+// Remove no more needed variables
+unset($mx_lang);
+unset($INC);
+
 //
 ?>