From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 22 Jan 2014 11:30:52 -0500 Subject: [PATCH] Fixed bug from previous commit --- interface/lib/classes/ispcmail.inc.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php index dff71f3..2e49c8d 100644 --- a/interface/lib/classes/ispcmail.inc.php +++ b/interface/lib/classes/ispcmail.inc.php @@ -223,6 +223,7 @@ elseif(isset($_SERVER['SERVER_NAME'])) $this->smtp_helo = $_SERVER['SERVER_NAME']; else $this->smtp_helo = php_uname('n'); if($this->smtp_helo == '') $this->smtp_helo = 'localhost'; + return $this->smtp_helo; } @@ -697,11 +698,11 @@ $recipname = $this->_encodeHeader($recipname, $this->mail_charset); //Email From - fputs($this->_smtp_conn, 'MAIL FROM: ' . $this->_mail_sender . $this->_crlf); + fputs($this->_smtp_conn, 'MAIL FROM: <' . $this->_mail_sender . '>' . $this->_crlf); $response = fgets($this->_smtp_conn, 515); //Email To - fputs($this->_smtp_conn, 'RCPT TO: ' . $recip . $this->_crlf); + fputs($this->_smtp_conn, 'RCPT TO: <' . $recip . '>' . $this->_crlf); $response = fgets($this->_smtp_conn, 515); //The Email -- Gitblit v1.9.1