Fix from Dimitar Pashev to make sure the rfc822 from adres isn't mixed up
authorstekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 14 Mar 2006 17:05:01 +0000 (17:05 +0000)
committerstekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 14 Mar 2006 17:05:01 +0000 (17:05 +0000)
when we set the $from vars to '' to make sure MAIL FROM <> is sent (MDN
receipt).
Could be a php 5.x thing because normally $from isn't a reference.

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

class/deliver/Deliver_SMTP.class.php

index e50a535..e565ca8 100644 (file)
@@ -82,6 +82,10 @@ class Deliver_SMTP extends Deliver {
             $content_type->type1 == 'report' &&
             isset($content_type->properties['report-type']) &&
             $content_type->properties['report-type']=='disposition-notification') {
+            // reinitialize the from object because otherwise the from header somehow
+            // is affected. This $from var is used for smtp command MAIL FROM which
+            // is not the same as what we put in the rfc822 header.
+            $from = new AddressStructure();
             $from->host = '';
             $from->mailbox = '';
         }