paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Add a timeout to PHPMailer 

[Web] Fix relayhost test with empty username
master
André Peters 2018-03-19 10:37:55 +01:00
parent d3ff84cf3f
commit 32c0b4a293
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/inc/ajax/relay_check.php
View File

@ -23,7 +23,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi
$password = $relayhost_details['password']; $password = $relayhost_details['password'];
$mail = new PHPMailer; $mail = new PHPMailer;
$mail->Timeout = 10;
$mail->SMTPDebug = 3; $mail->SMTPDebug = 3;
$mail->Debugoutput = function($str, $level) { $mail->Debugoutput = function($str, $level) {
foreach(preg_split("/((\r?\n)|(\r\n?)|\n)/", $str) as $line){ 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->SMTPAuth = true;
$mail->Username = $username; $mail->Username = $username;
$mail->Password = $password; $mail->Password = $password;
$mail->Port = $port;
} }
$mail->Port = $port;
$mail->setFrom($mail_from, 'Mailer'); $mail->setFrom($mail_from, 'Mailer');
$mail->Subject = 'A subject for a SMTP test'; $mail->Subject = 'A subject for a SMTP test';
$mail->addAddress($RELAY_TO, 'Joe Null'); $mail->addAddress($RELAY_TO, 'Joe Null');