put back some minor changes

[squirrelmail.git] / src / validate.php

diff --git a/src/validate.php b/src/validate.php
index 27573401535d489b991b940fbf90e3180a75e405..9f9b88b6438921fd3b2139fedecaf813906a98a3 100644 (file)
--- a/src/validate.php
+++ b/src/validate.php
@@ -9,16 +9,18 @@
 * $Id$
 */
 
-global $username, $attachment_dir;
+/* include the mime class before the session start ! otherwise we can't store
+ * messages with a session_register.
+ */
+ 
+require_once('../class/mime.class');
 
-require_once('../functions/prefs.php');
-
-session_save_path( getHashedDir($username, $attachment_dir) );
 session_start();
 
 require_once('../functions/i18n.php');
 require_once('../functions/auth.php');
 require_once('../functions/strings.php');
+require_once('../functions/prefs.php');
 
 is_logged_in();
 
@@ -26,10 +28,10 @@ is_logged_in();
 if (get_magic_quotes_gpc()) {
     global $REQUEST_METHOD;
 
-    if ($REQUEST_METHOD == "POST") {
+    if ($REQUEST_METHOD == 'POST') {
         global $HTTP_POST_VARS;
         RemoveSlashes($HTTP_POST_VARS);
-    } else if ($REQUEST_METHOD == "GET") {
+    } else if ($REQUEST_METHOD == 'GET') {
         global $HTTP_GET_VARS;
         RemoveSlashes($HTTP_GET_VARS);
     }
@@ -48,7 +50,7 @@ global $send, $PHP_SELF;
 if (isset($send)
     && (substr($send, 0, 1) == "\n")
     && (substr($PHP_SELF, -12) == '/compose.php')) {
-    if ($REQUEST_METHOD == "POST") {
+    if ($REQUEST_METHOD == 'POST') {
         global $HTTP_POST_VARS;
         TrimArray($HTTP_POST_VARS);
     } else {
@@ -66,12 +68,26 @@ if (isset($send)
 * Include them down here instead of at the top so that all config
 * variables overwrite any passed in variables (for security).
 */
+
+/**
+ * Reset the $theme() array in case a value was passed via a cookie.
+ * This is until theming is rewritten.
+ */
+global $theme;
+unset($theme);
+$theme=array();
+
 require_once('../config/config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/page_header.php');
-require_once('../functions/prefs.php');
 
 /* Set up the language (i18n.php was included by auth.php). */
 global $username, $data_dir;
 set_up_language(getPref($data_dir, $username, 'language'));
+
+$timeZone = getPref($data_dir, $username, 'timezone');
+if ( $timeZone != SMPREF_NONE && ($timeZone <> '') 
+    && !ini_get( 'safe_mode')) {
+    putenv('TZ=' . $timeZone);
+}
 ?>