Debug v23
This commit is contained in:
parent
a56645784c
commit
544f4971bc
1 changed files with 11 additions and 8 deletions
|
|
@ -4434,14 +4434,17 @@ function dol_print_email($email, $contactid = 0, $socid = 0, $addlink = 0, $max
|
|||
} else {
|
||||
$newemail = ($withpicto ? img_picto($langs->trans("EMail") . ' : ' . $email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '') . $newemail;
|
||||
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
||||
$emailonly = CMailFile::getValidAddress($email, 2);
|
||||
if ($showinvalid && !isValidEmail($emailonly)) {
|
||||
$langs->load("errors");
|
||||
$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email));
|
||||
} elseif ($showinvalid && !isValidMailDomain($emailonly)) {
|
||||
$langs->load("errors");
|
||||
$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly));
|
||||
if ($showinvalid) {
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
$emailonly = CMailFile::getValidAddress($email, 2);
|
||||
if (!isValidEmail($emailonly)) {
|
||||
$langs->load("errors");
|
||||
$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email));
|
||||
} elseif (!isValidMailDomain($emailonly)) {
|
||||
$langs->load("errors");
|
||||
$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue