put back some minor changes

[squirrelmail.git] / src / validate.php

diff --git a/src/validate.php b/src/validate.php
index 8d78791c47b428b6fe24bd3eacbb899d4e174912..9f9b88b6438921fd3b2139fedecaf813906a98a3 100644 (file)
--- a/src/validate.php
+++ b/src/validate.php
@@ -1,87 +1,93 @@
 <?php
 
 /**
- * validate.php
- *
- * Copyright (c) 1999-2001 The SquirrelMail Development Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
- */
+* validate.php
+*
+* Copyright (c) 1999-2002 The SquirrelMail Project Team
+* Licensed under the GNU GPL. For full terms see the file COPYING.
+*
+* $Id$
+*/
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
+/* include the mime class before the session start ! otherwise we can't store
+ * messages with a session_register.
+ */
+ 
+require_once('../class/mime.class');
 
 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();
+is_logged_in();
 
-    /* Remove all slashes for form values. */
-    if (get_magic_quotes_gpc()) {
-        global $REQUEST_METHOD;
+/* Remove all slashes for form values. */
+if (get_magic_quotes_gpc()) {
+    global $REQUEST_METHOD;
 
-        if ($REQUEST_METHOD == "POST") {
-            global $HTTP_POST_VARS;
-            RemoveSlashes($HTTP_POST_VARS);
-        } else if ($REQUEST_METHOD == "GET") {
-            global $HTTP_GET_VARS;
-            RemoveSlashes($HTTP_GET_VARS);
-        }
+    if ($REQUEST_METHOD == 'POST') {
+        global $HTTP_POST_VARS;
+        RemoveSlashes($HTTP_POST_VARS);
+    } else if ($REQUEST_METHOD == 'GET') {
+        global $HTTP_GET_VARS;
+        RemoveSlashes($HTTP_GET_VARS);
     }
+}
 
-    /**
-     * Auto-detection
-     *
-     * if $send (the form button's name) contains "\n" as the first char
-     * and the script is compose.php, then trim everything. Otherwise, we
-     * don't have to worry.
-     *
-     * This is for a RedHat package bug and a Konqueror (pre 2.1.1?) bug
-     */
-    global $send, $PHP_SELF;
-    if (isset($send)
-        && (substr($send, 0, 1) == "\n")
-        && (substr($PHP_SELF, -12) == '/compose.php')) {
-        if ($REQUEST_METHOD == "POST") {
-            global $HTTP_POST_VARS;
-            TrimArray($HTTP_POST_VARS);
-        } else {
-            global $HTTP_GET_VARS;
-            TrimArray($HTTP_GET_VARS);
-        }
+/**
+* Auto-detection
+*
+* if $send (the form button's name) contains "\n" as the first char
+* and the script is compose.php, then trim everything. Otherwise, we
+* don't have to worry.
+*
+* This is for a RedHat package bug and a Konqueror (pre 2.1.1?) bug
+*/
+global $send, $PHP_SELF;
+if (isset($send)
+    && (substr($send, 0, 1) == "\n")
+    && (substr($PHP_SELF, -12) == '/compose.php')) {
+    if ($REQUEST_METHOD == 'POST') {
+        global $HTTP_POST_VARS;
+        TrimArray($HTTP_POST_VARS);
+    } else {
+        global $HTTP_GET_VARS;
+        TrimArray($HTTP_GET_VARS);
     }
+}
+
+/**
+* Everyone needs stuff from config, and config needs stuff from
+* strings.php, so include them both here. Actually, strings is
+* included at the top now as the string array functions have
+* been moved into it.
+*
+* 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');
 
-    /**
-     * Everyone needs stuff from config, and config needs stuff from
-     * strings.php, so include them both here. Actually, strings is
-     * included at the top now as the string array functions have
-     * been moved into it.
-     *
-     * Include them down here instead of at the top so that all config
-     * variables overwrite any passed in variables (for security).
-     */
-    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'));
 
-    /* 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);
+}
 ?>