From 6784683882b7e7cdf9eaf65901c0daa2f039382e Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Fri, 19 Nov 2021 09:21:40 +0100
Subject: [PATCH] [BUGFIX] Fix undefined array key warnings
When comparing user groups, a fake user record
is created to fetch the group data for. This led to
a couple of undefined array key warnings, which
are now fixed.
Resolves: #96038
Releases: master, 11.5
Change-Id: Ia1ed0dcf4483bf5b8bef26992c8943284c32de29
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72238
Tested-by: Jochen <rothjochen@gmail.com>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Jochen <rothjochen@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
.../Classes/Service/UserInformationService.php | 6 +++++-
.../Authentication/BackendUserAuthentication.php | 12 ++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/typo3/sysext/beuser/Classes/Service/UserInformationService.php b/typo3/sysext/beuser/Classes/Service/UserInformationService.php
index fc06aff9bcab..ffb96902bde4 100644
--- a/typo3/sysext/beuser/Classes/Service/UserInformationService.php
+++ b/typo3/sysext/beuser/Classes/Service/UserInformationService.php
@@ -63,6 +63,10 @@ class UserInformationService
'uid' => PHP_INT_MAX,
'options' => 3,
'workspace_id' => -99,
+ 'realName' => 'fakeUser',
+ 'email' => 'fake.user@typo3.org',
+ 'TSconfig' => '',
+ 'category_perms' => '',
$user->usergroup_column => $groupId,
];
$user->fetchGroupData();
@@ -169,7 +173,7 @@ class UserInformationService
// Modules
$modules = GeneralUtility::trimExplode(',', $user->groupData['modules'], true);
foreach ($modules as $module) {
- $data['modules'][$module] = $GLOBALS['TBE_MODULES']['_configuration'][$module];
+ $data['modules'][$module] = $GLOBALS['TBE_MODULES']['_configuration'][$module] ?? '';
}
$data['modules'] = array_filter($data['modules']);
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 2bbebf260c1a..664e63c4feff 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -270,7 +270,7 @@ class BackendUserAuthentication extends AbstractUserAuthentication
*/
public function isAdmin()
{
- return is_array($this->user) && ($this->user['admin'] & 1) == 1;
+ return is_array($this->user) && (($this->user['admin'] ?? 0) & 1) == 1;
}
/**
@@ -1121,7 +1121,7 @@ class BackendUserAuthentication extends AbstractUserAuthentication
if ($this->user['uid']) {
// Get lists for the be_user record and set them as default/primary values.
// Enabled Backend Modules
- $this->groupData['modules'] = $this->user['userMods'];
+ $this->groupData['modules'] = $this->user['userMods'] ?? '';
// Add available widgets
$this->groupData['available_widgets'] = $this->user['available_widgets'] ?? '';
// Add allowed mfa providers
@@ -1129,13 +1129,13 @@ class BackendUserAuthentication extends AbstractUserAuthentication
// Add Allowed Languages
$this->groupData['allowed_languages'] = $this->user['allowed_languages'] ?? '';
// Set user value for workspace permissions.
- $this->groupData['workspace_perms'] = $this->user['workspace_perms'];
+ $this->groupData['workspace_perms'] = $this->user['workspace_perms'] ?? 0;
// Database mountpoints
- $this->groupData['webmounts'] = $this->user['db_mountpoints'];
+ $this->groupData['webmounts'] = $this->user['db_mountpoints'] ?? '';
// File mountpoints
- $this->groupData['filemounts'] = $this->user['file_mountpoints'];
+ $this->groupData['filemounts'] = $this->user['file_mountpoints'] ?? '';
// Fileoperation permissions
- $this->groupData['file_permissions'] = $this->user['file_permissions'];
+ $this->groupData['file_permissions'] = $this->user['file_permissions'] ?? '';
// Get the groups and accumulate their permission settings
$mountOptions = new BackendGroupMountOption($this->user['options']);
--
GitLab