From 354eadefa2ca8ca973715dc57314ae63650c4d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 15 Jun 2026 14:57:01 +0200 Subject: [PATCH] clean code (#38826) * clean code * clean code * clean code * clean code * clean code * clean code: remove unnecessary ExtraFields instantiations Remove 8 dead-code instantiations of ExtraFields across htdocs: - modDav: full unused block (include, new ExtraFields, 5 commented examples) - resource/agenda.php, public/project/index.php: variable never used - public/project/suggestbooth.php, suggestconference.php: require_once + variable never used - fourn/facture/agenda.php: first instantiation immediately overwritten before any use - compta/facture/card-rec.php, fourn/facture/card-rec.php: $extralabels = new ExtraFields immediately overwritten by fetch_name_optionals_label() return value Co-Authored-By: Claude Sonnet 4.6 --------- Co-authored-by: Claude Sonnet 4.6 --- htdocs/compta/facture/card-rec.php | 1 - htdocs/core/modules/modDav.class.php | 11 +---------- htdocs/fourn/facture/agenda.php | 3 +-- htdocs/fourn/facture/card-rec.php | 3 +-- htdocs/public/project/index.php | 2 -- htdocs/public/project/suggestbooth.php | 3 --- htdocs/public/project/suggestconference.php | 3 --- htdocs/resource/agenda.php | 3 +-- 8 files changed, 4 insertions(+), 25 deletions(-) diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 2068ab19825..55d75e94fb1 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -1384,7 +1384,6 @@ if ($action == 'create') { $draft = new Facture($db); $draft->fetch(GETPOSTINT('facid')); - $extralabels = new ExtraFields($db); $extralabels = $extrafields->fetch_name_optionals_label($draft->table_element); if ($draft->fetch_optionals() > 0) { $sourceInvoice->array_options = array_merge($sourceInvoice->array_options, $draft->array_options); diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php index 9863dc04f0d..7b9d3334aa7 100644 --- a/htdocs/core/modules/modDav.class.php +++ b/htdocs/core/modules/modDav.class.php @@ -1,5 +1,6 @@ + * Copyright (C) 2026 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -251,16 +252,6 @@ class modDav extends DolibarrModules */ public function init($options = '') { - // Create extrafields - include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - $extrafields = new ExtraFields($this->db); - - //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1, 3, 'thirdparty', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled'); - //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled'); - //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled'); - //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled'); - //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled'); - $sql = array(); return $this->_init($sql, $options); diff --git a/htdocs/fourn/facture/agenda.php b/htdocs/fourn/facture/agenda.php index 8faea7f4267..35f9b2c29d9 100644 --- a/htdocs/fourn/facture/agenda.php +++ b/htdocs/fourn/facture/agenda.php @@ -1,7 +1,7 @@ * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2026 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -83,7 +83,6 @@ if (!$sortorder) { // Initialize a technical objects $object = new FactureFournisseur($db); -$extrafields = new ExtraFields($db); $diroutputmassaction = getMultidirTemp($object).'/massgeneration/'.$user->id; // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php index bc12f5a30a9..77fb946b12d 100644 --- a/htdocs/fourn/facture/card-rec.php +++ b/htdocs/fourn/facture/card-rec.php @@ -8,7 +8,7 @@ * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2015-2024 Alexandre Spangaro * Copyright (C) 2016 Meziane Sof - * Copyright (C) 2017-2025 Frédéric France + * Copyright (C) 2017-2026 Frédéric France * Copyright (C) 2023-2024 Nick Fragoulis * Copyright (C) 2024-2026 MDW * @@ -1028,7 +1028,6 @@ if ($action == 'create') { $draft = new FactureFournisseur($db); $draft->fetch(GETPOSTINT('facid')); - $extralabels = new ExtraFields($db); $extralabels = $extrafields->fetch_name_optionals_label($draft->table_element); if ($draft->fetch_optionals() > 0) { $object->array_options = array_merge($object->array_options, $draft->array_options); diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php index 3255e579c22..c7d8c2844fa 100644 --- a/htdocs/public/project/index.php +++ b/htdocs/public/project/index.php @@ -98,8 +98,6 @@ if ($resultproject < 0) { $hookmanager->initHooks(array('newpayment')); -$extrafields = new ExtraFields($db); - $user->loadDefaultValues(); // Security check diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index 9387a07b638..7ad7268ac73 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -48,7 +48,6 @@ if (is_numeric($entity)) { // Load Dolibarr environment require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; @@ -108,8 +107,6 @@ $langs->loadLangs(array("main", "companies", "install", "other", "eventorganizat // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); -$extrafields = new ExtraFields($db); - $user->loadDefaultValues(); $cactioncomm = new CActionComm($db); diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 9c5a76eb032..3cda6d412e4 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -48,7 +48,6 @@ if (is_numeric($entity)) { // Load Dolibarr environment require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; @@ -108,8 +107,6 @@ $langs->loadLangs(array("main", "companies", "install", "other", "eventorganizat // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); -$extrafields = new ExtraFields($db); - $user->loadDefaultValues(); $cactioncomm = new CActionComm($db); diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php index f438977533d..84fc5fec290 100644 --- a/htdocs/resource/agenda.php +++ b/htdocs/resource/agenda.php @@ -7,7 +7,7 @@ * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2015 Marcos García * Copyright (C) 2018 Florian Henry + * Copyright (C) 2024-2026 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -86,7 +86,6 @@ if (!$sortorder) { // Initialize a technical objects -$extrafields = new ExtraFields($db); $hookmanager->initHooks(array('agendaresource')); $object = new Dolresource($db);