Skip to content
Snippets Groups Projects
Commit f0863087 authored by David Siegfried's avatar David Siegfried
Browse files

prevent php-warnings, closes #2245

Closes #2245

Merge request studip/studip!1479
parent 0159593d
No related branches found
No related tags found
1 merge request!4Draft: Icon creation
...@@ -270,7 +270,7 @@ class Course_AdmissionController extends AuthenticatedController ...@@ -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); $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()) { if ($this->course->admission_disable_waitlist && $this->course->getNumWaiting()) {
$removed_applicants = $this->course->admission_applicants->findBy('status', 'awaiting'); $removed_applicants = $this->course->admission_applicants->findBy('status', 'awaiting');
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<?= $current_courseset->toString(true) ?> <?= $current_courseset->toString(true) ?>
</div> </div>
<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)) : ?> <? if ($current_courseset->isUserAllowedToAssignCourse($user_id, $course_id)) : ?>
<?= Studip\Button::create(_("Zuordnung aufheben"), 'change_course_set_unassign', ['data-dialog' => '']) ?> <?= Studip\Button::create(_("Zuordnung aufheben"), 'change_course_set_unassign', ['data-dialog' => '']) ?>
<? endif ?> <? endif ?>
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
</div> </div>
<? else : ?> <? else : ?>
<div> <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' => '']) ?> <?= Studip\LinkButton::create(_("Anmeldung mit Passwort"), $controller->action_url('instant_course_set', ['type' => 'PasswordAdmission']), ['data-dialog' => '']) ?>
<? endif ?> <? endif ?>
<? if (!$is_locked['admission_type']) : ?> <? if (empty($is_locked['admission_type'])) : ?>
<? if (isset($activated_admission_rules['LockedAdmission'])) : ?> <? if (isset($activated_admission_rules['LockedAdmission'])) : ?>
<?= Studip\LinkButton::create(_("Anmeldung gesperrt"), $controller->action_url('instant_course_set', ['type' => 'LockedAdmission']), ['data-dialog' => '']) ?> <?= Studip\LinkButton::create(_("Anmeldung gesperrt"), $controller->action_url('instant_course_set', ['type' => 'LockedAdmission']), ['data-dialog' => '']) ?>
<? endif ?> <? endif ?>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<? endif ?> <? endif ?>
<? endif ?> <? endif ?>
</div> </div>
<? if (!$is_locked['admission_type'] && count($available_coursesets)) : ?> <? if (empty($is_locked['admission_type']) && count($available_coursesets) > 0) : ?>
<details class="studip"> <details class="studip">
<summary title="<?= _("Klicken um Zuordnungsmöglichkeiten zu öffnen") ?>"> <summary title="<?= _("Klicken um Zuordnungsmöglichkeiten zu öffnen") ?>">
<?= _("Zuordnung zu einem bestehenden Anmeldeset"); ?> <?= _("Zuordnung zu einem bestehenden Anmeldeset"); ?>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<br> <br>
<?= _('Einstellungen für die Warteliste:') ?> <?= _('Einstellungen für die Warteliste:') ?>
<label for="admission_disable_waitlist"> <label for="admission_disable_waitlist">
<input <?= $is_locked['admission_disable_waitlist'] ?> <input <?= $is_locked['admission_disable_waitlist'] ?? '' ?>
type="checkbox" id="admission_disable_waitlist" type="checkbox" id="admission_disable_waitlist"
name="admission_disable_waitlist" name="admission_disable_waitlist"
value="1" <?= $course->admission_disable_waitlist == 0 ? "checked" : "" ?>> value="1" <?= $course->admission_disable_waitlist == 0 ? "checked" : "" ?>>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<? endif ?> <? endif ?>
</label> </label>
<label for="admission_disable_waitlist_move"> <label for="admission_disable_waitlist_move">
<input <?= $is_locked['admission_disable_waitlist_move'] ?> <input <?= $is_locked['admission_disable_waitlist_move'] ?? '' ?>
type="checkbox" type="checkbox"
id="admission_disable_waitlist_move" id="admission_disable_waitlist_move"
name="admission_disable_waitlist_move" name="admission_disable_waitlist_move"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<?= _('automatisches Nachrücken aus der Warteliste aktivieren') ?></label> <?= _('automatisches Nachrücken aus der Warteliste aktivieren') ?></label>
<label for="admission_waitlist_max"> <label for="admission_waitlist_max">
<?= _('max. Anzahl an Wartenden (optional)') ?> <?= _('max. Anzahl an Wartenden (optional)') ?>
<input <?= $is_locked['admission_waitlist_max'] ?> <input <?= $is_locked['admission_waitlist_max'] ?? ''?>
type="text" type="text"
id="admission_waitlist_max" id="admission_waitlist_max"
name="admission_waitlist_max" name="admission_waitlist_max"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment