vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE send protection (#28091)

Browse source 
* Fix autocopy send protection

* fix verification to replace mail in maillist

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
This commit is contained in:
Lucas Marcouiller 2024-02-09 16:54:28 +01:00 committed by GitHub
parent fac22fd16f
commit 0a7ae2a139
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/core/class/CMailFile.class.php
View file

@ -358,38 +358,44 @@ class CMailFile
// Verify if $to, $addr_cc and addr_bcc have unwanted addresses
if (getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO')) {
//Verify for $to
$replaceto = false;
$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]);
$replaceto = true;
}
}
if (empty($tabto) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
if ($replaceto && getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$tabto[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$to = implode(',', $tabto);
//Verify for $addr_cc
$replacecc = false;
$tabcc = explode(',', $addr_cc);
foreach ($tabcc as $key => $cc) {
if (in_array($cc, $tabcc)) {
unset($tabcc[$key]);
$replacecc = true;
}
}
if (empty($addr_cc) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$addr_cc[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
if ($replacecc && getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$tabcc[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$addr_cc = implode(',', $tabcc);
//Verify for $addr_bcc
$replacebcc= false;
$tabbcc = explode(',', $addr_bcc);
foreach ($tabbcc as $key => $bcc) {
if (in_array($bcc, $tabbcc)) {
unset($tabbcc[$key]);
$replacebcc = true;
}
}
if (empty($tabbcc) && !getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
if ($replacebcc && getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE')) {
$tabbcc[] = getDolGlobalString('MAIN_MAIL_FORCE_NOT_SENDING_TO_REPLACE');
}
$addr_bcc = implode(',', $tabbcc);