X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage.php;h=0b931cb4163a6054de115c3c3c8a5f064a8d8ca5;hb=9e1f6d2cff0bbef912d605d4ae1728f0382b83a4;hp=6399eca657ea102efb351787ee8208affe16448b;hpb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;p=mailer.git

diff --git a/inc/language.php b/inc/language.php
index 6399eca657..0b931cb416 100644
--- a/inc/language.php
+++ b/inc/language.php
@@ -37,28 +37,38 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-// Set default language
-if (empty($mx_lang)) $mx_lang = constant('DEFAULT_LANG');
+// Try to get language from session
+$mx_lang = get_session('mx_lang');
+
+// Set default language if it is not (yet) set
+if (is_null($mx_lang)) $mx_lang = constant('DEFAULT_LANG');
+
+// Generate filename
+$INC = sprintf("inc/language/%s.php", SQL_ESCAPE($mx_lang));
 
 // Generate FQFN
-$FQFN = sprintf("%sinc/language/%s.php", constant('PATH'), $mx_lang);
+$FQFN = constant('PATH') . $INC;
 
 // Look for file
 if (!FILE_READABLE($FQFN)) {
 	// Switch to default (DO NOT CHANGE!!!)
-	set_session('mx_lang', constant('DEFAULT_LANG'));
-	$mx_lang = "de";
-	$INC = sprintf("inc/language/%s.php", constant('DEFAULT_LANG'));
+	$mx_lang = constant('DEFAULT_LANG');
+	set_session('mx_lang', $mx_lang);
+	$INC = sprintf("inc/language/%s.php", $mx_lang);
 } // END - if
 
 // Load language file
-LOAD_INC($INC);
+LOAD_INC_ONCE($INC);
 
 // Check for installation mode
-if (isBooleanConstantAndTrue('mxchange_installing')) {
+if ((isInstalling()) || (!isInstalled()) || (!isAdminRegistered())) {
 	// Load matching language file
 	LOAD_INC("inc/language/install_".$mx_lang.".php");
 }
 
+// Remove no more needed variables
+unset($mx_lang);
+unset($INC);
+
 //
 ?>