From c349d3889793a7b312d906eeafb5c372e25ee78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 3 Apr 2024 14:46:46 +0200 Subject: [PATCH 1/2] add translations of errors --- dev/translation/dynamic_translation_keys.lst | 2 ++ htdocs/core/class/CMailFile.class.php | 14 +++++++------- htdocs/langs/en_US/errors.lang | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst index 41220044fe9..cea77bc9ea9 100644 --- a/dev/translation/dynamic_translation_keys.lst +++ b/dev/translation/dynamic_translation_keys.lst @@ -1019,6 +1019,8 @@ ErrorFeatureNeedJavascript ErrorFicheinterCompanyDoesNotExist ErrorFieldMustHaveXChar ErrorFileAlreadyExists +ErrorInAddAttachmentsImageBaseIsSrcData +ErrorInAddAttachmentsImageBaseOnMedia ErrorInvalidSubtype ErrorInvoiceLoadThirdParty ErrorInvoiceLoadThirdPartyKey diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 9d73998e151..8c565e1602f 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -2,11 +2,11 @@ /** * Copyright (C) Dan Potter * Copyright (C) Eric Seigne - * Copyright (C) 2000-2005 Rodolphe Quiedeville - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2019-2023 Frédéric France + * Copyright (C) 2000-2005 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2019-2024 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -283,7 +283,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; } } @@ -294,7 +294,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; diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index d8ebfa352e5..0c5881caf05 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -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 safe_mode 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 From 6bf4b28d46dbb22da5a104ad1e8667e864af4487 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 3 Apr 2024 19:32:46 +0200 Subject: [PATCH 2/2] FIX phan error function isModEnabled can have value "proposal" --- htdocs/comm/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index dca5587bfbb..7039a97a59e 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -710,7 +710,7 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) { * Last modified proposals */ -if (isModEnabled('proposal')) { +if (isModEnabled('propal')) { $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut as status, date_cloture as datec, c.tms as datem,"; $sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta"; $sql .= " FROM ".MAIN_DB_PREFIX."propal as c,";