lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CMailFile.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2020-07-06 12:01:00 +02:00 committed by GitHub
parent 2f04b4c559
commit 42917000a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,14 +401,10 @@ class CMailFile
$regexp = '/([a-z0-9_\.\-\+])+\@(([a-z0-9\-])+\.)+([a-z0-9]{2,4})+/i'; // This regular expression extracts all emails from a string $regexp = '/([a-z0-9_\.\-\+])+\@(([a-z0-9\-])+\.)+([a-z0-9]{2,4})+/i'; // This regular expression extracts all emails from a string
$emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom); $emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom);
$adressEmailFrom = reset($adressEmailFrom); $adressEmailFrom = reset($adressEmailFrom);
if($emailMatchs !== false if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom)
&& filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL)
&& $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom)
{ {
$result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID); $result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);
} } else {
else
{
$result = $this->message->setFrom($this->getArrayAddress($from)); $result = $this->message->setFrom($this->getArrayAddress($from));
} }
} else { } else {