bug-948 fixed the ' '-issue for MAIL FROM: und RCPT TO: according to RFC 2821
authorroot <root@cacert1.it-sls.de>
Mon, 30 May 2011 08:30:45 +0000 (10:30 +0200)
committerroot <root@cacert1.it-sls.de>
Mon, 30 May 2011 08:30:45 +0000 (10:30 +0200)
includes/general.php
includes/mysql.php.sample

index 5789875..16b75e4 100644 (file)
                                                $line = fgets($fp, 4096);
                                        if(substr($line, 0, 3) != "250")
                                                continue;
-                                       fputs($fp, "MAIL FROM: <returns@cacert.org>\r\n");
+                                       fputs($fp, "MAIL FROM:<returns@cacert.org>\r\n");
                                        $line = fgets($fp, 4096);
 
                                        if(substr($line, 0, 3) != "250")
                                                continue;
-                                       fputs($fp, "RCPT TO: <$email>\r\n");
+                                       fputs($fp, "RCPT TO:<$email>\r\n");
                                        $line = trim(fgets($fp, 4096));
                                        fputs($fp, "QUIT\r\n");
                                        fclose($fp);
index 1f477e4..ff5cfc3 100644 (file)
                $InputBuffer = fgets($smtp, 1024);
                fputs($smtp, "HELO www.cacert.org\r\n");
                $InputBuffer = fgets($smtp, 1024);
-               fputs($smtp, "MAIL FROM: <returns@cacert.org>\r\n");
+               fputs($smtp, "MAIL FROM:<returns@cacert.org>\r\n");
                $InputBuffer = fgets($smtp, 1024);
                $bits = explode(",", $to);
                foreach($bits as $user)
-                       fputs($smtp, "RCPT TO: <".trim($user).">\r\n");
+                       fputs($smtp, "RCPT TO:<".trim($user).">\r\n");
                $InputBuffer = fgets($smtp, 1024);
                fputs($smtp, "DATA\r\n");
                $InputBuffer = fgets($smtp, 1024);