Even more constants/language strings rewritten, merge_array() now logs debug messages

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index beced61269f70bdb63054bf7c690e76ba9bf068b..6399eca657ea102efb351787ee8208affe16448b 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -32,33 +32,32 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
-if (empty($mx_lang)) $mx_lang = DEFAULT_LANG;
+// Set default language
+if (empty($mx_lang)) $mx_lang = constant('DEFAULT_LANG');
+
+// Generate FQFN
+$FQFN = sprintf("%sinc/language/%s.php", constant('PATH'), $mx_lang);
 
 // Look for file
-$FILE = sprintf(PATH."inc/language/%s.php", $mx_lang);
-if (!file_exists($FILE))
-{
+if (!FILE_READABLE($FQFN)) {
        // Switch to default (DO NOT CHANGE!!!)
-       @setcookie("mx_lang", "de", (time() + $CONFIG['online_timeout']), COOKIE_PATH);
+       set_session('mx_lang', constant('DEFAULT_LANG'));
        $mx_lang = "de";
-       $FILE = sprintf(PATH."inc/language/%s.php", $mx_lang);
-}
+       $INC = sprintf("inc/language/%s.php", constant('DEFAULT_LANG'));
+} // END - if
 
 // Load language file
-require($FILE);
-unset($FILE);
+LOAD_INC($INC);
 
 // Check for installation mode
-if (!mxchange_installed)
-{
+if (isBooleanConstantAndTrue('mxchange_installing')) {
        // Load matching language file
-       require(PATH."inc/language/install_".$mx_lang.".php");
+       LOAD_INC("inc/language/install_".$mx_lang.".php");
 }
 
 //