diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-01 09:07:31 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-01 11:26:24 +0200 |
| commit | 861c32e6889f33faff7f8fbb69d287f9e57d478b (patch) | |
| tree | 76cabe52a2cfe6afd5ac5eb7094c70c5174b306a /lib/classes | |
| parent | fbffec70730f8247b04d94cdcae6f4971b78b91e (diff) | |
prevent php8 warnings, fixes #5441
Closes #5441
Merge request studip/studip!4084
Diffstat (limited to 'lib/classes')
| -rw-r--r-- | lib/classes/MvvPerm.php | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/lib/classes/MvvPerm.php b/lib/classes/MvvPerm.php index 93f9f44..cc254f5 100644 --- a/lib/classes/MvvPerm.php +++ b/lib/classes/MvvPerm.php @@ -39,7 +39,7 @@ class MvvPerm { */ const PERM_ADMIN = 15; - private static $privileges; + private static $privileges = null; private static $roles; @@ -348,18 +348,18 @@ class MvvPerm { if (count($institutes_assigned_role) === 0 || count(array_intersect($institut_ids, $institutes_assigned_role))) { if (!$status) { - $priv = intval(self::$privileges[$mvv_table]['default_table'][$role->rolename]); + $priv = intval(self::$privileges[$mvv_table]['default_table'][$role->rolename] ?? 0); } else { - $priv = intval(self::$privileges[$mvv_table]['table'][$status][$role->rolename]); + $priv = intval(self::$privileges[$mvv_table]['table'][$status][$role->rolename] ?? 0); } } else { $priv = 0; } } else { if (!$status) { - $priv = intval(self::$privileges[$mvv_table]['default_table'][$role->rolename]); + $priv = intval(self::$privileges[$mvv_table]['default_table'][$role->rolename] ?? 0); } else { - $priv = intval(self::$privileges[$mvv_table]['table'][$status][$role->rolename]); + $priv = intval(self::$privileges[$mvv_table]['table'][$status][$role->rolename] ?? 0); } } @@ -465,33 +465,35 @@ class MvvPerm { if (count($institut_ids)) { $institutes_assigned_role = RolePersistence::getAssignedRoleInstitutes($user_id, $role->roleid); // count($institutes_assigned_role) === 0 means global role. - if (count($institutes_assigned_role) === 0 - || count(array_intersect($institut_ids, $institutes_assigned_role))) { + if ( + count($institutes_assigned_role) === 0 + || count(array_intersect($institut_ids, $institutes_assigned_role)) + ) { $priv = is_array($field) - ? self::$privileges[$mvv_table]['fields'][$field[0]][$field[1]][$status][$role->rolename] - : self::$privileges[$mvv_table]['fields'][$field][$status][$role->rolename]; + ? self::$privileges[$mvv_table]['fields'][$field[0]][$field[1]][$status][$role->rolename] ?? null + : self::$privileges[$mvv_table]['fields'][$field][$status][$role->rolename] ?? null; if (is_null($priv)) { $priv = is_array($field) - ? self::$privileges[$mvv_table]['fields'][$field[0]]['default'][$status][$role->rolename] - : self::$privileges[$mvv_table]['fields'][$field]['default'][$role->rolename]; + ? self::$privileges[$mvv_table]['fields'][$field[0]]['default'][$status][$role->rolename] ?? null + : self::$privileges[$mvv_table]['fields'][$field]['default'][$role->rolename] ?? null; } if (is_null($priv)) { - $priv = self::$privileges[$mvv_table]['default_fields'][$role->rolename]; + $priv = self::$privileges[$mvv_table]['default_fields'][$role->rolename] ?? null; } } else { $priv = 0; } } else { $priv = is_array($field) - ? self::$privileges[$mvv_table]['fields'][$field[0]][$field[1]][$status][$role->rolename] - : self::$privileges[$mvv_table]['fields'][$field][$status][$role->rolename]; + ? self::$privileges[$mvv_table]['fields'][$field[0]][$field[1]][$status][$role->rolename] ?? null + : self::$privileges[$mvv_table]['fields'][$field][$status][$role->rolename] ?? null; if (is_null($priv)) { $priv = is_array($field) - ? self::$privileges[$mvv_table]['fields'][$field[0]]['default'][$status][$role->rolename] - : self::$privileges[$mvv_table]['fields'][$field]['default'][$role->rolename]; + ? self::$privileges[$mvv_table]['fields'][$field[0]]['default'][$status][$role->rolename] ?? null + : self::$privileges[$mvv_table]['fields'][$field]['default'][$role->rolename] ?? null; } if (is_null($priv)) { - $priv = self::$privileges[$mvv_table]['default_fields'][$role->rolename]; + $priv = self::$privileges[$mvv_table]['default_fields'][$role->rolename] ?? null; } } $priv = intval($priv); @@ -564,7 +566,7 @@ class MvvPerm { { if (self::$privileges === null) { $cache = StudipCacheFactory::getCache(); - self::$privileges = unserialize($cache->read(MVV::CACHE_KEY . '/privileges')); + self::$privileges = unserialize($cache->read(MVV::CACHE_KEY . '/privileges')) ?: []; } if (self::$privileges[$mvv_table] === null) { |