From 5c658438899cd488d3ce140caef1dfc6ce0b6103 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Mon, 14 Apr 2014 14:26:50 +0200 Subject: [PATCH] Fixed: FS#3431 - Systemmails via google's SMTP not working --- interface/lib/classes/ispcmail.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php index 308d9dfd2..930aabbca 100644 --- a/interface/lib/classes/ispcmail.inc.php +++ b/interface/lib/classes/ispcmail.inc.php @@ -593,6 +593,11 @@ class ispcmail { $response = fgets($this->_smtp_conn, 515); if(empty($this->_smtp_conn)) return false; + //Say Hello to SMTP + if($this->smtp_helo == '') $this->detectHelo(); + fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf); + $response = fgets($this->_smtp_conn, 515); + // ENCRYPTED? if($this->smtp_crypt == 'tls') { fputs($this->_smtp_conn, 'STARTTLS' . $this->_crlf); @@ -600,11 +605,6 @@ class ispcmail { stream_socket_enable_crypto($this->_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT); } - //Say Hello to SMTP - if($this->smtp_helo == '') $this->detectHelo(); - fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf); - $response = fgets($this->_smtp_conn, 515); - //AUTH LOGIN fputs($this->_smtp_conn, 'AUTH LOGIN' . $this->_crlf); $response = fgets($this->_smtp_conn, 515); -- GitLab