From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 18 Jan 2007 15:19:38 +0000 (+0000)
Subject: Fix URL to send read receipts from read_body (#1637572),
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=ef3e6c1f1e141e58944ef9abf9e242351806b2a3;ds=sidebyside

Fix URL to send read receipts from read_body (#1637572),
thanks to Ce1ta


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

diff --git a/ChangeLog b/ChangeLog
index b286b0ac..84074c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -178,6 +178,7 @@ Version 1.5.2 - SVN
   - Fixed HttpOnly cookies again.
   - Update for switch from CVS to Subversion.
   - Default provider URI link fixed (was broken when on plugin options pages, etc)
+  - Fix URL to send read receipts from read_body (#1637572).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
diff --git a/src/read_body.php b/src/read_body.php
index 48b95ba6..e64b0010 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -388,10 +388,10 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
         if ($mdn_user_support) {
             if ($header->dnt) {
                 $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);
+                $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox));
+                $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id);
+                $mdn_url = set_url_var($mdn_url, 'passed_ent_id', $passed_ent_id);
+                $mdn_url = set_url_var($mdn_url, 'sendreceipt', 1);
 
                 $oTemplate->assign('read_receipt_sent', $message->is_mdnsent);
                 $oTemplate->assign('first_time_reading', $FirstTimeSee);