diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-07-21 15:15:08 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-07-21 15:15:08 +0200 |
| commit | 18e174650de0aecc446d51eec3e0801e3edefcad (patch) | |
| tree | 534ecfcd2675fedb027fc1fa3c3e8a67a1fd068e /includes | |
| parent | a9cf76bebbae1d26b558f55daf6fa59ebfda91b1 (diff) | |
| parent | 3d6c4ebbebd10e6ab6c2e952b07a6eea2f0a5626 (diff) | |
| download | cacert-devel-18e174650de0aecc446d51eec3e0801e3edefcad.tar.gz cacert-devel-18e174650de0aecc446d51eec3e0801e3edefcad.tar.xz cacert-devel-18e174650de0aecc446d51eec3e0801e3edefcad.zip | |
Merge remote-tracking branch 'origin/bug-948' into release2011-07-21
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/general.php | 4 | ||||
| -rw-r--r-- | includes/mysql.php.sample | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/general.php b/includes/general.php index 5789875..16b75e4 100644 --- a/includes/general.php +++ b/includes/general.php @@ -673,12 +673,12 @@ $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); diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index 1f477e4..ff5cfc3 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -55,11 +55,11 @@ $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); |