Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New add new const to pervent sending mail to with autocopy (#26894)

Browse Source 
* New add new const to pervent sending mail to with autocopy

* to test

* fix pr to always have the check on $to, $addr_cc and addr_bcc

* remove unwanted code

* fix errors

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: hystepik <lmarcouiller@nltechno.com>
This commit is contained in:
Lucas Marcouiller
2024-02-01 15:32:11 +01:00
committed by GitHub
parent a00acaec35
commit d92a5b79b1
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/core/class/CMailFile.class.php
View File

@@ -355,6 +355,46 @@ class CMailFile
} }
} }
// Verify if $to, $addr_cc and addr_bcc have unwanted addresses
if (getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO')) {
//Verify for $to
$tabto = explode(",", $to);
$listofemailstonotsendto = explode(',', getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO'));
foreach ($tabto as $key => $addrto) {
if (in_array($addrto, $listofemailstonotsendto)) {
unset($tabto[$key]);
}
}
if (empty($tabto) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$tabto[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$to = implode(',', $tabto);
//Verify for $addr_cc
$tabcc = explode(',', $addr_cc);
foreach ($tabcc as $key => $cc) {
if (in_array($cc, $tabcc)) {
unset($tabcc[$key]);
}
}
if (empty($addr_cc) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$addr_cc[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$addr_cc = implode(',', $tabcc);
//Verify for $addr_bcc
$tabbcc = explode(',', $addr_bcc);
foreach ($tabbcc as $key => $bcc) {
if (in_array($bcc, $tabbcc)) {
unset($tabbcc[$key]);
}
}
if (empty($tabbcc) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$tabbcc[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$addr_bcc = implode(',', $tabbcc);
}
// We always use a replyto // We always use a replyto
if (empty($replyto)) { if (empty($replyto)) {
$replyto = dol_sanitizeEmail($from); $replyto = dol_sanitizeEmail($from);