X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Fvalidate.php;h=37dcaa7df5bcf49530f130f6ac5f7c53fc7ee4df;hb=f44504177fba4a9bc389c4f1569ffdfa363be5c1;hp=aeed3e12709d63ef3f2f387d85be6e1906fbf26d;hpb=bb7173fa78e0dc070a57ceaef0bc454aec61bb60;p=squirrelmail.git diff --git a/include/validate.php b/include/validate.php index aeed3e12..37dcaa7d 100644 --- a/include/validate.php +++ b/include/validate.php @@ -3,7 +3,7 @@ /** * validate.php * -* Copyright (c) 1999-2004 The SquirrelMail Project Team +* Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * @version $Id$ @@ -15,14 +15,14 @@ * * 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. @@ -91,16 +91,16 @@ 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); }