don't allow send read_receipts (MDN) if the message is a message/rfc822

attachment.

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

diff --git a/src/read_body.php b/src/read_body.php
index 88fae555a8466b41896cb0a57c4db4c5da55b7ff..dac38c8ae48b3848668a0fced171aabcd35e10c8 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -340,7 +340,9 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
              $env[_("Read receipt")] = _("send");
           } else {
              if ( !($mailbox == $draft_folder || 
              $env[_("Read receipt")] = _("send");
           } else {
              if ( !($mailbox == $draft_folder || 

-                    $mailbox == $sent_folder  || $message->is_deleted)) {
+                    $mailbox == $sent_folder  || 
+                    $message->is_deleted ||
+                    $passed_ent_id)) {

                $mdn_url = $PHP_SELF . '&sendreceipt=1';
                if ($FirstTimeSee && $javascript_on) {
                   $script  = '<script language="JavaScript" type="text/javascript">' ."\n";
                $mdn_url = $PHP_SELF . '&sendreceipt=1';
                if ($FirstTimeSee && $javascript_on) {
                   $script  = '<script language="JavaScript" type="text/javascript">' ."\n";