Happy New Year

[squirrelmail.git] / class / deliver / Deliver_SMTP.class.php

diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php
index fc61d35263b0b4b99cc75a417229672cdb7dfcc0..fe64ec997996d93142ff02369b57f7c873c51b35 100644 (file)
--- a/class/deliver/Deliver_SMTP.class.php
+++ b/class/deliver/Deliver_SMTP.class.php
@@ -5,7 +5,7 @@
  *
  * SMTP delivery backend for the Deliver class.
  *
- * @copyright 1999-2014 The SquirrelMail Project Team
+ * @copyright 1999-2018 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -62,7 +62,7 @@ class Deliver_SMTP extends Deliver {
         }
     }
 
-    function initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', $authpop=false, $pop_host='', $ssl_options=array()) {
+    function initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', $authpop=false, $pop_host='', $stream_options=array()) {
         global $use_smtp_tls,$smtp_auth_mech;
 
         if ($authpop) {
@@ -98,7 +98,7 @@ class Deliver_SMTP extends Deliver {
             if ((check_php_version(4,3)) && (extension_loaded('openssl'))) {
                 if (function_exists('stream_socket_client')) {
                     $server_address = 'ssl://' . $host . ':' . $port;
-                    $ssl_context = @stream_context_create($ssl_options);
+                    $ssl_context = @stream_context_create($stream_options);
                     $connect_timeout = ini_get('default_socket_timeout');
                     // null timeout is broken
                     if ($connect_timeout == 0)
@@ -154,6 +154,9 @@ class Deliver_SMTP extends Deliver {
         if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $helohost))
             $helohost = '[' . $helohost . ']';
 
+        $hook_result = do_hook('smtp_helo_override', $helohost);
+        if (!empty($hook_result)) $helohost = $hook_result;
+
         /* Lets introduce ourselves */
         fputs($stream, "EHLO $helohost\r\n");
         // Read ehlo response