From 086345490d50d52304e65de91adabc3931630d86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Apr 2016 14:29:07 +0200
Subject: [PATCH] Generalize the set of trackid for everyemail sent by
dolibarr.
---
htdocs/comm/propal.php | 5 +----
htdocs/commande/card.php | 5 +----
htdocs/compta/facture.php | 5 +----
htdocs/core/class/html.formmail.class.php | 2 +-
htdocs/expedition/card.php | 5 +----
htdocs/fichinter/card.php | 5 +----
htdocs/fourn/commande/card.php | 5 +----
htdocs/fourn/facture/card.php | 5 +----
htdocs/societe/soc.php | 5 +----
htdocs/supplier_proposal/card.php | 5 +----
10 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 0da36deedb3..c1754999e8b 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2421,10 +2421,7 @@ if ($action == 'create')
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='pro'.$object->id;
- }
+ $formmail->trackid='pro'.$object->id;
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';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f2d2e24d269..94b6e2ce2f2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2672,10 +2672,7 @@ if ($action == 'create' && $user->rights->commande->creer)
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='ord'.$object->id;
- }
+ $formmail->trackid='ord'.$object->id;
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';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index dd15c3a0990..73bc2bf3a7e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4141,10 +4141,7 @@ else if ($id > 0 || ! empty($ref))
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='inv'.$object->id;
- }
+ $formmail->trackid='inv'.$object->id;
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';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 9d540a37bb6..a23078a0e12 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -170,7 +170,7 @@ class FormMail extends Form
/**
* Remove a file from the list of attached files (stored in SECTION array)
*
- * @param string $keytodelete Key in file array
+ * @param string $keytodelete Key in file array (0, 1, 2, ...)
* @return void
*/
function remove_attached_files($keytodelete)
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index af973886071..8f461a2a0c0 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1886,10 +1886,7 @@ else if ($id || $ref)
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='shi'.$object->id;
- }
+ $formmail->trackid='shi'.$object->id;
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';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 08d380b0ae4..74f50f26a5b 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1860,10 +1860,7 @@ else if ($id > 0 || ! empty($ref))
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='int'.$object->id;
- }
+ $formmail->trackid='int'.$object->id;
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';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 2e7c9577bb1..bee01a45cf4 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2475,10 +2475,7 @@ elseif (! empty($object->id))
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='sor'.$object->id;
- }
+ $formmail->trackid='sor'.$object->id;
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';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index dc7695cdf01..d14dd97e6b3 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2454,10 +2454,7 @@ else
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='sin'.$object->id;
- }
+ $formmail->trackid='sin'.$object->id;
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';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 7a25b6454c0..26fcb8ac478 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -2426,10 +2426,7 @@ else
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='thi'.$object->id;
- }
+ $formmail->trackid='thi'.$object->id;
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';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5411cee24b6..36d04f559e1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1904,10 +1904,7 @@ if ($action == 'create')
$formmail->fromid = $user->id;
$formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email;
- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1)) // If bit 1 is set
- {
- $formmail->trackid='spr'.$object->id;
- }
+ $formmail->trackid='spr'.$object->id;
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';
--
GitLab