From 4b50568d038d50112c1cc435d2df003d6dba221c Mon Sep 17 00:00:00 2001 From: ullgren Date: Sun, 5 May 2002 11:11:33 +0000 Subject: [PATCH] 552342: Timezone option has no effect when running in safemode. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2802 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/options_personal.php | 42 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/options_personal.php b/src/options_personal.php index a726e1cc..dae0c92b 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -116,29 +116,31 @@ function load_optpage_data_personal() { 'comment' => $identities_link_value ); } - - $TZ_ARRAY[SMPREF_NONE] = _("Same as server"); - $fd = fopen('../locale/timezones.cfg','r'); - while (!feof ($fd)) { - $zone = fgets($fd, 1024); - if( $zone ) { - $zone = trim($zone); - $TZ_ARRAY["$zone"] = "$zone"; + + if ( !ini_get("safe_mode") ) { + $TZ_ARRAY[SMPREF_NONE] = _("Same as server"); + $fd = fopen('../locale/timezones.cfg','r'); + while (!feof ($fd)) { + $zone = fgets($fd, 1024); + if( $zone ) { + $zone = trim($zone); + $TZ_ARRAY["$zone"] = "$zone"; + } } - } - fclose ($fd); + fclose ($fd); - $optgrps[SMOPT_GRP_TZ] = _("Timezone Options"); - $optvals[SMOPT_GRP_TZ] = array(); - - $optvals[SMOPT_GRP_TZ][] = array( - 'name' => 'timezone', - 'caption' => _("Your current timezone"), - 'type' => SMOPT_TYPE_STRLIST, - 'refresh' => SMOPT_REFRESH_NONE, - 'posvals' => $TZ_ARRAY - ); + $optgrps[SMOPT_GRP_TZ] = _("Timezone Options"); + $optvals[SMOPT_GRP_TZ] = array(); + $optvals[SMOPT_GRP_TZ][] = array( + 'name' => 'timezone', + 'caption' => _("Your current timezone"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_NONE, + 'posvals' => $TZ_ARRAY + ); + } + /*** Load the Reply Citation Options into the array ***/ $optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options"); $optvals[SMOPT_GRP_REPLY] = array(); -- 2.25.1