Output of messages now a bit nicer

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index cd180277835b814b2d8fecd1f2ce7707383b2851..1f8275c4cc6d9ba3a55703e2e75b8c8710ca0bd8 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -41,18 +40,20 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Set default language
 if (empty($mx_lang)) $mx_lang = DEFAULT_LANG;
 
+// Generate FQFN
+$FQFN = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
+
 // Look for file
-$file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
-if ((!file_exists($file)) || (!is_readable($file))) {
+if (!FILE_READABLE($FQFN)) {
        // Switch to default (DO NOT CHANGE!!!)
-       set_session("mx_lang", "de");
+       set_session('mx_lang', 'de');
        $mx_lang = "de";
-       $file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
-}
+       $FQFN = sprintf("%sinc/language/%s.php", PATH, "de");
+} // END - if
 
 // Load language file
-require($file);
-unset($file);
+require($FQFN);
+unset($FQFN);
 
 // Check for installation mode
 if (isBooleanConstantAndTrue('mxchange_installing')) {