From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 22 May 2005 13:43:28 +0000 (+0000)
Subject: Fix get_identities() for the case where the user has not set an email
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b6e708010356bdea7a56c89ef3b12fde0d7dc673;p=squirrelmail.git

Fix get_identities() for the case where the user has not set an email
address: use the fallback $username@$domain that's used in compose aswell.


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

diff --git a/ChangeLog b/ChangeLog
index 31e11c55..197077c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -353,7 +353,9 @@ Version 1.5.1 -- CVS
   - Added peardb backend to change_password plugin.
   - Tweak IMAP connection error display (#1203154).
   - Gracefully recover from over quota error while sending a mail (#1145144).
-
+  - Fix get_identities() for the case where the user has not set an email
+    address: use the fallback $username@$domain that's used in compose aswell.
+    
 Version 1.5.0 - 2 February 2004
 -------------------------------
   - Added new preference that determines cursor focus when replying
diff --git a/functions/identity.php b/functions/identity.php
index 65331253..b3538c69 100644
--- a/functions/identity.php
+++ b/functions/identity.php
@@ -26,17 +26,20 @@ include_once(SM_PATH . 'include/load_prefs.php');
 */
 function get_identities() {
 
-    global $username, $data_dir;
+    global $username, $data_dir, $domain;
+
+    $em = getPref($data_dir,$username,'email_address');
+    if ( ! $em )  $em = $username.'@'.$domain;
 
-    $num_ids = getPref($data_dir,$username,'identities');
     $identities = array();
     /* We always have this one, even if the user doesn't use multiple identities */
     $identities[] = array('full_name' => getPref($data_dir,$username,'full_name'),
-        'email_address' => getPref($data_dir,$username,'email_address'),
+        'email_address' => $em,
         'reply_to' => getPref($data_dir,$username,'reply_to'),
         'signature' => getSig($data_dir,$username,'g'),
         'index' => 0 );
 
+    $num_ids = getPref($data_dir,$username,'identities');
     /* If there are any others, add them to the array */
     if (!empty($num_ids) && $num_ids > 1) {
         for ($i=1;$i<$num_ids;$i++) {
@@ -51,4 +54,4 @@ function get_identities() {
     return $identities;
 }
 
-?>
\ No newline at end of file
+?>