Merge pull request WoltLab#10 from wbb3addons/smtpFix

dtdesign · dtdesign · commit 02563331da10 · 2011-07-15T06:34:41.000-07:00
SMTP no longer throws an Exception when code 250 (OK) occurs
diff --git a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php
@@ -142,7 +142,7 @@ public function sendMail(Mail $mail) {
 		// data
 		$this->write("DATA");
 		$this->getSMTPStatus();
-		if ($this->statusCode != 354) {
+		if ($this->statusCode != 354 && $this->statusCode != 250) {
 			throw new SystemException($this->formatError("smtp error"), 17005);
 		}
 						

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function sendMail(Mail $mail) {`
`142`	`142`	`// data`
`143`	`143`	`$this->write("DATA");`
`144`	`144`	`$this->getSMTPStatus();`
`145`		`- if ($this->statusCode != 354) {`
	`145`	`+ if ($this->statusCode != 354 && $this->statusCode != 250) {`
`146`	`146`	`throw new SystemException($this->formatError("smtp error"), 17005);`
`147`	`147`	`}`
`148`	`148`