From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 12 Jun 2006 17:42:16 +0000 (+0000)
Subject: 1. personal preferences don't need imap functions.
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=8d6a0eb24187c8f0e73cf2b4f209e876b8522d68

1. personal preferences don't need imap functions.
2. display email address even when user settings don't store it.
3. set default $email_address value to username + domain.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11203 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/include/options/personal.php b/include/options/personal.php
index 973a0ac9..36a1ae63 100644
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -12,7 +12,6 @@
  */
 
 /** 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;
+           $color, $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)
         );
     }