- Fix URL for Read Receipts being incorrect in some cases (#1177518).

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

diff --git a/ChangeLog b/ChangeLog
index 84579db543323d525899aca291bde328d6274892..c941db271fff3a14fd1f73c75ac5e6b52ef6857a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,7 @@ Version 1.5.2 - CVS
     and address book format violations that can cause PHP notices.
   - Added line length setting in local_file address book backend (#1181561).
   - Removed proprietary wrap attribute from compose form (#1512681).
+  - Fix URL for Read Receipts being incorrect in some cases (#1177518).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/src/read_body.php b/src/read_body.php
index 882e3f7dc5bc70eab3c56d745705ff5e8e794dcf..10b32ed5e7619d5a8b3bb29279898f82ec4428a5 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -432,7 +432,11 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
                     if (!(handleAsSent($mailbox) ||
                           $message->is_deleted ||
                           $passed_ent_id)) {
-                        $mdn_url = $PHP_SELF . '&sendreceipt=1';
+                        $mdn_url = $PHP_SELF;
+                        $mdn_url = set_url_var($PHP_SELF, 'mailbox', urlencode($mailbox));
+                        $mdn_url = set_url_var($PHP_SELF, 'passed_id', $passed_id);
+                        $mdn_url = set_url_var($PHP_SELF, 'passed_ent_id', $passed_ent_id);
+                        $mdn_url = set_url_var($PHP_SELF, 'sendreceipt', 1);
                         if ($FirstTimeSee && $javascript_on) {
                             $script  = '<script type="text/javascript">' . "\n";
                             $script .= '<!--'. "\n";