Enabled user selection of address format when adding from address book during message...

[squirrelmail.git] / include / options / personal.php

diff --git a/include/options/personal.php b/include/options/personal.php
index 973a0ac9e950246fe20bf0762a1d83c9e302cc1b..6c3a06ba47a490f8368967af6e2b796d36e5cdf8 100644 (file)
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -5,14 +5,13 @@
  *
  * Displays all options relating to personal information
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'include/timezones.php');
 
 /* Define the group constants for the personal options page. */
@@ -37,13 +36,22 @@ define('SMOPT_GRP_TZ', 3);
 function load_optpage_data_personal() {
     global $data_dir, $username, $edit_identity, $edit_name,
            $full_name, $reply_to, $email_address, $signature, $tzChangeAllowed,
-           $color, $timeZone;
+           $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();
@@ -96,7 +104,7 @@ function load_optpage_data_personal() {
             'caption' => _("E-mail Address"),
             'type'    => SMOPT_TYPE_COMMENT,
             'refresh' => SMOPT_REFRESH_NONE,
-            'comment' => $email_address
+            'comment' => htmlspecialchars($email_address)
         );
     }
 
@@ -171,7 +179,7 @@ function load_optpage_data_personal() {
 
         // TODO: make error user friendly
         if (isset($message)) {
-            plain_error_message($message, $color);
+            plain_error_message($message);
             exit;
         }
 
@@ -257,4 +265,3 @@ function save_option_signature($option) {
     setSig($data_dir, $username, 'g', $option->new_value);
 }
 
-?>
\ No newline at end of file