X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvalidate.php;h=c3233a806582ce3ee365c17f524dcfc6b1ff6a1f;hb=4b4abf93a9624311afef0c385023724ee46a2b60;hp=a471ce530a0ec5dbfaa32c20bc03a3d6c57dccb6;hpb=67b73d6507bb4ef2a03368d3786e33b5586f6bd2;p=squirrelmail.git

diff --git a/include/validate.php b/include/validate.php
index a471ce53..c3233a80 100644
--- a/include/validate.php
+++ b/include/validate.php
@@ -1,27 +1,27 @@
 <?php
 
 /**
-* validate.php
-*
-* Copyright (c) 1999-2003 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* $Id$
-*/
-
-/* include the mime class before the session start ! otherwise we can't store
+ * validate.php
+ *
+ * @copyright &copy; 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
+
+/** include the mime class before the session start ! otherwise we can't store
  * messages with a session_register.
  *
  * From http://www.php.net/manual/en/language.oop.serialization.php:
  *   In case this isn't clear:
- *   In 4.2 and below: 
+ *   In 4.2 and below:
  *      session.auto_start and session objects are mutually exclusive.
  *
- * We need to load the classes before the session is started, 
- * except that the session could be started automatically 
- * via session.auto_start. So, we'll close the session, 
- * then load the classes, and reopen the session which should 
- * make everything happy.  
+ * We need to load the classes before the session is started,
+ * except that the session could be started automatically
+ * via session.auto_start. So, we'll close the session,
+ * then load the classes, and reopen the session which should
+ * make everything happy.
  *
  * ** Note this means that for the 1.3.2 release, we should probably
  * recommend that people set session.auto_start=0 to avoid this altogether.
@@ -29,8 +29,17 @@
 
 session_write_close();
 
+/**
+ * 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();
+
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'class/mime.class.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
 
@@ -41,23 +50,22 @@ if(isset($session_name) && $session_name) {
     ini_set('session.name' , 'SQMSESSID');
 }
 
-session_start();
+sqsession_is_active();
 
 require_once(SM_PATH . 'functions/i18n.php');
 require_once(SM_PATH . 'functions/auth.php');
-require_once(SM_PATH . 'functions/global.php');
 
 is_logged_in();
 
 /**
-* 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
-*/
+ * 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")
@@ -71,24 +79,6 @@ if (isset($send)
     }
 }
 
-/**
-* 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(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/prefs.php');
@@ -100,17 +90,32 @@ set_up_language(getPref($data_dir, $username, 'language'));
 $timeZone = getPref($data_dir, $username, 'timezone');
 
 /* Check to see if we are allowed to set the TZ environment variable.
- * We are able to do this if ... 
+ * We are able to do this if ...
  *   safe_mode is disabled OR
  *   safe_mode_allowed_env_vars is empty (you are allowed to set any) OR
- *   safe_mode_allowed_env_vars contains TZ 
+ *   safe_mode_allowed_env_vars contains TZ
  */
 $tzChangeAllowed = (!ini_get('safe_mode')) ||
-                    !strcmp(ini_get('safe_mode_allowed_env_vars'),'') || 
-                    preg_match('/^([\w_]+,)*TZ/', ini_get('safe_mode_allowed_env_vars')); 
+                    !strcmp(ini_get('safe_mode_allowed_env_vars'),'') ||
+                    preg_match('/^([\w_]+,)*TZ/', ini_get('safe_mode_allowed_env_vars'));
 
-if ( $timeZone != SMPREF_NONE && ($timeZone != "") 
+if ( $timeZone != SMPREF_NONE && ($timeZone != "")
     && $tzChangeAllowed ) {
-    putenv("TZ=".$timeZone);
+
+    // get time zone key, if strict or custom strict timezones are used
+    if (isset($time_zone_type) && 
+        ($time_zone_type == 1 || $time_zone_type == 3)) {
+        /* load time zone functions */
+        require_once(SM_PATH . 'include/timezones.php');
+        $realTimeZone = sq_get_tz_key($timeZone);
+    } else {
+        $realTimeZone = $timeZone;
+    }
+
+    // set time zone
+    if ($realTimeZone) {
+        putenv("TZ=".$realTimeZone);
+    }
 }
-?>
+
+?>
\ No newline at end of file