Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2024-04-04 11:01:06 +02:00
commit 0a39067cd6
3 changed files with 11 additions and 7 deletions

View file

@ -1020,6 +1020,8 @@ ErrorFeatureNeedJavascript
ErrorFicheinterCompanyDoesNotExist
ErrorFieldMustHaveXChar
ErrorFileAlreadyExists
ErrorInAddAttachmentsImageBaseIsSrcData
ErrorInAddAttachmentsImageBaseOnMedia
ErrorInvalidSubtype
ErrorInvoiceLoadThirdParty
ErrorInvoiceLoadThirdPartyKey

View file

@ -2,11 +2,11 @@
/**
* Copyright (C) Dan Potter
* Copyright (C) Eric Seigne
* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -297,7 +297,7 @@ class CMailFile
$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
if ($findimg < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
$this->error = 'ErrorInAddAttachmentsImageBaseOnMedia';
return;
}
}
@ -308,7 +308,7 @@ class CMailFile
$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
if ($resultImageData < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
$this->error = 'ErrorInAddAttachmentsImageBaseIsSrcData';
return;
}
$findimg += $resultImageData;

View file

@ -55,6 +55,8 @@ ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (exam
ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
ErrorFieldsRequired=Some required fields have been left blank.
ErrorSubjectIsRequired=The email subject is required
ErrorInAddAttachmentsImageBaseOnMedia=Error in add attachments image base in on media
ErrorInAddAttachmentsImageBaseIsSrcData=Error in add attachments image base source is in data
ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
ErrorNoMailDefinedForThisUser=No mail defined for this user
ErrorSetupOfEmailsNotComplete=Setup of emails is not complete