From fb8ae91e5505da26eaf10cfd8b875240b1f25e98 Mon Sep 17 00:00:00 2001 From: Prasad <prasad@vtiger.com> Date: Fri, 27 Sep 2024 09:02:27 +0530 Subject: [PATCH] Fixed E_ALL warning access to var in UserInfo --- include/utils/UserInfoUtil.php | 10 +++++----- modules/Users/models/Privileges.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/utils/UserInfoUtil.php b/include/utils/UserInfoUtil.php index 09e84bbdf..ac4e8d772 100755 --- a/include/utils/UserInfoUtil.php +++ b/include/utils/UserInfoUtil.php @@ -352,21 +352,21 @@ function isPermitted($module,$actionname,$record_id='') } } //Checking for vtiger_tab permission - if($profileTabsPermission[$tabid] !=0) + if(isset($profileTabsPermission[$tabid]) && $profileTabsPermission[$tabid] !=0) { $permission = "no"; $log->debug("Exiting isPermitted method ..."); return $permission; } //Checking for Action Permission - if(strlen($profileActionPermission[$tabid][$actionid]) < 1 && $profileActionPermission[$tabid][$actionid] == '') + if(isset($profileActionPermission[$tabid][$actionid]) && strlen($profileActionPermission[$tabid][$actionid]) < 1 && $profileActionPermission[$tabid][$actionid] == '') { $permission = "yes"; $log->debug("Exiting isPermitted method ..."); return $permission; } - if($profileActionPermission[$tabid][$actionid] != 0 && $profileActionPermission[$tabid][$actionid] != '') + if(isset($profileActionPermission[$tabid][$actionid]) && $profileActionPermission[$tabid][$actionid] != 0 && $profileActionPermission[$tabid][$actionid] != '') { $permission = "no"; $log->debug("Exiting isPermitted method ..."); @@ -2132,7 +2132,7 @@ function getPermittedModuleNames() { foreach($tab_seq_array as $tabid=>$seq_value) { - if($seq_value === 0 && $profileTabsPermission[$tabid] === 0) + if($seq_value === 0 && (isset($profileTabsPermission[$tabid]) && $profileTabsPermission[$tabid]) === 0) { $permittedModules[]=getTabModuleName($tabid); } @@ -2171,7 +2171,7 @@ function getPermittedModuleIdList() { if($is_admin == false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) { foreach($tab_seq_array as $tabid=>$seq_value) { - if($seq_value === 0 && $profileTabsPermission[$tabid] === 0) { + if($seq_value === 0 && isset($profileTabsPermission[$tabid]) && $profileTabsPermission[$tabid] === 0) { $permittedModules[]=($tabid); } } diff --git a/modules/Users/models/Privileges.php b/modules/Users/models/Privileges.php index 5cdb164ba..3b16d8661 100644 --- a/modules/Users/models/Privileges.php +++ b/modules/Users/models/Privileges.php @@ -67,7 +67,7 @@ class Users_Privileges_Model extends Users_Record_Model { public function hasModulePermission($tabId) { $profileTabsPermissions = $this->get('profile_tabs_permission'); $moduleModel = Vtiger_Module_Model::getInstance($tabId); - return (($this->isAdminUser() || $profileTabsPermissions[$tabId] === 0) && $moduleModel->isActive()); + return (($this->isAdminUser() || (isset($profileTabsPermissions[$tabId]) && $profileTabsPermissions[$tabId] === 0)) && $moduleModel->isActive()); } /** -- GitLab