From 536ab9520745218532e7bdb901750a1eb3c26a17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Apr 2020 00:29:34 +0200
Subject: [PATCH] FIX: The "test smtp connectivity" failed on page to setup
 mass emailing

Conflicts:
	htdocs/admin/mails.php
---
 htdocs/admin/mails.php          | 5 +++--
 htdocs/admin/mails_emailing.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index dd67b138da5..d41cb687446 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -99,6 +99,7 @@ $trigger_name='';       // Disable triggers
 $paramname='id';
 $mode='emailfortest';
 $trackid=(($action == 'testhtml')?"testhtml":"test");
+$sendcontext='';
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'test')       $action='test';
@@ -791,8 +792,8 @@ else
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mail = new CMailFile('', '', '', '');
-		$result=$mail->check_server_port($server, $port);
+		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
+		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
 		else
 		{
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 12076a00579..5a15be94bc4 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -536,8 +536,9 @@ else
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mail = new CMailFile('', '', '', '');
-		$result=$mail->check_server_port($server, $port);
+		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
+
+		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
 		else
 		{