Correct slovak locale naming is sk_SK not only sk, this is bug in locale settings...

[squirrelmail.git] / src / validate.php

diff --git a/src/validate.php b/src/validate.php
index 7added477318dfd7f4b3b0e4c6460615c3bb7b42..83d22e32f58e9f4909cb04f0965b520b4d71d799 100644 (file)
--- a/src/validate.php
+++ b/src/validate.php
@@ -8,20 +8,14 @@
     **  $Id$
     **/
 
-   if (defined ('validate_php')) { 
+   if (defined ('validate_php'))
       return; 
-   } else { 
-      define ('validate_php', true); 
-   }
+   define ('validate_php', true); 
 
    session_start();
+   include ('../functions/i18n.php');
    include ('../functions/auth.php');
    
-   // Everyone needs stuff from config, and config needs stuff from
-   // strings.php, so include them both here.
-   include ('../functions/strings.php');
-   include ('../config/config.php');
-   
    is_logged_in();
 
 
@@ -105,4 +99,17 @@
        }
    }
 
+   // Everyone needs stuff from config, and config needs stuff from
+   // strings.php, so include them both here.
+   // Include them down here instead of at the top so that all config
+   // variables overwrite any passed in variables (for security)
+   include ('../functions/strings.php');
+   include ('../config/config.php');
+   include ('../src/load_prefs.php');
+   include ('../functions/page_header.php');
+
+   // Set up the language
+   // i18n.php was included by auth.php
+   global $username, $data_dir;
+   set_up_language(getPref($data_dir, $username, 'language'));
 ?>