From 5ad02ccc32648360e27e4ff4b3165ba196dfc532 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Oct 2021 09:11:20 +0200
Subject: [PATCH] MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by
 defaut

---
 htdocs/core/class/conf.class.php                          | 7 ++++---
 htdocs/core/tpl/card_presend.tpl.php                      | 4 ----
 htdocs/core/tpl/massactions_pre.tpl.php                   | 4 ----
 htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php | 6 +-----
 htdocs/install/mysql/data/llx_const.sql                   | 2 +-
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 5ec3a4cfbc0..ee91d67b9ce 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -624,14 +624,15 @@ class Conf
 			if (!empty($this->global->MAILING_EMAIL_FROM)) {
 				$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
 			}
-			if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
-				$this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
-			}
 
 			if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
 				$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
 			}
 
+			if (!isset($this->global->MAIN_FIX_FOR_BUGGED_MTA)) {
+				$this->global->MAIN_FIX_FOR_BUGGED_MTA = 1;
+			}
+
 			// Format for date (used by default when not found or not searched in lang)
 			$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
 			$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 2961dea7c96..212e766589c 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -146,10 +146,6 @@ if ($action == 'presend') {
 
 
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {	// If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
 	$formmail->withfrom = 1;
 
 	// Fill list of recipient with email inside <>.
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 4d715ed8797..4d0772225c7 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -114,10 +114,6 @@ if ($massaction == 'presend') {
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) { // If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
 	if (count($listofselectedthirdparties) == 1) { // Only 1 different recipient selected, we can suggest contacts
diff --git a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
index 17c78babfea..e4990da6424 100644
--- a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
+++ b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
@@ -58,7 +58,7 @@ if ($massaction == 'presend_attendees') {
 
 	print dol_get_fiche_head(null, '', '');
 
-	// Cree l'objet formulaire mail
+	// Create form for email
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->withform = -1;
@@ -68,10 +68,6 @@ if ($massaction == 'presend_attendees') {
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) { // If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($listofselectedid));
 	$formmail->withtoreadonly = 1;
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 2f2975a158c..d7193d87a49 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -85,7 +85,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_EXP
 --
 -- Mail Mailing
 --
-insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux ike system',1);
+--insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux like system',1);
 insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','no-reply@mydomain.com','chaine','EMail emmetteur pour les envois d emailings',0);