Ensure that Reply-To isn't missing domain - we already do the same for the From heade...

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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d1c84d6c51f38e855d2c63e460452ad27586552a..8135dcca2e57567116fc5f6d9e863cfa183ade97 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -367,6 +367,8 @@ Version 1.5.2 - SVN
     to Nicholas Carlini for finding all these issues).
     [CVE-2011-2752, CVE-2011-2753, CVE-2010-4555]
   - Fixed XSS problem with unsanitized style tags in messages. [CVE-2011-2023]
+  - Always ensure that the Reply-To header is a full email address in
+    outgoing messages (makes the Verify Reply-To plugin obsolete)
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/src/compose.php b/src/compose.php
index e7ed28e86828f7a254a163e74409940a520775c4..3ba329b43f0d87f1504e3041488545e705702059 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1627,6 +1627,8 @@ function deliverMessage(&$composeMessage, $draft=false) {
 
     $reply_to = '';
     $reply_to  = $idents[$identity]['reply_to'];
+    if (strpos($reply_to, '@') === FALSE)
+        $reply_to .= '@' . $domain;
     
     $from_addr = build_from_header($identity);
     $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);