From 8dbf9926e8ba4447c5eb98953ccdd52ae1b61b93 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 20 Feb 2023 14:54:11 +0000
Subject: [PATCH] prevent php8 warnings in user model, re #2193
Merge request studip/studip!1422
---
lib/models/User.class.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index 3d6222276f3..06a4eae7d11 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -369,7 +369,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
}
//permissions
- if (!is_null($attributes['perm']) && $attributes['perm'] != 'alle') {
+ if (!empty($attributes['perm']) && $attributes['perm'] !== 'alle') {
$where[] = "au.`perms` = :perms";
$params[':perms'] = $attributes['perm'];
}
@@ -399,7 +399,11 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
}
//datafields
- if (!is_null($attributes['datafields']) && count($attributes['datafields']) > 0) {
+ if (
+ !empty($attributes['datafields'])
+ && is_array($attributes['datafields'])
+ && count($attributes['datafields']) > 0
+ ) {
$joins[] = "LEFT JOIN `datafields_entries` de ON (de.`range_id` = au.`user_id`)";
foreach ($attributes['datafields'] as $id => $entry) {
$where[] = "de.`datafield_id` = :df_id_". $id;
@@ -447,7 +451,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
}
}
- if ($attributes['institute']) {
+ if (!empty($attributes['institute'])) {
$joins[] = "LEFT JOIN `user_inst` uis ON uis.`user_id` = au.`user_id`";
$where[] = "uis.`Institut_id` = :institute";
$params[':institute'] = $attributes['institute'];
--
GitLab