aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/admin/user.php
diff options
context:
space:
mode:
authorDavid Siegfried <david.siegfried@uni-vechta.de>2023-03-02 15:23:18 +0000
committerDavid Siegfried <david.siegfried@uni-vechta.de>2023-03-02 15:23:18 +0000
commit0159593d18c8f4fccaf76f6876c8f7d6868ac520 (patch)
treece956f5e7e81fa79971fb2094043d83a8b83d381 /app/controllers/admin/user.php
parent0f05cd6a3b1c8e4bb954302dbbc0901e3b4d586d (diff)
prevent php-warnings, closes #2243
Closes #2243 Merge request studip/studip!1476
Diffstat (limited to 'app/controllers/admin/user.php')
-rw-r--r--app/controllers/admin/user.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index dcc3690..0ceeb39 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1280,7 +1280,7 @@ class Admin_UserController extends AuthenticatedController
$this->sections = [];
foreach ($memberships as $membership) {
- $semester_name = $membership->course->isOpenEnded() ? _('unbegrenzt') : $membership->course->start_semester->name;
+ $semester_name = $membership->course->isOpenEnded() ? _('unbegrenzt') : (string)$membership->course->start_semester->name;
if (!Request::get('view') || Request::get('view') === 'files') {
// count files for course
@@ -1290,10 +1290,15 @@ class Admin_UserController extends AuthenticatedController
if ($count) {
- if (!isset($course_files[$membership->seminar_id])) {
- $course_files[$semester_name][$membership->course->id]['course'] = $membership->course;
+ if (!isset($course_files[$semester_name])) {
+ $course_files[$semester_name] = [];
}
- $course_files[$semester_name][$membership->course->id]['files'] = $count;
+ if (!isset($course_files[$semester_name][$membership->seminar_id])) {
+ $course_files[$semester_name][$membership->seminar_id] = [
+ 'course' => $membership->course,
+ ];
+ }
+ $course_files[$semester_name][$membership->seminar_id]['files'] = $count;
}
}
if (in_array(Request::get('view'), words('courses closed_courses'))) {
@@ -1335,6 +1340,7 @@ class Admin_UserController extends AuthenticatedController
} elseif (Request::get('view') === 'priorities') {
// priorities
$priorities = DBManager::get()->fetchAll('SELECT * FROM `priorities` WHERE `user_id` = ?', [$user_id]);
+ $seminar_wait = [];
}
if (!empty($course_files)) {
@@ -1350,7 +1356,7 @@ class Admin_UserController extends AuthenticatedController
$this->sections['closed_courses'] = $closed_courses;
}
- if (is_array($seminar_wait) && count($seminar_wait)) {
+ if (!empty($seminar_wait)) {
$this->sections['seminar_wait'] = $seminar_wait;
}