From 356d7825d93d29b17e4e437220213c3da8417127 Mon Sep 17 00:00:00 2001
From: gustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 29 Feb 2000 14:49:16 +0000
Subject: [PATCH] Uses the brand new configuration directive email_address to
 set the From: address when sending mail.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@254 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/smtp.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/functions/smtp.php b/functions/smtp.php
index fde15fa0..9859c7ed 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -87,9 +87,12 @@
       $to = parseAddrs($t);
       $cc = parseAddrs($c);
       $bcc = parseAddrs($b);
-      $from_addr = "$username@$domain";
       $reply_to = getPref($data_dir, $username, "reply_to");
       $from = getPref($data_dir, $username, "full_name");
+      $from_addr = getPref($data_dir, $username, "email_address");
+
+      if ($from_addr == "")
+         $from_addr = "$username@$domain";
 
       $to_list = getLineOfAddrs($to);
       $cc_list = getLineOfAddrs($cc);
@@ -181,12 +184,16 @@
    }
 
    function sendSMTP($t, $c, $b, $subject, $body) {
-      global $username, $domain, $version, $smtpServerAddress, $smtpPort;
+      global $username, $domain, $version, $smtpServerAddress, $smtpPort,
+         $data_dir;
 
       $to = parseAddrs($t);
       $cc = parseAddrs($c);
       $bcc = parseAddrs($b);
-      $from_addr = "$username@$domain";
+      $from_addr = getPref($data_dir, $username, "email_address");
+
+      if ($from_addr == "")
+         $from_addr = "$username@$domain";
 
       $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString);
       if (!$smtpConnection) {
-- 
2.25.1