From 064206f5b60a91101512a57487961d880548bb09 Mon Sep 17 00:00:00 2001 From: stekkel Date: Mon, 7 Jul 2003 18:35:41 +0000 Subject: [PATCH] isn't allowed after MAIL FROM: and RCPT TO: (RFC2821) Thnx Thomas Skyt for spotting this. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5238 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver_SMTP.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index 482847fa..350c5cee 100644 --- a/class/deliver/Deliver_SMTP.class.php +++ b/class/deliver/Deliver_SMTP.class.php @@ -153,7 +153,7 @@ class Deliver_SMTP extends Deliver { } /* Ok, who is sending the message? */ - fputs($stream, 'MAIL FROM: <'.$from->mailbox.'@'.$from->host.">\r\n"); + fputs($stream, 'MAIL FROM:<'.$from->mailbox.'@'.$from->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { return(0); @@ -163,7 +163,7 @@ class Deliver_SMTP extends Deliver { for ($i = 0, $cnt = count($to); $i < $cnt; $i++) { if (!$to[$i]->host) $to[$i]->host = $domain; if ($to[$i]->mailbox) { - fputs($stream, 'RCPT TO: <'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n"); + fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { return(0); @@ -174,7 +174,7 @@ class Deliver_SMTP extends Deliver { for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) { if (!$cc[$i]->host) $cc[$i]->host = $domain; if ($cc[$i]->mailbox) { - fputs($stream, 'RCPT TO: <'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n"); + fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { return(0); @@ -185,7 +185,7 @@ class Deliver_SMTP extends Deliver { for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) { if (!$bcc[$i]->host) $bcc[$i]->host = $domain; if ($bcc[$i]->mailbox) { - fputs($stream, 'RCPT TO: <'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n"); + fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { return(0); -- 2.25.1