Add config option for TLS

config.inc.php

@@ -171,6 +171,9 @@ $CONF['smtp_port'] = '25';
 // Used in the HELO when sending emails from Postfix Admin
 $CONF['smtp_client'] = '';
 
+// Set 'YES' to use TLS when sending emails.
+$CONF['smtp_sendmail_tls'] = 'NO';
+
 // Encrypt
 // In what way do you want the passwords to be crypted?
 // md5crypt = internal postfix admin md5

functions.inc.php

@@ -1398,12 +1398,15 @@ function smtp_mail($to, $from, $data, $password = "", $body = "") {
         return false;
     } else {
         smtp_get_response($fh);
-        fputs($fh, "STARTTLS\r\n");
-        smtp_get_response($fh);
 
-        stream_set_blocking ($fh, true);
+        if (Config::read_string('smtp_sendmail_tls') === 'YES') {
-        stream_socket_enable_crypto($fh, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
+            fputs($fh, "STARTTLS\r\n");
-        stream_set_blocking ($fh, true);
+            smtp_get_response($fh);
+
+            stream_set_blocking ($fh, true);
+            stream_socket_enable_crypto($fh, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
+            stream_set_blocking ($fh, true);
+        }
 
         fputs($fh, "EHLO $smtp_server\r\n");
         smtp_get_response($fh);