Changeset:
336e9f89eb59
https://sourceforge.net/p/mrbs/hg-code/ci/336e9f89eb59178e3361594d59951e08be1d9533
Author:
John Beranek <[email protected]>
Date:
Wed Jan 18 23:38:14 2017 +0000
Log message:
Added a new option to disable "Opportunistic TLS" in PHPMailer.
diffstat:
web/functions_mail.inc | 4 ++++
web/systemdefaults.inc.php | 4 +++-
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (28 lines):
diff -r e5cec8ee77b5 -r 336e9f89eb59 web/functions_mail.inc
--- a/web/functions_mail.inc Wed Jan 18 10:04:26 2017 +0000
+++ b/web/functions_mail.inc Wed Jan 18 23:38:14 2017 +0000
@@ -1197,6 +1197,10 @@
$mail->SMTPSecure = $smtp_settings['secure'];
$mail->Username = $smtp_settings['username'];
$mail->Password = $smtp_settings['password'];
+ if ($smtp_settings['disable_opportunistic_tls'])
+ {
+ $mail->SMTPAutoTLS = false;
+ }
break;
default:
$mail->isMail();
diff -r e5cec8ee77b5 -r 336e9f89eb59 web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Wed Jan 18 10:04:26 2017 +0000
+++ b/web/systemdefaults.inc.php Wed Jan 18 23:38:14 2017 +0000
@@ -1079,7 +1079,9 @@
$smtp_settings['secure'] = 'tls'; // Encryption method: '', 'tls' or 'ssl'
$smtp_settings['username'] = ''; // Username (if using authentication)
$smtp_settings['password'] = ''; // Password (if using authentication)
-
+$smtp_settings['disable_opportunistic_tls'] = false; // Set this to true to
disable
+ // opportunistic TLS
+ //
https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting#opportunistic-tls
// EMAIL - MISCELLANEOUS
// ---------------------
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
