Damn typo fixed... ;-)

[mailer.git] / inc / language.php

diff --git a/inc/language.php b/inc/language.php
index 93da8d9ca92143f3f3e1a7a7d86ef9a2b4b8a279..3239912168adcbe1c2b13d0c78f77e215ff5b07b 100644 (file)
--- 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                  *
@@ -32,33 +37,43 @@
  ************************************************************************/
 
 // 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);
 }
 
-// Set default language
-if (empty($mx_lang)) $mx_lang = 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 = constant('PATH') . $INC;
 
 // Look for file
-$file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
-if (!FILE_READABLE($file)) {
+if (!FILE_READABLE($FQFN)) {
        // Switch to default (DO NOT CHANGE!!!)
-       set_session("mx_lang", "de");
-       $mx_lang = "de";
-       $file = sprintf("%sinc/language/%s.php", PATH, "de");
+       $mx_lang = constant('DEFAULT_LANG');
+       set_session('mx_lang', $mx_lang);
+       $INC = sprintf("inc/language/%s.php", $mx_lang);
 } // END - if
 
 // Load language file
-require($file);
-unset($file);
+LOAD_INC_ONCE($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");
+       LOAD_INC("inc/language/install_".$mx_lang.".php");
 }
 
+// Remove no more needed variables
+unset($mx_lang);
+unset($INC);
+
 //
 ?>