Skip to content
Snippets Groups Projects
Commit 8dbf9926 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

prevent php8 warnings in user model, re #2193

Merge request studip/studip!1422
parent 06a0479d
No related branches found
No related tags found
1 merge request!4Draft: Icon creation
...@@ -369,7 +369,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject ...@@ -369,7 +369,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
} }
//permissions //permissions
if (!is_null($attributes['perm']) && $attributes['perm'] != 'alle') { if (!empty($attributes['perm']) && $attributes['perm'] !== 'alle') {
$where[] = "au.`perms` = :perms"; $where[] = "au.`perms` = :perms";
$params[':perms'] = $attributes['perm']; $params[':perms'] = $attributes['perm'];
} }
...@@ -399,7 +399,11 @@ class User extends AuthUserMd5 implements Range, PrivacyObject ...@@ -399,7 +399,11 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
} }
//datafields //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`)"; $joins[] = "LEFT JOIN `datafields_entries` de ON (de.`range_id` = au.`user_id`)";
foreach ($attributes['datafields'] as $id => $entry) { foreach ($attributes['datafields'] as $id => $entry) {
$where[] = "de.`datafield_id` = :df_id_". $id; $where[] = "de.`datafield_id` = :df_id_". $id;
...@@ -447,7 +451,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject ...@@ -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`"; $joins[] = "LEFT JOIN `user_inst` uis ON uis.`user_id` = au.`user_id`";
$where[] = "uis.`Institut_id` = :institute"; $where[] = "uis.`Institut_id` = :institute";
$params[':institute'] = $attributes['institute']; $params[':institute'] = $attributes['institute'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment