diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php index c691e1e0911..dcc12b402d5 100644 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2012 Regis Houssin * Copyright (C) 2013 Florian Henry - * Copyright (C) 2024 Frédéric France + * 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 @@ -29,21 +29,19 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; // Load translation files required by the page $langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php index 1585c82c14e..98523598c60 100644 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2012 Regis Houssin * Copyright (C) 2013 Florian Henry - * Copyright (C) 2024 Frédéric France + * 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 @@ -29,21 +29,20 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; - /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; + // Load translation files required by the page $langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); -$extrafields = new ExtraFields($db); $form = new Form($db); // List of supported format diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php index fee677a1a3d..adfc0238179 100644 --- a/htdocs/fichinter/agenda.php +++ b/htdocs/fichinter/agenda.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2025 MDW * Copyright (C) 2026 Alexandre Spangaro * @@ -27,6 +27,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -79,9 +80,8 @@ if (!$sortorder) { // Initialize a technical objects $object = new Fichinter($db); -$extrafields = new ExtraFields($db); -$hookmanager->initHooks(array('myobjectagenda', 'globalcard')); // Note that conf->hooks_modules contains array +$hookmanager->initHooks(array('fichinteragenda', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); @@ -92,8 +92,8 @@ $permissiontoread = $user->hasRight("fichinter", "lire"); $permissiontoadd = $user->hasRight("fichinter", "creer"); // Security check -if (!empty($user->socid)) { - $socid = $user->socid; +if ($user->isExternalUser()) { + $socid = $user->isExternalUser(); } $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); restrictedArea($user, 'ficheinter', $object->id, 'fichinter', '', 'fk_soc', 'rowid', $isdraft); diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index ef542562478..c512c8fc511 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -8,7 +8,7 @@ * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2016-2026 Charlene Benke - * Copyright (C) 2018-2025 Frédéric France + * Copyright (C) 2018-2026 Frédéric France * Copyright (C) 2024 William Mead * Copyright (C) 2024-2026 MDW * @@ -34,6 +34,14 @@ // Load Dolibarr environment require '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var ExtraFields $extrafields + * @var HookManager $hookmanager + * @var Translate $langs + * @var User $user + */ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinterrec.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; @@ -49,13 +57,6 @@ if (isModEnabled('contract')) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcontract.class.php'; } -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ // Load translation files required by the page $langs->loadLangs(array("interventions", "admin", "compta", "bills")); @@ -68,8 +69,8 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel'); $backtopage = GETPOST('backtopage', 'alpha'); $socid = GETPOSTINT('socid'); -if ($user->socid) { - $socid = $user->socid; +if ($user->isExternalUser()) { + $socid = $user->isExternalUser(); } $objecttype = 'fichinter_rec'; if ($action == "create" || $action == "add") { @@ -101,7 +102,6 @@ if ($sortfield == "") { } $object = new FichinterRec($db); -$extrafields = new ExtraFields($db); $arrayfields = array( 'f.title' => array('label' => "Ref", 'checked' => 1), diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 5c06dd94169..6efd589c8db 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -8,7 +8,7 @@ * Copyright (C) 2014-2026 Charlene Benke * Copyright (C) 2015-2016 Abbes Bahfir * Copyright (C) 2018-2022 Philippe Grand - * Copyright (C) 2020-2025 Frédéric France + * Copyright (C) 2020-2026 Frédéric France * Copyright (C) 2023 Benjamin Grembi * Copyright (C) 2023-2024 William Mead * Copyright (C) 2024-2026 MDW @@ -40,6 +40,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -64,7 +65,6 @@ if (isModEnabled('category')) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; } require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; // Load translation files required by the page $langs->loadLangs(array('bills', 'companies', 'interventions', 'stocks')); @@ -94,10 +94,10 @@ $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalStri $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0)); // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context -$hookmanager->initHooks(array('interventioncard', 'globalcard')); +$hookmanager->initHooks(array('fichintercard', 'interventioncard', 'globalcard')); $object = new Fichinter($db); -$extrafields = new ExtraFields($db); + $objectsrc = null; $extrafields->fetch_name_optionals_label($object->table_element); @@ -114,8 +114,8 @@ if ($id > 0 || !empty($ref)) { } // Security check -if ($user->socid) { - $socid = $user->socid; +if ($user->isExternalUser()) { + $socid = $user->isExternalUser(); } $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 49b9aa82a59..d1436f49658 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007-2009 Laurent Destailleur * Copyright (C) 2012 Juanjo Menent - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2025 MDW * Copyright (C) 2026 Alexandre Spangaro * @@ -31,6 +31,7 @@ require '../main.inc.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -50,8 +51,8 @@ $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); // Security check -if ($user->socid) { - $socid = $user->socid; +if ($user->isExternalUser()) { + $socid = $user->isExternalUser(); } $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 6b2c5cbb492..ab8d1f3186d 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -7,7 +7,7 @@ * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2024-2025 Frédéric France + * Copyright (C) 2024-2026 Frédéric France * Copyright (C) 2025 MDW * Copyright (C) 2026 Alexandre Spangaro * @@ -58,8 +58,8 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); // Security check -if ($user->socid) { - $socid = $user->socid; +if ($user->isExternalUser()) { + $socid = $user->isExternalUser(); } $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 9486d63c551..c61841b6113 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015-2025 Charlene Benke * Copyright (C) 2019 Nicolas ZABOURI - * Copyright (C) 2024-2025 Frédéric France + * 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 @@ -28,12 +28,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; -require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; -require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -41,6 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + if (!$user->hasRight('ficheinter', 'lire')) { accessforbidden(); @@ -55,9 +55,9 @@ $hookmanager->initHooks(array('interventionindex')); // Security check $socid = GETPOSTINT('socid'); -if ($user->socid > 0) { +if ($user->isExternalUser()) { $action = ''; - $socid = $user->socid; + $socid = $user->isExternalUser(); } // Load $resultboxes diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 6c750f0d6b0..169ea81a238 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -6,7 +6,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2021-2024 Frédéric France + * Copyright (C) 2021-2026 Frédéric France * Copyright (C) 2022-2026 Charlène Benke * Copyright (C) 2024 William Mead * Copyright (C) 2024-2025 MDW @@ -34,6 +34,14 @@ // Load Dolibarr environment require '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var ExtraFields $extrafields + * @var HookManager $hookmanager + * @var Translate $langs + * @var User $user + */ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; @@ -49,13 +57,6 @@ if (isModEnabled('contract')) { require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; } -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ // Load translation files required by the page $langs->loadLangs(array('companies', 'bills', 'interventions')); @@ -140,8 +141,6 @@ if (!$sortfield) { $object = new Fichinter($db); $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes -$extrafields = new ExtraFields($db); - // Fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element);