From fd3ec20f364790fddd7ddf5497aa86d5d97b5d6c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Apr 2023 03:57:10 +0200 Subject: [PATCH] Update qodana rules --- htdocs/admin/emailcollector_card.php | 14 ++--- htdocs/core/class/html.form.class.php | 62 +++++++++---------- htdocs/core/class/html.formfile.class.php | 54 ++++++++-------- htdocs/core/class/ldap.class.php | 3 + htdocs/core/js/lib_head.js.php | 12 ++-- htdocs/don/class/don.class.php | 9 +++ .../fourn/class/fournisseur.facture.class.php | 6 ++ qodana.yaml | 10 +++ 8 files changed, 99 insertions(+), 71 deletions(-) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 98a4eec28fb..452ae74d614 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -149,7 +149,7 @@ if (GETPOST('addfilter', 'alpha')) { if ($result > 0) { $object->fetchFilters(); } else { - setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors'); + setEventMessages($emailcollectorfilter->error, $emailcollectorfilter->errors, 'errors'); } } @@ -161,7 +161,7 @@ if ($action == 'deletefilter') { if ($result > 0) { $object->fetchFilters(); } else { - setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors'); + setEventMessages($emailcollectorfilter->error, $emailcollectorfilter->errors, 'errors'); } } } @@ -192,7 +192,7 @@ if (GETPOST('addoperation', 'alpha')) { $object->fetchActions(); } else { $error++; - setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); + setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors'); } } } @@ -216,7 +216,7 @@ if ($action == 'updateoperation') { $object->fetchActions(); } else { $error++; - setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); + setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors'); } } } @@ -228,7 +228,7 @@ if ($action == 'deleteoperation') { if ($result > 0) { $object->fetchActions(); } else { - setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors'); + setEventMessages($emailcollectoroperation->error, $emailcollectoroperation->errors, 'errors'); } } } @@ -242,7 +242,7 @@ if ($action == 'collecttest') { setEventMessages($object->lastresult, null, 'mesgs'); } else { $debuginfo = $object->debuginfo; - setEventMessages($object->error, null, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } $action = ''; @@ -257,7 +257,7 @@ if ($action == 'confirm_collect') { setEventMessages($object->lastresult, null, 'mesgs'); } else { $debuginfo = $object->debuginfo; - setEventMessages($object->error, null, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } $action = ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index db1265ab846..13779fb64da 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5529,19 +5529,19 @@ class Form // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Show a form to select a project + * Show a form to select a project * - * @param int $page Page - * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id) - * @param int $selected Id pre-selected project - * @param string $htmlname Name of select field - * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable) - * @param int $maxlength Max length - * @param int $forcefocus Force focus on field (works with javascript only) - * @param int $nooutput No print is done. String is returned. - * @param string $textifnoproject Text to show if no project - * @param string $morecss More CSS - * @return string Return html content + * @param int $page Page + * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id) + * @param int $selected Id pre-selected project + * @param string $htmlname Name of select field + * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable) + * @param int $maxlength Max length + * @param int $forcefocus Force focus on field (works with javascript only) + * @param int $nooutput No print is done. String is returned. + * @param string $textifnoproject Text to show if no project + * @param string $morecss More CSS + * @return string Return html content */ public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0, $textifnoproject = '', $morecss = '') { @@ -5585,19 +5585,19 @@ class Form // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Show a form to select payment conditions + * Show a form to select payment conditions * - * @param int $page Page - * @param string $selected Id condition pre-selectionne - * @param string $htmlname Name of select html field - * @param int $addempty Add empty entry - * @param string $type Type ('direct-debit' or 'bank-transfer') - * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates) - * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters) - * 0 : use default deposit percentage from entry - * > 0 : force deposit percentage (for example, from company object) - * @param int $nooutput No print is done. String is returned. - * @return string HTML output or '' + * @param int $page Page + * @param string $selected Id condition pre-selectionne + * @param string $htmlname Name of select html field + * @param int $addempty Add empty entry + * @param string $type Type ('direct-debit' or 'bank-transfer') + * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates) + * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters) + * 0 : use default deposit percentage from entry + * > 0 : force deposit percentage (for example, from company object) + * @param int $nooutput No print is done. String is returned. + * @return string HTML output or '' */ public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '', $filtertype = -1, $deposit_percent = -1, $nooutput = 0) { @@ -5648,11 +5648,11 @@ class Form /** * Show a form to select a delivery delay * - * @param int $page Page - * @param string $selected Id condition pre-selectionne - * @param string $htmlname Name of select html field - * @param int $addempty Ajoute entree vide - * @return void + * @param int $page Page + * @param string $selected Id condition pre-selectionne + * @param string $htmlname Name of select html field + * @param int $addempty Add an empty entry + * @return void */ public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0) { @@ -8375,7 +8375,7 @@ class Form placeholder: "' . dol_escape_js($placeholder) . '", escapeMarkup: function (markup) { return markup; }, // let our custom formatter work minimumInputLength: ' . ((int) $minimumInputLength) . ', - formatResult: function(result, container, query, escapeMarkup) { + formatResult: function (result, container, query, escapeMarkup) { return escapeMarkup(result.text); }, }); @@ -8464,7 +8464,7 @@ class Form placeholder: "' . dol_escape_js($placeholder) . '", escapeMarkup: function (markup) { return markup; }, // let our custom formatter work minimumInputLength: ' . $minimumInputLength . ', - formatResult: function(result, container, query, escapeMarkup) { + formatResult: function (result, container, query, escapeMarkup) { return escapeMarkup(result.text); }, matcher: function (params, data) { diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index b9c4239d4dc..b60e26d2931 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1103,33 +1103,33 @@ class FormFile * Show list of documents in $filearray (may be they are all in same directory but may not) * This also sync database if $upload_dir is defined. * - * @param array $filearray Array of files loaded by dol_dir_list('files') function before calling this. - * @param Object $object Object on which document is linked to. - * @param string $modulepart Value for modulepart used by download or viewimage wrapper. - * @param string $param Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd) - * @param int $forcedownload Force to open dialog box "Save As" when clicking on file. - * @param string $relativepath Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT. - * @param int $permonobject Permission on object (so permission to delete or crop document) - * @param int $useinecm Change output for use in ecm module: - * 0 or 6: Add a preview column. Show also a rename button. Show also a crop button for some values of $modulepart (must be supported into hard coded list in this function + photos_resize.php + restrictedArea + checkUserAccessToObject) - * 1: Add link to edit ECM entry - * 2: Add rename and crop link - * 4: Add a preview column - * 5: Add link to edit ECM entry and Add a preview column - * @param string $textifempty Text to show if filearray is empty ('NoFileFound' if not defined) - * @param int $maxlength Maximum length of file name shown. - * @param string $title Title before list. Use 'none' to disable title. - * @param string $url Full url to use for click links ('' = autodetect) - * @param int $showrelpart 0=Show only filename (default), 1=Show first level 1 dir - * @param int $permtoeditline Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more) - * @param string $upload_dir Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes. - * @param string $sortfield Sort field ('name', 'size', 'position', ...) - * @param string $sortorder Sort order ('ASC' or 'DESC') - * @param int $disablemove 1=Disable move button, 0=Position move is possible. - * @param int $addfilterfields Add the line with filters - * @param int $disablecrop Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1) - * @param string $moreattrondiv More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"' - * @return int <0 if KO, nb of files shown if OK + * @param array $filearray Array of files loaded by dol_dir_list('files') function before calling this. + * @param Object|null $object Object on which document is linked to. + * @param string $modulepart Value for modulepart used by download or viewimage wrapper. + * @param string $param Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd) + * @param int $forcedownload Force to open dialog box "Save As" when clicking on file. + * @param string $relativepath Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT. + * @param int $permonobject Permission on object (so permission to delete or crop document) + * @param int $useinecm Change output for use in ecm module: + * 0 or 6: Add a preview column. Show also a rename button. Show also a crop button for some values of $modulepart (must be supported into hard coded list in this function + photos_resize.php + restrictedArea + checkUserAccessToObject) + * 1: Add link to edit ECM entry + * 2: Add rename and crop link + * 4: Add a preview column + * 5: Add link to edit ECM entry and Add a preview column + * @param string $textifempty Text to show if filearray is empty ('NoFileFound' if not defined) + * @param int $maxlength Maximum length of file name shown. + * @param string $title Title before list. Use 'none' to disable title. + * @param string $url Full url to use for click links ('' = autodetect) + * @param int $showrelpart 0=Show only filename (default), 1=Show first level 1 dir + * @param int $permtoeditline Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more) + * @param string $upload_dir Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes. + * @param string $sortfield Sort field ('name', 'size', 'position', ...) + * @param string $sortorder Sort order ('ASC' or 'DESC') + * @param int $disablemove 1=Disable move button, 0=Position move is possible. + * @param int $addfilterfields Add the line with filters + * @param int $disablecrop Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1) + * @param string $moreattrondiv More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"' + * @return int <0 if KO, nb of files shown if OK * @see list_of_autoecmfiles() */ public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1, $moreattrondiv = '') diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index e9b2ac88039..35148729295 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -69,6 +69,9 @@ class Ldap * Server DN */ public $domain; + + public $domainFQDN; + /** * User administrateur Ldap * Active Directory ne supporte pas les connexions anonymes diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index 96ae839a9cd..2e552ea605e 100644 --- a/htdocs/core/js/lib_head.js.php +++ b/htdocs/core/js/lib_head.js.php @@ -1147,9 +1147,9 @@ function dolroundjs(number, decimals) { return +(Math.round(number + "e+" + deci * */ function pricejs(amount, mode = 'MT', currency_code = '', force_locale = '') { - var main_max_dec_shown = global->MAIN_MAX_DECIMALS_SHOWN); ?>; - var main_rounding_unit = global->MAIN_MAX_DECIMALS_UNIT; ?>; - var main_rounding_tot = global->MAIN_MAX_DECIMALS_TOT; ?>; + var main_max_dec_shown = ; + var main_rounding_unit = ; + var main_rounding_tot = ; var main_decimal_separator = ; var main_thousand_separator = ; var locale_code = force_locale || defaultlang) ?>; @@ -1225,9 +1225,9 @@ function price2numjs(amount) { var dec = ; var thousand = ; - var main_max_dec_shown = global->MAIN_MAX_DECIMALS_SHOWN); ?>; - var main_rounding_unit = global->MAIN_MAX_DECIMALS_UNIT; ?>; - var main_rounding_tot = global->MAIN_MAX_DECIMALS_TOT; ?>; + var main_max_dec_shown = ; + var main_rounding_unit = ; + var main_rounding_tot = ; var amount = amount.toString(); diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 1f7f29cbf92..2a47767af54 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -68,6 +68,9 @@ class Don extends CommonObject */ public $date; + public $datec; + public $datem; + /** * amount of donation * @var double @@ -104,6 +107,9 @@ class Don extends CommonObject */ public $email; + public $phone; + public $phone_mobile; + /** * @var int 0 or 1 */ @@ -127,6 +133,9 @@ class Don extends CommonObject */ public $modepaymentid = 0; + public $paid; + + /** * @var array Array of status label */ diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 3f01ef0f327..ae9ee280d04 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3494,6 +3494,12 @@ class SupplierInvoiceLine extends CommonObjectLine */ public $remise_percent; + /** + * Buying price value + * @var float + */ + public $pa_ht; + /** * Total amount without taxes * @var float diff --git a/qodana.yaml b/qodana.yaml index 880af166f62..decf09db779 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -93,4 +93,14 @@ exclude: - name: PhpRedundantVariableDocTypeInspection - name: PhpUnhandledExceptionInspection - name: JSIgnoredPromiseFromCall + - name: DuplicatedCode + - name: BadExpressionStatementJS + - name: PhpRedundantCatchClauseInspection + - name: PhpIssetCanCheckNestedAccessDirectlyInspection + - name: JSEqualityComparisonWithCoercion + - name: JSUnusedAssignment + - name: JSHint + - name: ReservedWordUsedAsNameJS + - name: JSUnusedLocalSymbols + \ No newline at end of file