Compare revisions

Jan-Hendrik Willms · Jan-Hendrik Willms · David Siegfried · Michaela Brückner · Jan-Hendrik Willms · Michaela Brückner
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1719,7 +1719,7 @@ class Admin_UserController extends AuthenticatedController
        )->asDialog();
        $actions->addLink(
            _('Konten zusammenführen'),
-            $this->url_for('admin/user/migrate/' . ((!empty($this->user) && is_array($this->user)) ? $this->user['user_id'] : '')),
+            $this->url_for('admin/user/migrate/' . (!empty($this->user['user_id']) ? $this->user['user_id'] : '')),
            Icon::create('community')
        );


--- a/app/controllers/course/dates.php
+++ b/app/controllers/course/dates.php
@@ -80,7 +80,10 @@ class Course_DatesController extends AuthenticatedController
            )->asDialog();
        }

-        if (Seminar::setInstance(new Seminar(Course::findCurrent()))->getSlotModule('documents') && CourseDateFolder::availableInRange(Course::findCurrent(), User::findCurrent()->id)) {
+        if (
+            Seminar::setInstance(new Seminar(Course::findCurrent()))->getSlotModule('documents')
+            && CourseDateFolder::availableInRange(Course::findCurrent(), User::findCurrent() ? User::findCurrent()->id : null)
+        ) {
            $actions->addLink(
                _('Sitzungsordner anlegen'),
                $this->url_for('course/dates/create_folders'),

--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -455,7 +455,7 @@ class Course_WikiController extends AuthenticatedController
        );
        $pageData = [
            'page_id' => $page->id,
-            'user_id' => $user->id
+            'user_id' => $user ? $user->id : null,
        ];
        $online_user = WikiOnlineEditingUser::findOneBySQL(
            '`page_id` = :page_id AND `user_id` = :user_id',
@@ -466,7 +466,7 @@ class Course_WikiController extends AuthenticatedController
        }
        $editingUsers = WikiOnlineEditingUser::countBySQL(
            "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
-            [$page->id, $user->id]
+            [$page->id, $user ? $user->id : null]
        );
        $online_user->editing = $editingUsers === 0 ? 1 : 0;
        $online_user->chdate = time();
@@ -635,7 +635,7 @@ class Course_WikiController extends AuthenticatedController
        $statement->execute([
            'range_id' => $this->range->id,
            'threshold' => $this->last_visit,
-            'me' => User::findCurrent()->id
+            'me' => User::findCurrent() ? User::findCurrent()->id : null
        ]);
        $this->num_entries = $statement->fetch(PDO::FETCH_COLUMN);
        $this->pagenumber = Request::int('page', 0);

--- a/app/controllers/oer/endpoints.php
+++ b/app/controllers/oer/endpoints.php
@@ -374,7 +374,7 @@ class Oer_EndpointsController extends StudipController

        header("Expires: Mon, 12 Dec 2001 08:00:00 GMT");
        header("Last-Modified: " . gmdate ("D, d M Y H:i:s") . " GMT");
-        if ($_SERVER['HTTPS'] == "on") {
+        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
            header("Pragma: public");
            header("Cache-Control: private");
        } else {

--- a/app/controllers/quicksearch.php
+++ b/app/controllers/quicksearch.php
@@ -94,7 +94,7 @@ class QuicksearchController extends AuthenticatedController
                if (!empty($result[3])) {
                    $formatted['item_description'] = sprintf('%s (%s)', $result[2], $result[3]);
                } else {
-                    $formatted['item_description'] = $result[2];
+                    $formatted['item_description'] = $result[2] ?? '';
                }
            } else if ($this->search instanceof SearchType) {
                 $formatted['item_name'] = $this->search->getAvatarImageTag($result[0], Avatar::SMALL, ['title' => '']) . $formatted['item_name'];

--- a/app/views/activityfeed/configuration.php
+++ b/app/views/activityfeed/configuration.php
@@ -15,7 +15,7 @@
            <? foreach ($provider as $prv_id => $prv_name) : ?>
            <label>
                <input type="checkbox" name="provider[<?= $context ?>][]" value="<?= htmlReady($prv_id) ?>"
-                    <?= empty($config) || (is_array($config[$context]) && in_array($prv_id, $config[$context])) ? 'checked' : ''?>>
+                    <?= empty($config) || (isset($config[$context]) && is_array($config[$context]) && in_array($prv_id, $config[$context])) ? 'checked' : ''?>>
                <?= htmlReady($prv_name) ?>
            </label>
            <? endforeach ?>

--- a/app/views/admin/autoinsert/manual.php
+++ b/app/views/admin/autoinsert/manual.php
@@ -114,14 +114,14 @@
                            <? foreach ($values[$type] as $key => $value): ?>
                                <? if (is_array($value)): ?>
                                    <option value="<?= $key ?>"
-                                            class="nested-item-header" <?= in_array($key, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($value['name']) ?></option>
+                                            class="nested-item-header" <?= in_array($key, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($value['name']) ?></option>
                                    <? foreach ($value['values'] as $k => $v): ?>
                                        <option value="<?= $k ?>"
-                                                class="nested-item" <?= in_array($k, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($v) ?></option>
+                                                class="nested-item" <?= in_array($k, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($v) ?></option>
                                    <? endforeach; ?>
                                <? else: ?>
                                    <option
-                                        value="<?= $key ?>" <?= in_array($key, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($value) ?></option>
+                                        value="<?= $key ?>" <?= in_array($key, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($value) ?></option>
                                <? endif ?>
                            <? endforeach; ?>
                        </select>

--- a/app/views/admin/cronjobs/logs/index.php
+++ b/app/views/admin/cronjobs/logs/index.php
@@ -135,7 +135,7 @@ use Studip\Button, Studip\LinkButton;
        <tfoot>
        <tr>
            <td colspan="6">
-                <select name="action" data-activates="button[name=bulk]">
+                <select name="action" data-activates="button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                    <option value="">- <?= _('Aktion auswählen') ?></option>
                    <option value="delete"><?= _('Löschen') ?></option>
                </select>

--- a/app/views/admin/cronjobs/schedules/index.php
+++ b/app/views/admin/cronjobs/schedules/index.php
@@ -23,7 +23,7 @@ use Studip\Button, Studip\LinkButton;
            <select name="filter[task_id]" id="task_id" class="submit-upon-select">
                <option value=""><?= _('Alle Cronjobs 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; ?>

--- a/app/views/admin/cronjobs/tasks/index.php
+++ b/app/views/admin/cronjobs/tasks/index.php
@@ -78,7 +78,7 @@ use Studip\Button;
        <tfoot>
            <tr>
                <td colspan="6">
-                    <select name="action" data-activates=".cronjobs button[name=bulk]">
+                    <select name="action" data-activates=".cronjobs button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                        <option value="">- <?= _('Aktion auswählen') ?></option>
                        <option value="activate"><?= _('Aktivieren') ?></option>
                        <option value="deactivate"><?= _('Deaktivieren') ?></option>

--- a/app/views/admin/user/edit.php
+++ b/app/views/admin/user/edit.php
@@ -344,7 +344,7 @@ use Studip\Button, Studip\LinkButton;

            <br>

-            <? if ($user->online->last_lifesign): ?>
+            <? if (!empty($user->online->last_lifesign)): ?>
                <abbr title="<?= strftime('%x %X', $user->online->last_lifesign) ?>">
                    <?= reltime($user->online->last_lifesign, true, 2) ?>
                </abbr>
@@ -434,7 +434,7 @@ use Studip\Button, Studip\LinkButton;
                    <?= sprintf(
                        '%s, %s, %s. %s',
                        htmlReady($usc->studycourse->name),
-                        htmlReady($usc->degree->name),
+                        htmlReady($usc->degree->name ?? _('Unbekannt')),
                        htmlReady($usc->semester),
                        _('Fachsemester')
                    ) ?>

--- a/app/views/calendar/schedule/_semester_chooser.php
+++ b/app/views/calendar/schedule/_semester_chooser.php
 <form method="post" class="default" action="<?= $controller->link_for(
    isset($inst_mode) && $inst_mode == true ? 'calendar/instschedule/index' : 'calendar/schedule/index'
 ) ?>">
-    <select name="semester_id" class="submit-upon-select">
+    <label for="semester_id" class="sr-only"><?= _('Angezeigtes Semester') ?></label>
+    <select name="semester_id" class="submit-upon-select" id="semester_id">
        <? foreach ($semesters as $semester) : ?>
            <? if ($semester['ende'] > time() - strtotime('1year 1day')) : ?>
                <option

--- a/app/views/contact/index.php
+++ b/app/views/contact/index.php
@@ -106,7 +106,7 @@
        <tfoot>
            <tr>
                <td colspan="5">
-                    <select name="action_contact" id="contact_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_contact" id="contact_action" aria-label="<?= _('Aktion auswählen') ?>">
                        <option value="">- <?= _('Aktion auswählen') ?></option>
                        <option value="remove"><?= $filter ? _('Kontakte aus Gruppe entfernen') : _('Kontakte entfernen') ?></option>
                    </select>

--- a/app/views/course/members/accepted_list.php
+++ b/app/views/course/members/accepted_list.php
@@ -153,7 +153,7 @@
        <tfoot>
            <tr>
                <td class="printhead" colspan="6">
-                    <select name="action_accepted" id="action_accepted" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_accepted" id="action_accepted" aria-label="<?= _('Aktion wählen') ?>">
                        <option value="">- <?= _('Aktion wählen') ?></option>
                        <option value="upgrade"><?= _('Akzeptieren') ?></option>
                        <option value="remove"><?= _('Austragen') ?></option>

--- a/app/views/course/members/autor_list.php
+++ b/app/views/course/members/autor_list.php
@@ -183,8 +183,8 @@
        <tfoot>
            <tr>
                <td colspan="<?= $cols_foot ?>">
-                    <select name="action_autor" id="action_autor" aria-label="<?= _('Aktion ausführen') ?>">
-                        <option value="">- <?= _('Aktion wählen') ?></option>
+                    <select name="action_autor" id="action_autor" aria-label="<?= _('Aktion auswählen') ?>">
+                        <option value="">- <?= _('Aktion auswählen') ?></option>
                    <? if($is_dozent) : ?>
                        <option value="upgrade">
                            <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['tutor'])) ?>

--- a/app/views/course/members/awaiting_list.php
+++ b/app/views/course/members/awaiting_list.php
@@ -139,8 +139,8 @@
        <tfoot>
            <tr>
                <td colspan="6">
-                    <select name="action_awaiting" id="action_awaiting" aria-label="<?= _('Aktion ausführen') ?>">
-                        <option value="">- <?= _('Aktion wählen') ?></option>
+                    <select name="action_awaiting" id="action_awaiting" aria-label="<?= _('Aktion auswählen') ?>">
+                        <option value="">- <?= _('Aktion auswählen') ?></option>
                        <option value="upgrade_autor">
                            <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['autor'])) ?>
                        </option>

--- a/app/views/course/members/tutor_list.php
+++ b/app/views/course/members/tutor_list.php
@@ -163,7 +163,7 @@
        <tfoot>
            <tr>
                <td colspan="6">
-                    <select name="action_tutor" id="tutor_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_tutor" id="tutor_action" aria-label="<?= _('Aktion auswählen') ?>">
                        <option value="">- <?= _('Aktion auswählen') ?></option>
                        <option value="downgrade"><?= sprintf(_('Zu %s herunterstufen'), htmlReady($status_groups['autor'])) ?></option>
                        <option value="remove"><?= _('Austragen') ?></option>

--- a/app/views/course/members/user_list.php
+++ b/app/views/course/members/user_list.php
@@ -154,7 +154,7 @@
        <tfoot>
            <tr>
                <td colspan="6">
-                    <select name="action_user" id="user_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_user" id="user_action" aria-label="<?= _('Aktion auswählen') ?>">
                        <option value="">- <?= _('Aktion auswählen') ?></option>
                        <option value="upgrade">
                            <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['autor'])) ?>

--- a/app/views/file/choose_destination.php
+++ b/app/views/file/choose_destination.php
@@ -33,7 +33,7 @@ $options = array_filter([
                <?= Icon::create('folder-parent', Icon::ROLE_CLICKABLE)->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . $parent_folder->getId()), 'to_plugin' => $options['from_plugin'] ?? null]) ?>
                <button
                    class="undecorated"
-                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin'] ?? null) ?>"<? endif; ?>
+                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if (!empty($options['from_plugin'])): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin']) ?>"<? endif; ?>
                    data-dialog="size=medium">
                    <?= _('Aktueller Ordner') ?>
                </button>

--- a/app/views/messages/write.php
+++ b/app/views/messages/write.php
@@ -7,7 +7,11 @@
    <fieldset>
        <legend><?= _('Neue Nachricht') ?></legend>
    <div class="message-user-list">
-        <label><?= _("An") ?></label>
+        <label>
+            <span class="required">
+                <?= _("An") ?>
+            </span>
+        </label>
        <ul class="list-csv" id="adressees">
            <li id="template_adressee" style="display: none;" class="adressee">
                <input type="hidden" name="message_to[]" value="">
@@ -51,7 +55,9 @@
    </div>
    <div>
        <label>
-            <?= _("Betreff") ?>
+            <span class="required">
+                <?= _("Betreff") ?>
+            </span>
            <input type="text" name="message_subject" required value="<?= htmlReady($default_message['subject']) ?>">
        </label>
    </div>
No results found