From 32c0b4a2931e6512a19d16d6d4b4fb100bab309b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Mon, 19 Mar 2018 10:37:55 +0100 Subject: [PATCH] [Web] Add a timeout to PHPMailer [Web] Fix relayhost test with empty username --- data/web/inc/ajax/relay_check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/inc/ajax/relay_check.php b/data/web/inc/ajax/relay_check.php index 575a8ad8..320f9274 100644 --- a/data/web/inc/ajax/relay_check.php +++ b/data/web/inc/ajax/relay_check.php @@ -23,7 +23,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi $password = $relayhost_details['password']; $mail = new PHPMailer; - + $mail->Timeout = 10; $mail->SMTPDebug = 3; $mail->Debugoutput = function($str, $level) { foreach(preg_split("/((\r?\n)|(\r\n?)|\n)/", $str) as $line){ @@ -57,8 +57,8 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi $mail->SMTPAuth = true; $mail->Username = $username; $mail->Password = $password; - $mail->Port = $port; } + $mail->Port = $port; $mail->setFrom($mail_from, 'Mailer'); $mail->Subject = 'A subject for a SMTP test'; $mail->addAddress($RELAY_TO, 'Joe Null');