From 61f73820621d4ea17ecde3c8d6872e6ce8f9eb12 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 28 Oct 2014 04:35:30 -0400
Subject: [PATCH] - Changed tform_actions.inc.php to always provide oldDataRecord array for updates even when dbhistory = off.
---
interface/lib/classes/ispcmail.inc.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
index 308d9df..930aabb 100644
--- a/interface/lib/classes/ispcmail.inc.php
+++ b/interface/lib/classes/ispcmail.inc.php
@@ -593,17 +593,17 @@
$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);
fgets($this->_smtp_conn, 515);
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);
--
Gitblit v1.9.1