From 9dee6b56af9bc16a4c10912175c885c99c440687 Mon Sep 17 00:00:00 2001 From: moreauftheobald Date: Fri, 15 Nov 2024 23:02:26 +0100 Subject: [PATCH] Tracking conf->module->enabled 3 (#31905) * Tracking $conf->module->enabled part 2 * Tracking $conf->module->enabled part 3 * Tracking $conf->module->enabled part 3 --------- Co-authored-by: Theobald --- htdocs/core/lib/propal.lib.php | 2 +- htdocs/core/modules/modAsset.class.php | 2 +- htdocs/core/modules/modCollab.class.php | 2 +- htdocs/core/modules/modDataPolicy.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index 153d8e70292..40d98c78ec8 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -43,7 +43,7 @@ function propal_prepare_head($object) $head[$h][2] = 'comm'; $h++; - if ((empty($conf->commande->enabled) && ((isModEnabled("shipping") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire')) + if ((!isModEnabled('order') && ((isModEnabled("shipping") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) { $langs->load("sendings"); $text = ''; diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php index c63dd61e9f5..62d50a2989b 100644 --- a/htdocs/core/modules/modAsset.class.php +++ b/htdocs/core/modules/modAsset.class.php @@ -114,7 +114,7 @@ class modAsset extends DolibarrModules ); - if (!isset($conf->asset) || !isset($conf->asset->enabled)) { + if (!isModEnabled('asset')) { $conf->asset = new stdClass(); $conf->asset->enabled = 0; } diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php index 69599413fcc..a1cc97699c0 100644 --- a/htdocs/core/modules/modCollab.class.php +++ b/htdocs/core/modules/modCollab.class.php @@ -118,7 +118,7 @@ class modCollab extends DolibarrModules 'url' => '/collab/index.php', 'langs' => 'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position' => 100, - 'enabled' => '$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'enabled' => 'isModEnabled("collab")', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. 'perms' => '1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules 'target' => '', 'user' => 2 // 0=Menu for internal users, 1=external users, 2=both diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php index 82e88f06792..d147af6d037 100644 --- a/htdocs/core/modules/modDataPolicy.class.php +++ b/htdocs/core/modules/modDataPolicy.class.php @@ -129,7 +129,7 @@ class modDataPolicy extends DolibarrModules 'fr_FR:ParentCompany'=>'Maison mère ou revendeur' ) */ - if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) { + if (!isModEnabled('datapolicy')) { $conf->datapolicy = new stdClass(); $conf->datapolicy->enabled = 0; }