X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Foptions%2Fpersonal.php;h=6c3a06ba47a490f8368967af6e2b796d36e5cdf8;hb=5619673737450c926cf406d4aeb802d0544f52ed;hp=c91b21791073387b2d809430cfbf6a951108d664;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00;p=squirrelmail.git
diff --git a/include/options/personal.php b/include/options/personal.php
index c91b2179..6c3a06ba 100644
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -3,20 +3,16 @@
/**
* options_personal.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Displays all options relating to personal information
*
- * $Id$
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
-define('SM_PATH','../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
+/** SquirrelMail required files. */
+require_once(SM_PATH . 'include/timezones.php');
/* Define the group constants for the personal options page. */
define('SMOPT_GRP_CONTACT', 0);
@@ -24,16 +20,38 @@ 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. */
+/**
+ * This function builds an array with all the information about
+ * the options available to the user, and returns it. The options
+ * are grouped by the groups in which they are displayed.
+ * For each option, the following information is stored:
+ * - name: the internal (variable) name
+ * - caption: the description of the option in the UI
+ * - type: one of SMOPT_TYPE_*
+ * - refresh: one of SMOPT_REFRESH_*
+ * - size: one of SMOPT_SIZE_*
+ * - save: the name of a function to call when saving this option
+ * @return array all option information
+ */
function load_optpage_data_personal() {
global $data_dir, $username, $edit_identity, $edit_name,
- $full_name, $reply_to, $email_address, $signature;
+ $full_name, $reply_to, $email_address, $signature, $tzChangeAllowed,
+ $timeZone, $domain;
/* Set the values of some global variables. */
$full_name = getPref($data_dir, $username, 'full_name');
$reply_to = getPref($data_dir, $username, 'reply_to');
- $email_address = getPref($data_dir, $username, 'email_address');
+ $email_address = getPref($data_dir, $username, 'email_address',SMPREF_NONE);
$signature = getSig($data_dir, $username, 'g');
+
+ // set email_address to default value, if it is not set in user's preferences
+ if ($email_address == SMPREF_NONE) {
+ if (preg_match("/(.+)@(.+)/",$username)) {
+ $email_address = $username;
+ } else {
+ $email_address = $username . '@' . $domain ;
+ }
+ }
/* Build a simple array into which we will build options. */
$optgrps = array();
@@ -75,7 +93,7 @@ function load_optpage_data_personal() {
if ($edit_identity) {
$optvals[SMOPT_GRP_CONTACT][] = array(
'name' => 'email_address',
- 'caption' => _("Email Address"),
+ 'caption' => _("E-mail Address"),
'type' => SMOPT_TYPE_STRING,
'refresh' => SMOPT_REFRESH_NONE,
'size' => SMOPT_SIZE_HUGE
@@ -83,10 +101,10 @@ function load_optpage_data_personal() {
} else {
$optvals[SMOPT_GRP_CONTACT][] = array(
'name' => 'email_address',
- 'caption' => _("Email Address"),
+ 'caption' => _("E-mail Address"),
'type' => SMOPT_TYPE_COMMENT,
'refresh' => SMOPT_REFRESH_NONE,
- 'comment' => $email_address
+ 'comment' => htmlspecialchars($email_address)
);
}
@@ -108,9 +126,9 @@ function load_optpage_data_personal() {
);
if ($edit_identity) {
- $identities_link_value = ''
+ $identities_link_value = ''
. _("Edit Advanced Identities")
- . ' '
+ . ' '
. _("(discards changes made on this form so far)");
$optvals[SMOPT_GRP_CONTACT][] = array(
'name' => 'identities_link',
@@ -120,18 +138,50 @@ function load_optpage_data_personal() {
'comment' => $identities_link_value
);
}
-
- if ( !ini_get("safe_mode") ) {
+
+ if ( $tzChangeAllowed || function_exists('date_default_timezone_set')) {
$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";
+
+ $aTimeZones = sq_get_tz_array();
+ unset($message);
+ if (! empty($aTimeZones)) {
+ // check if current timezone is linked to other TZ and update it
+ if ($timeZone != SMPREF_NONE && $timeZone != "" &&
+ isset($aTimeZones[$timeZone]['LINK'])) {
+ $timeZone = $aTimeZones[$timeZone]['LINK'];
+ // TODO: recheck setting of $timeZone
+ // setPref($data_dir,$username,'timezone',$timeZone);
+ }
+
+ // sort time zones by name. sq_get_tz_array() returns sorted by key.
+ // asort($aTimeZones);
+
+ // add all 'TZ' entries to TZ_ARRAY
+ foreach ($aTimeZones as $TzKey => $TzData) {
+ if (! isset($TzData['LINK'])) {
+ // Old display format
+ $TZ_ARRAY[$TzKey] = $TzKey;
+
+ // US Eastern standard time (America/New_York) - needs asort($aTimeZones)
+ //$TZ_ARRAY[$TzKey] = (isset($TzData['NAME']) ? $TzData['NAME']." ($TzKey)" : "($TzKey)");
+
+ // US Eastern standard time if NAME is present or America/New_York if NAME not present
+ // needs sorting after all data is added or uasort()
+ //$TZ_ARRAY[$TzKey] = (isset($TzData['NAME']) ? $TzData['NAME'] : $TzKey);
+
+ // (America/New_Your) US Eastern standard time
+ //$TZ_ARRAY[$TzKey] = "($TzKey)" . (isset($TzData['NAME']) ? ' '.$TzData['NAME'] : '');
+ }
}
+ } else {
+ $message = _("Error opening timezone config, contact administrator.");
+ }
+
+ // TODO: make error user friendly
+ if (isset($message)) {
+ plain_error_message($message);
+ exit;
}
- fclose ($fd);
$optgrps[SMOPT_GRP_TZ] = _("Timezone Options");
$optvals[SMOPT_GRP_TZ] = array();
@@ -144,7 +194,7 @@ function load_optpage_data_personal() {
'posvals' => $TZ_ARRAY
);
}
-
+
/*** Load the Reply Citation Options into the array ***/
$optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options");
$optvals[SMOPT_GRP_REPLY] = array();
@@ -155,7 +205,8 @@ function load_optpage_data_personal() {
'type' => SMOPT_TYPE_STRLIST,
'refresh' => SMOPT_REFRESH_NONE,
'posvals' => array(SMPREF_NONE => _("No Citation"),
- 'author_said' => _("AUTHOR Said"),
+ 'author_said' => _("AUTHOR Wrote"),
+ 'date_time_author' => _("On DATE, AUTHOR Wrote"),
'quote_who' => _("Quote Who XML"),
'user-defined' => _("User-Defined"))
);
@@ -206,9 +257,11 @@ function load_optpage_data_personal() {
/** Define any specialized save functions for this option page. ***/
/******************************************************************/
+/**
+ * Saves the signature option.
+ */
function save_option_signature($option) {
global $data_dir, $username;
setSig($data_dir, $username, 'g', $option->new_value);
}
-?>