X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Fvalidate.php;h=c3233a806582ce3ee365c17f524dcfc6b1ff6a1f;hb=9f37489122fa5e7c8ede3f4898dc955015895dc8;hp=6d278c2fc6f702ff883b0b1475a2c4e77ddc7c79;hpb=82d304a0501324b276cabab1870755d5352bd21c;p=squirrelmail.git

diff --git a/include/validate.php b/include/validate.php
index 6d278c2f..c3233a80 100644
--- a/include/validate.php
+++ b/include/validate.php
@@ -1,28 +1,27 @@
 <?php
 
 /**
-* validate.php
-*
-* Copyright (c) 1999-2004 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* $Id$
-* @package squirrelmail
-*/
+ * 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.
@@ -59,14 +58,14 @@ require_once(SM_PATH . 'functions/auth.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")
@@ -91,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