From e0fd1bdd3e5e5d01f359ffa2fa2c3315f10467fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 29 Sep 2025 20:41:32 +0200 Subject: [PATCH] clean code (#35545) --- htdocs/core/modules/modECM.class.php | 19 ++++++++++--------- htdocs/ecm/dir_card.php | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php index 5932f24509c..06a5d85b145 100644 --- a/htdocs/core/modules/modECM.class.php +++ b/htdocs/core/modules/modECM.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2004-2020 Laurent Destailleur * Copyright (C) 2024 MDW + * Copyright (C) 2025 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 @@ -128,7 +129,7 @@ class modECM extends DolibarrModules 'url' => '/ecm/index.php', 'langs' => 'ecm', 'position' => 82, - 'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup', + 'perms' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload") || $user->hasRight("ecm", "setup")', 'enabled' => 'isModEnabled("ecm")', 'target' => '', 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both @@ -146,8 +147,8 @@ class modECM extends DolibarrModules 'url' => '/ecm/index.php?mainmenu=ecm&leftmenu=ecm', 'langs' => 'ecm', 'position' => 101, - 'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload', - 'enabled' => '$user->rights->ecm->read || $user->rights->ecm->upload', + 'perms' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', + 'enabled' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', 'target' => '', 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both ); @@ -162,8 +163,8 @@ class modECM extends DolibarrModules 'url' => '/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm', 'langs' => 'ecm', 'position' => 102, - 'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload', - 'enabled' => '$user->rights->ecm->read || $user->rights->ecm->upload', + 'perms' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', + 'enabled' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', 'target' => '', 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both ); @@ -177,8 +178,8 @@ class modECM extends DolibarrModules 'url' => '/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm', 'langs' => 'ecm', 'position' => 103, - 'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload', - 'enabled' => '($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt("ECM_AUTO_TREE_HIDEN")', + 'perms' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', + 'enabled' => '($user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")) && !getDolGlobalInt("ECM_AUTO_TREE_HIDEN")', 'target' => '', 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both ); @@ -192,8 +193,8 @@ class modECM extends DolibarrModules 'url' => '/ecm/index_medias.php?action=file_manager&mainmenu=ecm&leftmenu=ecm', 'langs' => 'ecm', 'position' => 104, - 'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload', - 'enabled' => '($user->rights->ecm->read || $user->rights->ecm->upload) && getDolGlobalInt("MAIN_FEATURES_LEVEL") == 2', + 'perms' => '$user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")', + 'enabled' => '($user->hasRight("ecm", "read") || $user->hasRight("ecm", "upload")) && getDolGlobalInt("MAIN_FEATURES_LEVEL") == 2', 'target' => '', 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both ); diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 7df1efdbce0..9f04478effe 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -512,7 +512,7 @@ if ($user->hasRight('ecm', 'upload')) { // List of document if ($user->hasRight('ecm', 'read')) { $param = '&section=' . $section; - $formfile->list_of_documents($filearray, '', 'ecm', $param, 1, $relativepath, $user->rights->ecm->upload); + $formfile->list_of_documents($filearray, '', 'ecm', $param, 1, $relativepath, $user->hasRight("ecm", "upload")); } */