X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_personal.php;h=dae0c92b7cae51585bd432cf84c96ca976f6b94c;hb=77e6058f22e41b506fbc43697ce70aa76d831d00;hp=a2250a46c904bfa20f5acde30c149271f264c241;hpb=7bcc8f543975b2bea2269fa4af2aba7baf5bb82d;p=squirrelmail.git

diff --git a/src/options_personal.php b/src/options_personal.php
index a2250a46..dae0c92b 100644
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -18,6 +18,7 @@ require_once('../functions/array.php');
 define('SMOPT_GRP_CONTACT', 0);
 define('SMOPT_GRP_REPLY', 1);
 define('SMOPT_GRP_SIG', 2);
+define('SMOPT_GRP_TZ', 3);
 
 /* Define the optpage load function for the personal options page. */
 function load_optpage_data_personal() {
@@ -45,6 +46,10 @@ function load_optpage_data_personal() {
     /* Build a simple array into which we will build options. */
     $optvals = array();
 
+    if (!isset($edit_identity)) {
+        $edit_identity = TRUE;
+    }
+
     if ($edit_identity || $edit_name) {
         $optvals[SMOPT_GRP_CONTACT][] = array(
             'name'    => 'full_name',
@@ -111,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);
+
+        $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
+        );
     }
-    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
-    );
-											     
     /*** Load the Reply Citation Options into the array ***/
     $optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options");
     $optvals[SMOPT_GRP_REPLY] = array();