Fixes for sql_patches removal vs. password reset of admin

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index beced61269f70bdb63054bf7c690e76ba9bf068b..cd180277835b814b2d8fecd1f2ce7707383b2851 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -38,25 +38,24 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
        require($INC);
 }
 
+// Set default language
 if (empty($mx_lang)) $mx_lang = DEFAULT_LANG;
 
 // Look for file
-$FILE = sprintf(PATH."inc/language/%s.php", $mx_lang);
-if (!file_exists($FILE))
-{
+$file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
+if ((!file_exists($file)) || (!is_readable($file))) {
        // Switch to default (DO NOT CHANGE!!!)
-       @setcookie("mx_lang", "de", (time() + $CONFIG['online_timeout']), COOKIE_PATH);
+       set_session("mx_lang", "de");
        $mx_lang = "de";
-       $FILE = sprintf(PATH."inc/language/%s.php", $mx_lang);
+       $file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
 }
 
 // Load language file
-require($FILE);
-unset($FILE);
+require($file);
+unset($file);
 
 // Check for installation mode
-if (!mxchange_installed)
-{
+if (isBooleanConstantAndTrue('mxchange_installing')) {
        // Load matching language file
        require(PATH."inc/language/install_".$mx_lang.".php");
 }