From f0863087c0defdebbdf499bcd1ee7d75829ae396 Mon Sep 17 00:00:00 2001 From: David Siegfried <david.siegfried@uni-vechta.de> Date: Thu, 2 Mar 2023 16:54:25 +0000 Subject: [PATCH] prevent php-warnings, closes #2245 Closes #2245 Merge request studip/studip!1479 --- app/controllers/course/admission.php | 2 +- app/views/course/admission/index.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/course/admission.php b/app/controllers/course/admission.php index d451b1c5132..1d6dd298801 100644 --- a/app/controllers/course/admission.php +++ b/app/controllers/course/admission.php @@ -270,7 +270,7 @@ class Course_AdmissionController extends AuthenticatedController $question = sprintf(_("Sie beabsichtigen die Anzahl der Wartenden zu begrenzen. Die letzten %s Einträge der Warteliste werden gelöscht. Sind sie sicher?"), $this->course->getNumWaiting()-$this->course->admission_waitlist_max); } } - if (Request::submitted('change_admission_turnout_yes') || !$question) { + if (Request::submitted('change_admission_turnout_yes') || empty($question)) { if ($this->course->admission_disable_waitlist && $this->course->getNumWaiting()) { $removed_applicants = $this->course->admission_applicants->findBy('status', 'awaiting'); } diff --git a/app/views/course/admission/index.php b/app/views/course/admission/index.php index 3584c6dcb38..f3a93e219bb 100644 --- a/app/views/course/admission/index.php +++ b/app/views/course/admission/index.php @@ -12,7 +12,7 @@ <?= $current_courseset->toString(true) ?> </div> <div> - <? if (!$is_locked['admission_type'] || $current_courseset->isUserAllowedToEdit($user_id)) : ?> + <? if (empty($is_locked['admission_type']) || $current_courseset->isUserAllowedToEdit($user_id)) : ?> <? if ($current_courseset->isUserAllowedToAssignCourse($user_id, $course_id)) : ?> <?= Studip\Button::create(_("Zuordnung aufheben"), 'change_course_set_unassign', ['data-dialog' => '']) ?> <? endif ?> @@ -24,10 +24,10 @@ </div> <? else : ?> <div> - <? if (!$is_locked['passwort'] && isset($activated_admission_rules['PasswordAdmission'])) : ?> + <? if (empty($is_locked['passwort']) && isset($activated_admission_rules['PasswordAdmission'])) : ?> <?= Studip\LinkButton::create(_("Anmeldung mit Passwort"), $controller->action_url('instant_course_set', ['type' => 'PasswordAdmission']), ['data-dialog' => '']) ?> <? endif ?> - <? if (!$is_locked['admission_type']) : ?> + <? if (empty($is_locked['admission_type'])) : ?> <? if (isset($activated_admission_rules['LockedAdmission'])) : ?> <?= Studip\LinkButton::create(_("Anmeldung gesperrt"), $controller->action_url('instant_course_set', ['type' => 'LockedAdmission']), ['data-dialog' => '']) ?> <? endif ?> @@ -43,7 +43,7 @@ <? endif ?> <? endif ?> </div> - <? if (!$is_locked['admission_type'] && count($available_coursesets)) : ?> + <? if (empty($is_locked['admission_type']) && count($available_coursesets) > 0) : ?> <details class="studip"> <summary title="<?= _("Klicken um Zuordnungsmöglichkeiten zu öffnen") ?>"> <?= _("Zuordnung zu einem bestehenden Anmeldeset"); ?> @@ -103,7 +103,7 @@ <br> <?= _('Einstellungen für die Warteliste:') ?> <label for="admission_disable_waitlist"> - <input <?= $is_locked['admission_disable_waitlist'] ?> + <input <?= $is_locked['admission_disable_waitlist'] ?? '' ?> type="checkbox" id="admission_disable_waitlist" name="admission_disable_waitlist" value="1" <?= $course->admission_disable_waitlist == 0 ? "checked" : "" ?>> @@ -113,7 +113,7 @@ <? endif ?> </label> <label for="admission_disable_waitlist_move"> - <input <?= $is_locked['admission_disable_waitlist_move'] ?> + <input <?= $is_locked['admission_disable_waitlist_move'] ?? '' ?> type="checkbox" id="admission_disable_waitlist_move" name="admission_disable_waitlist_move" @@ -121,7 +121,7 @@ <?= _('automatisches Nachrücken aus der Warteliste aktivieren') ?></label> <label for="admission_waitlist_max"> <?= _('max. Anzahl an Wartenden (optional)') ?> - <input <?= $is_locked['admission_waitlist_max'] ?> + <input <?= $is_locked['admission_waitlist_max'] ?? ''?> type="text" id="admission_waitlist_max" name="admission_waitlist_max" -- GitLab