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

fix php8 warning, fixes #4341

Closes #4341

Merge request studip/studip!3143
parent 871ff3ae
No related branches found
No related tags found
No related merge requests found
...@@ -516,7 +516,7 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -516,7 +516,7 @@ class Course_TimesroomsController extends AuthenticatedController
'<strong>' . htmlReady($singledate->toString()) . '</strong>' '<strong>' . htmlReady($singledate->toString()) . '</strong>'
)); ));
} }
if ($singledate->messages['error']) { if (!empty($singledate->messages['error'])) {
PageLayout::postError( PageLayout::postError(
_('Die folgenden Fehler traten beim Bearbeiten des Termins auf:'), _('Die folgenden Fehler traten beim Bearbeiten des Termins auf:'),
htmlReady($singledate->messages['error']) htmlReady($singledate->messages['error'])
...@@ -1687,7 +1687,7 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -1687,7 +1687,7 @@ class Course_TimesroomsController extends AuthenticatedController
} else { } else {
$user_rooms = RoomManager::getUserRooms($current_user); $user_rooms = RoomManager::getUserRooms($current_user);
foreach ($user_rooms as $room) { foreach ($user_rooms as $room) {
if ($room->userHasBookingRights($current_user, $begin, $end)) { if ($room->userHasBookingRights($current_user, $begin ?? null, $end ?? null)) {
$rooms_with_booking_permissions++; $rooms_with_booking_permissions++;
if ($only_bookable_rooms) { if ($only_bookable_rooms) {
foreach ($all_time_intervals as $interval) { foreach ($all_time_intervals as $interval) {
......
...@@ -40,14 +40,14 @@ class ProfileController extends AuthenticatedController ...@@ -40,14 +40,14 @@ class ProfileController extends AuthenticatedController
// set the page title depending on user selection // set the page title depending on user selection
if ( if (
$this->user isset($this->user, $this->current_user)
&& $this->current_user->id === $this->user->id && $this->current_user->id === $this->user->id
&& !$this->current_user->locked && !$this->current_user->locked
) { ) {
PageLayout::setTitle(_('Mein Profil')); PageLayout::setTitle(_('Mein Profil'));
UserConfig::get($this->user->id)->store('PROFILE_LAST_VISIT', time()); UserConfig::get($this->user->id)->store('PROFILE_LAST_VISIT', time());
} elseif ( } elseif (
$this->current_user->id !empty($this->current_user->id)
&& ( && (
$this->perm->have_perm('root') $this->perm->have_perm('root')
|| ( || (
...@@ -139,17 +139,16 @@ class ProfileController extends AuthenticatedController ...@@ -139,17 +139,16 @@ class ProfileController extends AuthenticatedController
} }
// calendar // calendar
$this->dates = ''; if (
if (Config::get()->CALENDAR_ENABLE) { Config::get()->CALENDAR_ENABLE
if (!in_array($this->current_user->perms, ['admin', 'root'])) { && !in_array($this->current_user->perms, ['admin', 'root'])
if (Visibility::verify('termine', $this->current_user->user_id)) { && Visibility::verify('termine', $this->current_user->user_id)
$start = time(); ) {
$end = strtotime('+1 week 23:59:59'); $start = time();
$end = strtotime('+1 week 23:59:59');
$response = $this->relay('calendar/contentbox/display/' . $this->current_user->user_id . '/' . ($end - $start));
$this->dates = $response->body; $response = $this->relay('calendar/contentbox/display/' . $this->current_user->user_id . '/' . ($end - $start));
} $this->dates = $response->body;
}
} }
// include and show votes and tests // include and show votes and tests
......
...@@ -83,9 +83,9 @@ ...@@ -83,9 +83,9 @@
</section> </section>
<?= $news ?> <?= $news ?? '' ?>
<?= $dates ?> <?= $dates ?? '' ?>
<?= $questionnaires ?? '' ?> <?= $questionnaires ?? '' ?>
......
...@@ -147,7 +147,7 @@ abstract class Context ...@@ -147,7 +147,7 @@ abstract class Context
} else { } else {
foreach ($providers as $provider) { foreach ($providers as $provider) {
$ctype = $this->getContextType(); $ctype = $this->getContextType();
$filtered_classes = $filter->getType()->$ctype; $filtered_classes = $filter->getType()->$ctype ?? null;
if (is_array($filtered_classes)) { if (is_array($filtered_classes)) {
foreach ($filtered_classes as $class) { foreach ($filtered_classes as $class) {
......
...@@ -123,7 +123,7 @@ class CourseGroupFolder extends StandardFolder ...@@ -123,7 +123,7 @@ class CourseGroupFolder extends StandardFolder
public function getEditTemplate() public function getEditTemplate()
{ {
$template = $GLOBALS['template_factory']->open('filesystem/group_folder/edit.php'); $template = $GLOBALS['template_factory']->open('filesystem/group_folder/edit.php');
$group = Statusgruppen::find($this->folderdata['data_content']['group']); $group = Statusgruppen::find($this->folderdata['data_content']['group'] ?? null);
$template->set_attribute('group', $group); $template->set_attribute('group', $group);
$template->set_attribute('folder', $this); $template->set_attribute('folder', $this);
return $template; return $template;
...@@ -151,7 +151,7 @@ class CourseGroupFolder extends StandardFolder ...@@ -151,7 +151,7 @@ class CourseGroupFolder extends StandardFolder
*/ */
public function getDescriptionTemplate() public function getDescriptionTemplate()
{ {
$group = new Statusgruppen($this->folderdata['data_content']['group']); $group = new Statusgruppen($this->folderdata['data_content']['group'] ?? null);
$template = $GLOBALS['template_factory']->open('filesystem/group_folder/description.php'); $template = $GLOBALS['template_factory']->open('filesystem/group_folder/description.php');
$template->type = self::getTypeName(); $template->type = self::getTypeName();
......
<?= implode(PageLayout::getMessages()) ?> <?= implode('', PageLayout::getMessages()) ?>
<?= $content_for_layout ?> <?= $content_for_layout ?>
\ No newline at end of file
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