fix boundary_end in case of recursion

Thnx Aaron van Meerten for spotting this.

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

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index ae7b8b57eb175025a5ee7c51c06631c46537842e..9a243c50980ace4c3654b30119b9c740a80843b2 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -62,7 +62,7 @@ class Deliver {
             if ($i == $entCount-1) $last = true;
         }
         if ($boundary && $last) {
             if ($i == $entCount-1) $last = true;
         }
         if ($boundary && $last) {

-            $s = "--".$boundary."--\r\n\r\n";
+            $s = "--".$boundary_new."--\r\n\r\n";

             $length_raw += strlen($s);
             if ($stream) {
                 $this->preWriteToStream($s);
             $length_raw += strlen($s);
             if ($stream) {
                 $this->preWriteToStream($s);


@@ -307,8 +307,8 @@ class Deliver {
         }
         /* Identify SquirrelMail */    
         $header[] = 'User-Agent: SquirrelMail/' . $version . $rn;
         }
         /* Identify SquirrelMail */    
         $header[] = 'User-Agent: SquirrelMail/' . $version . $rn;

-       // Spamassassin complains about no X-Mailer in combination with X-Priority
-       $header[] = 'X-Mailer: SquirrelMail/' . $version . $rn; 
+        // Spamassassin complains about no X-Mailer in combination with X-Priority
+        $header[] = 'X-Mailer: SquirrelMail/' . $version . $rn; 

         /* Do the MIME-stuff */
         $header[] = 'MIME-Version: 1.0' . $rn;
         $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.
         /* Do the MIME-stuff */
         $header[] = 'MIME-Version: 1.0' . $rn;
         $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.