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

[squirrelmail.git] / src / read_body.php

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";