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

Fix case

Browse source
This commit is contained in:
Laurent Destailleur 2026-01-10 17:28:44 +01:00
parent da20d5100a
commit 0c49c8298e
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,8 +231,8 @@ class CMailFile
{
global $conf, $dolibarr_main_data_root, $user;
dol_syslog("CMailFile::CMailfile: charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext");
dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
dol_syslog("CMailFile::CMailFile: charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext");
dol_syslog("CMailFile::CMailFile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
// Clean values of $mimefilename_list
@ -288,12 +288,12 @@ class CMailFile
$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), '3'); // Force md5 hash (does not contain special chars)
if (empty($subject)) {
dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
dol_syslog("CMailFile::CMailFile: Try to send an email with empty subject");
$this->error = 'ErrorSubjectIsRequired';
return;
}
if (empty($msg)) {
dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
dol_syslog("CMailFile::CMailFile: Try to send an email with empty body");
$msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)
}
@ -320,7 +320,7 @@ class CMailFile
if (getDolGlobalString('MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML')) {
$this->msgishtml = 1; // To force to send everything with content type html.
}
dol_syslog("CMailFile::CMailfile: msgishtml=".$this->msgishtml, LOG_DEBUG);
dol_syslog("CMailFile::CMailFile: msgishtml=".$this->msgishtml, LOG_DEBUG);
// Detect images
if ($this->msgishtml) {
@ -338,7 +338,7 @@ class CMailFile
}
$findimg = $this->findHtmlImages($dolibarr_main_data_root_images.'/medias');
if ($findimg < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
dol_syslog("CMailFile::CMailFile: Error on findHtmlImages");
$this->error = 'ErrorInAddAttachmentsImageBaseOnMedia';
return;
}
@ -350,7 +350,7 @@ class CMailFile
// It modifies ->html and complete ->html_images
$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
if ($resultImageData < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
dol_syslog("CMailFile::CMailFile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
$this->error = 'ErrorInAddAttachmentsImageBaseIsSrcData';
return;
}
@ -375,7 +375,7 @@ class CMailFile
// We complete the array of cid_list
$cid_list[$posindice] = $this->html_images[$i]['cid'];
}
dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
dol_syslog("CMailFile::CMailFile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
}
}
}
@ -388,7 +388,7 @@ class CMailFile
foreach ($filename_list as $i => $val) {
if ($filename_list[$i]) {
$this->atleastonefile = 1;
dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i]." cid_list[$i]=".(empty($cid_list[$i]) ? '' : $cid_list[$i]), LOG_DEBUG);
dol_syslog("CMailFile::CMailFile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i]." cid_list[$i]=".(empty($cid_list[$i]) ? '' : $cid_list[$i]), LOG_DEBUG);
}
}
}
@ -513,7 +513,7 @@ class CMailFile
}
}
dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." addr_bcc=$addr_bcc, replyto=$replyto", LOG_DEBUG);
dol_syslog("CMailFile::CMailFile: sendmode=".$this->sendmode." addr_bcc=$addr_bcc, replyto=$replyto", LOG_DEBUG);
// We set all data according to chose sending method.
// We also set a value for ->msgid
@ -2043,7 +2043,7 @@ class CMailFile
/**
* Search images into html message and init array this->images_encoded if found
* This is called in the CMailfile constructor but only if MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS is set (Off by default)
* This is called in the CMailFile constructor but only if MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS is set (Off by default)
*
* @param string $images_dir Path to store physical images files. For example $dolibarr_main_data_root.'/medias'
* @return int >0 if OK, <0 if KO
@ -2131,7 +2131,7 @@ class CMailFile
/**
* Search images with src="data:image..." format into html message.
* If we find some, we create them on disk.
* This is called in the CMailfile constructor.
* This is called in the CMailFile constructor.
*
* @param string $images_dir Location of where to store physically images files. For example $dolibarr_main_data_root.'/medias'
* @return int >0 if OK, <0 if KO

4
htdocs/core/lib/functions.lib.php
View file

@ -4402,7 +4402,7 @@ function dol_print_email($email, $contactid = 0, $socid = 0, $addlink = 0, $max
}
$newemail .= '</a>';
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailfile.class.php';
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$emailonly = CMailFile::getValidAddress($email, 2);
if ($showinvalid && !isValidEmail($emailonly)) {
$langs->load("errors");
@ -4434,7 +4434,7 @@ 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';
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$emailonly = CMailFile::getValidAddress($email, 2);
if ($showinvalid && !isValidEmail($emailonly)) {
$langs->load("errors");