diff options
| author | David Siegfried <david.siegfried@uni-vechta.de> | 2024-09-24 18:03:10 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-09-24 18:03:10 +0000 |
| commit | dd008ac05181141f852481e0f985b2adc55ff207 (patch) | |
| tree | 1f6972a2f9136056e09d25e3a9c455986817de7a /lib | |
| parent | 3ec7589b78c6327cf7bf983765028831d2590504 (diff) | |
prevent php-warnings in resources, fixes #4623
Closes #4623
Merge request studip/studip!3435
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/models/resources/ResourceRequest.php | 6 | ||||
| -rw-r--r-- | lib/resources/RoomManager.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php index fff7132..b5da46a 100644 --- a/lib/models/resources/ResourceRequest.php +++ b/lib/models/resources/ResourceRequest.php @@ -964,8 +964,8 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen $date = CourseDate::find($appointment->appointment_id); $interval['range'] = 'CourseDate'; $interval['range_id'] = $appointment->appointment_id; - $interval['booked_room'] = $date->room_booking->resource_id; - $interval['booking_id'] = $date->room_booking->id; + $interval['booked_room'] = $date->room_booking->resource_id ?? ''; + $interval['booking_id'] = $date->room_booking->id ?? ''; $time_intervals['']['intervals'][] = $interval; } @@ -2433,7 +2433,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen { $props = ''; foreach ($this->getPropertyData() as $name => $state) { - $props .= $name . '=' . $state . ' '; + $props .= $name . '=' . json_encode($state) . ' '; } $info['Anfrage'] = $this->getType(); $info['Status'] = $this->getStatus(); diff --git a/lib/resources/RoomManager.php b/lib/resources/RoomManager.php index 0122a48..caaf8ca 100644 --- a/lib/resources/RoomManager.php +++ b/lib/resources/RoomManager.php @@ -667,17 +667,17 @@ class RoomManager //Furthermore we must check if only minimum or maximum are //set or if both are set. Depending on that condition, //the conditions are different. - if ($state[0] && $state[1]) { + if (!empty($state[0]) && !empty($state[1])) { //Minimum and maximum are specified: if ($room_prop_state >= $state[0] && $room_prop_state <= $state[1]) { $room_property_match++; } - } elseif ($state[0]) { + } elseif (!empty($state[0])) { //Only a minimum is given: if ($room_prop_state >= $state[0]) { $room_property_match++; } - } elseif ($state[1]) { + } elseif (!empty($state[1])) { //Only a maximum is given: if ($room_prop_state <= $state[1]) { $room_property_match++; |