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

prevent many warnings regarding php8 on main, fixes #4631

Closes #4631

Merge request studip/studip!3448
parent b4b0e968
No related branches found
No related tags found
No related merge requests found
Showing
with 42 additions and 44 deletions
......@@ -85,7 +85,7 @@ class Admission_CoursesetController extends AuthenticatedController
$filter['semester_id'] = $this->current_semester_id != 'all' ? $this->current_semester_id : null;
$filter['rule_types'] = array_keys($this->current_rule_types);
$this->myInstitutes = CoursesetModel::getInstitutes($filter);
if (!$this->current_institut_id) {
if (!$this->current_institut_id && count($this->myInstitutes) > 0) {
if (!isset($this->myInstitutes['all']['count']) || $this->myInstitutes['all']['count'] < 100) {
$this->current_institut_id = 'all';
} else {
......@@ -105,7 +105,7 @@ class Admission_CoursesetController extends AuthenticatedController
}
foreach ($institutes as $one) {
if ($this->myInstitutes[$one]['count']) {
if (!empty($this->myInstitutes[$one]['count'])) {
$sets = CourseSet::getCoursesetsByInstituteId($one, $filter);
foreach ($sets as $set) {
$courseset = new CourseSet($set['set_id']);
......
......@@ -2148,16 +2148,11 @@ class Course_MembersController extends AuthenticatedController
/**
* Get the position out of the database
* @param String $user_id
* @return int
*/
private function getPosition($user_id): ?int
private function getPosition(string $user_id): int
{
$membership = CourseMember::findByUser($user_id);
if ($membership) {
return (int)$membership->position;
}
return 0;
$membership = CourseMember::find([$this->course_id, $user_id]);
return $membership->position ?? 0;
}
private function getLogLevel($direction, $status)
......
......@@ -261,6 +261,9 @@ class Institute_MembersController extends AuthenticatedController
// Find members
$institut_members = $this->institute->members->filter(function ($member) use ($group) {
if (!$member->user) {
return false;
}
if ($member->inst_perms === 'user') {
return false;
}
......
......@@ -312,7 +312,7 @@ class MessagesController extends AuthenticatedController {
$params['status'] = explode(',', Request::get('who', ''));
}
if ($filter === 'all' || $filter === 'send_sms_to_all') {
if ($params['status']) {
if (!empty($params['status'])) {
$additional .= ' AND seminar_user.status IN ( :status )';
}
$query = "SELECT user_id, 'rec' AS snd_rec
......
......@@ -31,7 +31,7 @@ class MultipersonsearchController extends AuthenticatedController
if (mb_strlen($searchterm) >= 3) {
$mp = MultiPersonSearch::load($name);
$searchObject = $mp->getSearchObject();
if (isset($searchObject)) {
if (isset($searchObject) && !is_bool($searchObject)) {
$result = array_map(function ($r) {
return $r['user_id'];
}, $searchObject->getResults($searchterm, [], 50));
......
......@@ -383,7 +383,7 @@ class MyCoursesController extends AuthenticatedController
if (Request::get('cmd') == 'suppose_to_kill') {
// check course admission
list(,$admission_end_time) = @array_values($course->getAdmissionTimeFrame());
$admission_end_time = $course->getAdmissionTimeFrame()['end_time'] ?? null;
$admission_enabled = $course->isAdmissionEnabled();
$admission_locked = $course->isAdmissionLocked();
......
......@@ -975,7 +975,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$new_begin->setTime(
$begin_time_arr[0],
$begin_time_arr[1],
$begin_time_arr[2]
$begin_time_arr[2] ?? 0
);
$new_end = new DateTime();
$new_end->setDate(
......@@ -986,7 +986,7 @@ class Resources_RoomRequestController extends AuthenticatedController
$new_end->setTime(
$end_time_arr[0],
$end_time_arr[1],
$end_time_arr[2]
$end_time_arr[2] == 0
);
$this->request->begin = $new_begin->getTimestamp();
......@@ -1606,7 +1606,7 @@ class Resources_RoomRequestController extends AuthenticatedController
if ($metadate->dates) {
$overlap_messages = [];
foreach ($metadate->dates as $date) {
if ($date->room_booking->resource_id != $room_id) {
if (!$date->room_booking || $date->room_booking->resource_id != $room_id) {
try {
$booking = $room->createBooking(
$this->current_user,
......@@ -1619,7 +1619,7 @@ class Resources_RoomRequestController extends AuthenticatedController
],
null,
0,
$course_date->end_time,
$date->end_time,
$this->request->preparation_time
);
if ($booking instanceof ResourceBooking) {
......@@ -1642,7 +1642,7 @@ class Resources_RoomRequestController extends AuthenticatedController
}
} elseif ($range_data[0] == 'User') {
$user = User::find($range_data[1]);
if (!($user instanceof User)) {
if (!$user) {
PageLayout::postError(
sprintf(
_('Die Person mit der ID %s wurde nicht gefunden!'),
......@@ -1837,19 +1837,19 @@ class Resources_RoomRequestController extends AuthenticatedController
{
$pos = array_search($this->filter['filter_request_id'], $request_ids);
$max = count($request_ids);
if($pos === 0) {
$prev_pos = $max-1;
$next_pos = $pos+1;
if ($pos === 0) {
$prev_pos = $max - 1;
$next_pos = $pos + 1;
} else {
$prev_pos = $pos-1;
$next_pos = $pos+1;
$prev_pos = $pos - 1;
$next_pos = $pos + 1;
if($next_pos === $max) {
if ($next_pos === $max) {
$next_pos = 0;
}
}
$this->prev_request = $request_ids[$prev_pos];
$this->next_request = $request_ids[$next_pos];
$this->prev_request = $request_ids[$prev_pos] ?? null;
$this->next_request = $request_ids[$next_pos] ?? null;
}
protected function getSingleDateDataForExportRow(CourseDate $date)
......
......@@ -27,10 +27,10 @@ use Studip\Button, Studip\LinkButton;
<?= _('Status') ?>
<select name="filter[status]" id="status" class="submit-upon-select">
<option value=""><?= _('Alle Logeinträge anzeigen') ?></option>
<option value="passed" <? if ($filter['status'] === 'passed') echo 'selected'; ?>>
<option value="passed" <? if (isset($filter['status']) && $filter['status'] === 'passed') echo 'selected'; ?>>
<?= _('Nur fehlerfreie Logeinträge anzeigen') ?>
</option>
<option value="failed" <? if ($filter['status'] === 'failed') echo 'selected'; ?>>
<option value="failed" <? if (isset($filter['status']) && $filter['status'] === 'failed') echo 'selected'; ?>>
<?= _('Nur fehlerhafte Logeinträge anzeigen') ?>
</option>
</select>
......@@ -41,7 +41,7 @@ use Studip\Button, Studip\LinkButton;
<select name="filter[schedule_id]" id="schedule_id" class="submit-upon-select">
<option value=""><?= _('Alle Logeinträge anzeigen') ?></option>
<? foreach ($schedules as $schedule): ?>
<option value="<?= $schedule->schedule_id ?>" <? if ($filter['schedule_id'] === $schedule->schedule_id) echo 'selected'; ?>>
<option value="<?= $schedule->schedule_id ?>" <? if (isset($filter['schedule_id']) && $filter['schedule_id'] === $schedule->schedule_id) echo 'selected'; ?>>
<?= htmlReady($schedule->title) ?>
</option>
<? endforeach; ?>
......@@ -53,7 +53,7 @@ use Studip\Button, Studip\LinkButton;
<select name="filter[task_id]" id="task_id" class="submit-upon-select">
<option value=""><?= _('Alle Aufgaben anzeigen') ?></option>
<? foreach ($tasks as $task): ?>
<option value="<?= $task->task_id ?>" <? if ($filter['task_id'] === $task->task_id) echo 'selected'; ?>>
<option value="<?= $task->task_id ?>" <? if (isset($filter['task_id']) && $filter['task_id'] === $task->task_id) echo 'selected'; ?>>
<?= htmlReady($task->name) ?>
</option>
<? endforeach; ?>
......
<?= $admission_error ?>
<? if ($courseset_message) : ?>
<? if (!empty($courseset_message)) : ?>
<p>
<?= $courseset_message ?>
</p>
......
......@@ -12,7 +12,7 @@
<?= _('Sperrebene') ?>
<select name="lock_sem" id="lock_sem" aria-labelledby="<?= _('Sperrebene auswählen')?>">
<? foreach ($all_lock_rules as $lock_rule) : ?>
<option value="<?= $lock_rule['lock_id'] ?>" <?= $current_lock_rule->id == $lock_rule['lock_id'] ? 'selected' : '' ?>>
<option value="<?= $lock_rule['lock_id'] ?>" <?= $current_lock_rule && $current_lock_rule->id == $lock_rule['lock_id'] ? 'selected' : '' ?>>
<?= htmlReady($lock_rule['name']) ?>
</option>
<? endforeach ?>
......
......@@ -79,7 +79,7 @@
<? endif ?>
<td style="text-align: right"><?= sprintf('%02d', ++$nr) ?></td>
<td>
<a href="<?= $controller->url_for('profile?username=' . $waiting['username']) ?>" <? if ($waiting['mkdate'] >= $last_visitdate) echo 'class="new-member"'; ?>>
<a href="<?= $controller->link_for('profile', ['username' => $waiting['username']]) ?>" <? if ($waiting['mkdate'] >= $last_visitdate) echo 'class="new-member"'; ?>>
<?= Avatar::getAvatar($waiting['user_id'], $waiting['username'])->getImageTag(Avatar::SMALL, [
'style' => 'margin-right: 5px',
'title' => $fullname,
......
......@@ -15,7 +15,7 @@
<label>
<?= _('Ausgewählte Raumkategorie') ?>
<input type="hidden" name="selected_room_id"
value="<?= htmlReady($selected_room ? $selected_room->id : '') ?>">
value="<?= htmlReady($selected_room->id ?? '') ?>">
<br>
<strong><?= htmlReady($selected_room_category->name) ?></strong>
......
<?= $this->render_partial('basicdata/index.php', ['value' => $value]) ?>
<?= $this->render_partial('basicdata/index.php', ['values' => $values]) ?>
<section>
<label for="wizard-subtitle">
......@@ -16,11 +16,11 @@
<label for="wizard-ects">
<?= _('ECTS-Punkte') ?>
</label>
<input type="text" name="ects" id="wizard-ects" size="20" maxlength="32" value="<?= htmlReady($values['ects']) ?>"/>
<input type="text" name="ects" id="wizard-ects" size="20" maxlength="32" value="<?= htmlReady($values['ects'] ?? '') ?>"/>
</section>
<section>
<label for="wizard-maxmembers">
<?= _('max. Teilnehmendenzahl') ?>
</label>
<input type="number" name="maxmembers" id="wizard-maxmember" min="0" value="<?= htmlReady($values['maxmembers']) ?>"/>
<input type="number" name="maxmembers" id="wizard-maxmember" min="0" value="<?= htmlReady($values['maxmembers'] ?? '') ?>"/>
</section>
......@@ -36,7 +36,7 @@
<?= Studip\Button::createAccept(_('Speichern'), 'store') ?>
<?= Studip\LinkButton::createCancel(
_('Zurück'),
$controller->action_url('add_files_window/' . Request::option('to_folder_id'), $options),
$controller->action_url('add_files_window/' . Request::option('to_folder_id'), $options ?? []),
['data-dialog' => '']
) ?>
</footer>
......
......@@ -94,7 +94,7 @@ if (Request::get('to_folder_id')) {
<? if ($subfolder->isReadable($GLOBALS['user']->id)) : ?>
<a href="<?= $controller->link_for('file/choose_file/' . $subfolder->id, $options) ?>" data-dialog>
<? endif ?>
<? if ($is_empty): ?>
<? if (!empty($is_empty)): ?>
<?= Icon::create('folder-empty')->asImg(24) ?>
<? else: ?>
<?= Icon::create('folder-full')->asImg(24) ?>
......
......@@ -49,7 +49,7 @@ jQuery(function ($) {
<?= CourseAvatar::getAvatar($course->id)->getImageTag(Avatar::MEDIUM, ['style' => 'width: 20px; height: 20px;']) ?>
</button>
</td>
<td data-sort-value="<?= Semester::find($course->id)->beginn ?>">
<td data-sort-value="<?= htmlReady($course->start_semester->beginn) ?>">
<!-- neu -->
<button formaction="<?= $controller->link_for('file/choose_folder_from_course') ?>"
name="course_id"
......
......@@ -30,7 +30,7 @@
<?= $this->render_partial('file/_terms_of_use_select.php', [
'content_terms_of_use_entries' => $content_terms_of_use_entries,
'selected_terms_of_use_id' => $content_terms_of_use->id,
'selected_terms_of_use_id' => $content_terms_of_use->id ?? null,
]) ?>
<footer data-dialog-button>
......
......@@ -3,7 +3,7 @@
<div id="file_management_forms">
<form method="post" data-dialog class="default"
action="<?= $controller->action_link('edit_urlfile/' . $file_ref->id, ['from_plugin' => $from_plugin]) ?>">
action="<?= $controller->action_link('edit_urlfile/' . $file_ref->id, ['from_plugin' => $from_plugin ?? null]) ?>">
<?= CSRFProtection::tokenTag() ?>
<fieldset>
......
<form action="<?= $controller->link_for('file/update/' . $file->getId(), ['from_plugin' => $from_plugin]) ?>"
<form action="<?= $controller->link_for('file/update/' . $file->getId(), ['from_plugin' => $from_plugin ?? null]) ?>"
enctype="multipart/form-data" method="post" class="default">
<?= CSRFProtection::tokenTag() ?>
......
<tbody style="vertical-align: top;">
<? if ($th_title): ?>
<tr>
<th colspan="<?= 1 + count($structure) - ($structure['actions'] ? 1 : 0) ?>">
<th colspan="<?= 1 + count($structure) - (!empty($structure['actions']) ? 1 : 0) ?>">
<?= htmlReady($th_title) ?>
</th>
<? if (!empty($structure['actions'])): ?>
......
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