app/controllers/api/oauth.php

@@ -66,6 +66,12 @@ class Api_OauthController extends StudipController
 
         try {
             $consumer = RESTAPI\Consumer\Base::detectConsumer('oauth', 'request');
+            if (!$consumer) {
+                $this->response->set_status(400, 'No consumer detected');
+                $this->render_nothing();
+                return;
+            }
+
             if (Request::submitted('allow')) {
                 $result = $consumer->grantAccess($GLOBALS['user']->id);
 

app/controllers/avatar.php

@@ -27,7 +27,6 @@ class AvatarController extends AuthenticatedController
         if ($type == 'user') {
             PageLayout::setHelpKeyword('Basis.HomepageBild');
             PageLayout::setTitle(_('Profilbild ändern'));
-            SkipLinks::addIndex(_('Profilbild ändern'), 'edit_avatar');
 
             $has_perm = $GLOBALS['perm']->have_profile_perm('user', $id);
             $class = 'Avatar';
@@ -70,7 +69,6 @@ class AvatarController extends AuthenticatedController
         $this->avatar = $avatar->getURL($class::NORMAL);
         if ($avatar->is_customized()) {
             $this->customized = true;
-            SkipLinks::addIndex(_('Bild löschen'), 'delete_picture');
         }
 
         $this->type = $type;

app/controllers/blubber.php

@@ -406,7 +406,6 @@ class BlubberController extends AuthenticatedController
             $course = new Course();
             $course['name'] = Request::get('name');
             $course['status'] = array_shift($studgroup_sem_types);
-            $course['start_time'] = Semester::findCurrent()->beginn;
             $course->store();
 
             if ($_FILES['avatar'] && $_FILES['avatar']['error'] !== UPLOAD_ERR_NO_FILE) {

app/controllers/calendar/contentbox.php

@@ -143,7 +143,7 @@ class Calendar_ContentboxController extends StudipController {
             }
 
             if ($termin->getTitle()) {
-                $tmp_titel = htmlReady(mila($termin->getTitle())); //Beschneiden des Titels
+                $tmp_titel = mila($termin->getTitle()); //Beschneiden des Titels
                 $title .= ', ' . $tmp_titel;
             }
 

app/controllers/calendar/schedule.php

@@ -15,6 +15,10 @@
  * @category    Stud.IP
  * @since      2.0
  */
+
+// Needs to be required due to the use of constants
+require_once 'lib/classes/calendar/CalendarScheduleModel.php';
+
 class Calendar_ScheduleController extends AuthenticatedController
 {
 

app/controllers/cas.php

@@ -12,7 +12,7 @@
  * @category    Stud.IP
  */
 
-require_once 'app/controllers/studip_controller.php';
+require_once 'composer/jasig/phpcas/CAS.php';
 require_once 'lib/classes/cas/CAS_PGTStorage_Cache.php';
 
 class CasController extends StudipController

app/controllers/consultation/admin.php

@@ -26,6 +26,21 @@ class Consultation_AdminController extends ConsultationController
         $this->range_config = $this->range->getConfiguration();
 
         $this->setupSidebar($action, $this->range_config);
+
+        // Show information about which user is edited when a deputy edits
+        if ($this->range instanceof User && !$this->isOwnProfile()) {
+            $message = sprintf(
+                _('Daten von: %1$s (%2$s), Status: %3$s'),
+                htmlReady($this->range->getFullName()),
+                htmlReady($this->range->username),
+                htmlReady($this->range->perms)
+            );
+            PageLayout::postMessage(
+                MessageBox::info($message)
+                , 'settings-user-anncouncement'
+            );
+
+        }
     }
 
     private function groupSlots(array $slots)
@@ -442,7 +457,7 @@ class Consultation_AdminController extends ConsultationController
     {
         if ($what === 'messages') {
             // TODO: Applicable     everywhere?
-            $GLOBALS['user']->cfg->store(
+            $this->getUserConfig()->store(
                 'CONSULTATION_SEND_MESSAGES',
                 (bool) $state
             );
@@ -453,7 +468,7 @@ class Consultation_AdminController extends ConsultationController
                 (bool) $state
             );
         } elseif ($what === 'grouped') {
-            $GLOBALS['user']->cfg->store(
+            $this->getUserConfig()->store(
                 'CONSULTATION_SHOW_GROUPED',
                 (bool) $state
             );
@@ -685,7 +700,7 @@ class Consultation_AdminController extends ConsultationController
         }
 
         foreach ($slot_ids as $slot_id) {
-            list($block_id, $slot_id) = explode('-', $slot_id);
+            [$block_id, $slot_id] = explode('-', $slot_id);
             try {
                 if ($slot = $this->loadSlot($block_id, $slot_id)) {
                     $slots[$slot->id] = $slot;
@@ -733,7 +748,7 @@ class Consultation_AdminController extends ConsultationController
         $options = $sidebar->addWidget(new OptionsWidget());
         $options->addCheckbox(
             _('Benachrichtungen über Buchungen'),
-            $GLOBALS['user']->cfg->CONSULTATION_SEND_MESSAGES,
+            $this->getUserConfig()->getValue('CONSULTATION_SEND_MESSAGES'),
             $this->toggleURL('messages/1', $action === 'expired'),
             $this->toggleURL('messages/0', $action === 'expired')
         );
@@ -745,7 +760,7 @@ class Consultation_AdminController extends ConsultationController
         );
         $options->addCheckbox(
             _('Termine gruppiert anzeigen'),
-            $GLOBALS['user']->cfg->CONSULTATION_SHOW_GROUPED,
+            $this->getUserConfig()->getValue('CONSULTATION_SHOW_GROUPED'),
             $this->toggleURL('grouped/1', $action === 'expired'),
             $this->toggleURL('grouped/0', $action === 'expired')
         );
@@ -753,12 +768,12 @@ class Consultation_AdminController extends ConsultationController
         $export = $sidebar->addWidget(new ExportWidget());
         $export->addLink(
             _('Anmeldungen exportieren'),
-            $this->url_for('consultation/export/bookings'),
+            $this->url_for('consultation/export/bookings', $action === 'expired'),
             Icon::create('file-excel+export')
         );
         $export->addLink(
             _('Alle Termine exportieren'),
-            $this->url_for('consultation/export/all'),
+            $this->url_for('consultation/export/all', $action === 'expired'),
             Icon::create('file-excel+export')
         );
     }
@@ -774,4 +789,16 @@ class Consultation_AdminController extends ConsultationController
             Request::get("{$index}-time")
         ]));
     }
+
+    private function getUserConfig(): RangeConfig
+    {
+        return $this->range instanceof User
+             ? $this->range->getConfiguration()
+             : $GLOBALS['user']->cfg;
+    }
+
+    private function isOwnProfile()
+    {
+        return $this->range->username === $GLOBALS['user']->username;
+    }
 }

app/controllers/consultation/consultation_controller.php

@@ -12,7 +12,13 @@ abstract class ConsultationController extends AuthenticatedController
     {
         parent::before_filter($action, $args);
 
-        $this->range = Context::get() ?: User::findByUsername(Request::username('username', $GLOBALS['user']->username));
+        if (Request::submitted('username')) {
+            $this->range = User::findByUsername(Request::username('username'));
+        } elseif (Request::submitted('cid')) {
+            $this->range = Context::get();
+        } else {
+            $this->range = $GLOBALS['user']->getAuthenticatedUser();
+        }
 
         if ($this->range instanceof User) {
             URLHelper::addLinkParam('username', $this->range->username);

app/controllers/consultation/export.php

@@ -19,7 +19,7 @@ class Consultation_ExportController extends ConsultationController
         }
     }
 
-    public function bookings_action()
+    public function bookings_action(bool $expired = false)
     {
         $csv = [];
         $csv[] = [
@@ -32,7 +32,7 @@ class Consultation_ExportController extends ConsultationController
             _('Grund'),
         ];
 
-        $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC');
+        $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC', $expired);
         foreach ($blocks as $block) {
             foreach ($block->slots as $slot) {
                 foreach ($slot->bookings as $booking) {
@@ -52,7 +52,7 @@ class Consultation_ExportController extends ConsultationController
         $this->render_csv($csv, 'Terminvergabe-Anmeldungen-' . date('Ymd') . '.csv');
     }
 
-    public function all_action()
+    public function all_action(bool $expired = false)
     {
         $csv = [];
         $csv[] = [
@@ -65,7 +65,7 @@ class Consultation_ExportController extends ConsultationController
             _('Grund'),
         ];
 
-        $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC');
+        $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC', $expired);
         foreach ($blocks as $block) {
             foreach ($block->slots as $slot) {
                 $csv[] = [

app/controllers/consultation/overview.php

@@ -14,6 +14,10 @@ class Consultation_OverviewController extends ConsultationController
     {
         parent::before_filter($action, $args);
 
+        if ($this->range->isEditableByUser()) {
+            $this->redirect('consultation/admin');
+        }
+
         PageLayout::setTitle(sprintf(
             '%s: %s',
             $this->getConsultationTitle(),

app/controllers/contents/courseware.php

@@ -34,6 +34,12 @@ class Contents_CoursewareController extends AuthenticatedController
     {
         Navigation::activateItem('/contents/courseware/projects');
         $this->setProjectsSidebar($action);
+        $this->courseware_root = StructuralElement::getCoursewareUser($this->user->id);
+        if (!$this->courseware_root) {
+            // create initial courseware dataset
+            $new = StructuralElement::createEmptyCourseware($this->user->id, 'user');
+            $this->courseware_root = $new->getRoot();
+        }
 
         $this->elements = $this->getProjects('all');
     }
@@ -49,10 +55,10 @@ class Contents_CoursewareController extends AuthenticatedController
      */
     public function courseware_action($action = false, $widgetId = null)
     {
-        Navigation::activateItem('/contents/courseware/courseware');
-        $this->user_id = $GLOBALS['user']->id;
+        global $perm, $user;
 
-        $this->setCoursewareSidebar();
+        Navigation::activateItem('/contents/courseware/courseware');
+        $this->user_id = $user->id;
 
         $last = UserConfig::get($this->user_id)->getValue('COURSEWARE_LAST_ELEMENT');
 
@@ -65,12 +71,11 @@ class Contents_CoursewareController extends AuthenticatedController
         }
 
         // load courseware for current user
-        if (!$this->entry_element_id || !$struct || !$struct->canRead($GLOBALS['user'])) {
-            $user =  User::find($this->user_id);
+        if (!$this->entry_element_id || !$struct || !$struct->canRead($user)) {
 
             if (!$user->courseware) {
                 // create initial courseware dataset
-                StructuralElement::createEmptyCourseware($this->user_id, 'user');
+                $struct = StructuralElement::createEmptyCourseware($this->user_id, 'user');
             }
 
             $this->entry_element_id = $user->courseware->id;
@@ -85,9 +90,21 @@ class Contents_CoursewareController extends AuthenticatedController
             array_push($this->licenses, $license->toArray());
         }
         $this->licenses = json_encode($this->licenses);
+
+        $this->oer_enabled = Config::get()->OERCAMPUS_ENABLED && $perm->have_perm(Config::get()->OER_PUBLIC_STATUS);
+
+        // Make sure struct has value., to evaluate the export (edit) capability.
+        if (!isset($struct)) {
+            $struct = \Courseware\StructuralElement::findOneBySQL(
+                "id = ? AND range_id = ? AND range_type = 'user'",
+                [$this->entry_element_id, $this->user_id]
+            );
+        }
+        $canExport = !empty($struct) ? $struct->canEdit($user) : false;
+        $this->setCoursewareSidebar($canExport);
     }
 
-    private function setCoursewareSidebar()
+    private function setCoursewareSidebar(bool $canExport)
     {
         $sidebar = \Sidebar::Get();
         $actions = new TemplateWidget(
@@ -102,6 +119,13 @@ class Contents_CoursewareController extends AuthenticatedController
         );
         $sidebar->addWidget($views)->addLayoutCSSClass('courseware-view-widget');
 
+        if ($canExport) {
+            $exports = new TemplateWidget(
+                _('Export '),
+                $this->get_template_factory()->open('course/courseware/export_widget')
+            );
+            $sidebar->addWidget($exports)->addLayoutCSSClass('courseware-export-widget');
+        }
 
     }
 
@@ -187,27 +211,41 @@ class Contents_CoursewareController extends AuthenticatedController
         } else {
             $this->all_semesters = false;
         }
-        $params = [
-            'order_by'            => null,
-            'order'               => 'asc',
-            'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS,
-            'deputies_enabled'    => Config::get()->DEPUTIES_ENABLE,
-        ];
+        usort($this->semesters, function ($a, $b) {
+            if ($a->beginn === $b->beginn) {
+                return 0;
+            }
+            return ($a->beginn > $b->beginn) ? -1 : 1;
+        });
 
         $sem_courses  = MyRealmModel::getPreparedCourses($sem_key, $params);
 
-        $this->elements = [];
-
-        foreach ((array) $sem_courses as $sem_course) {
-            $course = reset($sem_course);
-            $element = StructuralElement::findOneBySQL('range_id = ? AND range_type = ?', array($course['seminar_id'], 'course'));
-            if($element) {
-                $element['payload'] = json_decode($element['payload'], true);
-                array_push($this->elements, $element);
+        $this->semesters = [];
+
+        if ($sem_courses) {
+            $i = 0;
+            foreach ($sem_courses as $sem) {
+                $this->semesters[$i]['semester_name'] = array_values($sem)[0]['start_semester'];
+                $this->semesters[$i]['coursewares'] = [];
+                $this->semesters[$i]['empty_courses'] = [];
+
+                foreach ($sem as $cid => $course) {
+                    $element = StructuralElement::getCoursewareCourse($cid);
+                    if($element) {
+                        $element['payload'] = json_decode($element['payload'], true);
+                        array_push($this->semesters[$i]['coursewares'], $element);
+                    } else {
+                        array_push($this->semesters[$i]['empty_courses'], $course);
+                    }
+                }
+                $i++;
             }
+        } else {
+            $semester = Semester::find($sem_key);
+            $this->semesters[0]['semester_name'] = $semester->name;
+            $this->semesters[0]['coursewares'] = [];
+            $this->semesters[0]['empty_courses'] = [];
         }
-
-        $this->empty_courses = empty($sem_courses);
     }
 
 

app/controllers/course/admission.php

@@ -405,6 +405,7 @@ class Course_AdmissionController extends AuthenticatedController
         $rule_types = AdmissionRule::getAvailableAdmissionRules(true);
         if (isset($rule_types[$type])) {
             $rule = new $type($rule_id);
+            $another_rule = null;
             if (isset($rule_types[$another_type])) {
                 $another_rule = new $another_type($another_rule_id);
             }
@@ -418,11 +419,16 @@ class Course_AdmissionController extends AuthenticatedController
                     return;
                 } else {
                     CSRFProtection::verifyUnsafeRequest();
-                    $rule->setAllData(Request::getInstance());
                     $errors = $rule->validate(Request::getInstance());
+                    if (empty($errors)) {
+                        $rule->setAllData(Request::getInstance());
+                    }
                     if ($another_rule) {
-                        $another_rule->setAllData(Request::getInstance());
-                        $errors = array_merge($errors, $another_rule->validate(Request::getInstance()));
+                        $another_errors = $another_rule->validate(Request::getInstance());
+                        if (empty($another_errors)) {
+                            $another_rule->setAllData(Request::getInstance());
+                        }
+                        $errors = array_merge($errors, $another_errors);
                     }
                     if (!mb_strlen(trim(Request::get('instant_course_set_name')))) {
                         $errors[] = _("Bitte geben Sie einen Namen für die Anmelderegel ein!");

app/controllers/course/basicdata.php

@@ -621,7 +621,7 @@ class Course_BasicdataController extends AuthenticatedController
                 if ($deputies_enabled) {
                     // Check whether chosen person is set as deputy
                     // -> delete deputy entry.
-                    $deputy = Deputy::find([$dozent, $course_id]);
+                    $deputy = Deputy::find([$course_id, $dozent]);
                     if ($deputy) {
                         $deputy->delete();
                     }
@@ -702,12 +702,12 @@ class Course_BasicdataController extends AuthenticatedController
             PageLayout::postError(_('Sie dürfen sich nicht selbst aus der Veranstaltung austragen.'));
         } else {
             $sem = Seminar::getInstance($course_id);
-            $deputy = Deputy::find([$deputy_id, $course_id]);
-            if ($deputy && $deputy->delete) {
+            $deputy = Deputy::find([$course_id, $deputy_id]);
+            if ($deputy && $deputy->delete()) {
                 // Remove user from subcourses as well.
-                if($sem->children) {
+                if (count($sem->children)) {
                     $children_ids = $sem->children->pluck('seminar_id');
-                    Deputy::deleteBySQL('user_id = ? AND range_id IN (?)', [$children_ids]);
+                    Deputy::deleteBySQL('user_id = ? AND range_id IN (?)', [$deputy_id, $children_ids]);
                 }
 
                 PageLayout::postSuccess(sprintf(
@@ -850,8 +850,8 @@ class Course_BasicdataController extends AuthenticatedController
                 $dozent->status = 'dozent';
                 $dozent->comment = '';
                 if ($dozent->store()) {
-                    $deputy = Deputy::find([$GLOBALS['user']->id, $course_id]);
-                    if($deputy) {
+                    $deputy = Deputy::find([$course_id, $GLOBALS['user']->id]);
+                    if ($deputy) {
                         $deputy->delete();
                     }
                     PageLayout::postSuccess(sprintf(_('Sie wurden als %s eingetragen.'),
@@ -903,4 +903,4 @@ class Course_BasicdataController extends AuthenticatedController
         }
         return $sem_types;
     }
-}
\ No newline at end of file
+}

app/controllers/course/change_view.php

@@ -33,7 +33,7 @@ class Course_ChangeViewController extends AuthenticatedController
     public function set_changed_view_action()
     {
         if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->course_id)) {
-            throw new Trails_Exception(400);
+            throw new AccessDeniedException();
         }
         $_SESSION["seminar_change_view_{$this->course_id}"] = 'autor';
         $this->relocate('course/overview');
@@ -47,13 +47,6 @@ class Course_ChangeViewController extends AuthenticatedController
      */
     public function reset_changed_view_action()
     {
-        /*
-         * We need to check the real database entry here because $perm would
-         * only return the simulated rights.
-         */
-        if (!CourseMember::findByCourseAndStatus($this->course_id, ['tutor', 'dozent'])) {
-            throw new Trails_Exception(400);
-        }
         unset($_SESSION["seminar_change_view_{$this->course_id}"]);
         $this->relocate('course/management');
     }

app/controllers/course/courseware.php

@@ -2,6 +2,7 @@
 
 use Courseware\StructuralElement;
 use Courseware\Instance;
+use Courseware\UserProgress;
 
 /**
  * @property ?string $entry_element_id
@@ -42,13 +43,14 @@ class Course_CoursewareController extends AuthenticatedController
             ]);
         }
 
-        // load courseware for seminar
+        // load courseware for course
         if (!$this->entry_element_id || !$struct || !$struct->canRead($GLOBALS['user'])) {
             $course = Course::find(Context::getId());
 
             if (!$course->courseware) {
                 // create initial courseware dataset
-                StructuralElement::createEmptyCourseware(Context::getId(), 'course');
+                $instance = StructuralElement::createEmptyCourseware(Context::getId(), 'course');
+                $struct = $instance->getRoot();
             }
 
             $this->entry_element_id = $course->courseware->id;
@@ -58,13 +60,22 @@ class Course_CoursewareController extends AuthenticatedController
         UserConfig::get($GLOBALS['user']->id)->store('COURSEWARE_LAST_ELEMENT', $last);
 
         Navigation::activateItem('course/courseware/content');
-        $this->setIndexSidebar();
-        $this->licenses = array();
-        $sorm_licenses = License::findBySQL("1 ORDER BY name ASC");
-        foreach($sorm_licenses as $license) {
+        $this->licenses = [];
+        $sorm_licenses = License::findBySQL('1 ORDER BY name ASC');
+        foreach ($sorm_licenses as $license) {
             array_push($this->licenses, $license->toArray());
         }
         $this->licenses = json_encode($this->licenses);
+
+        // Make sure struct has value., to evaluate the export (edit) capability.
+        if (!isset($struct)) {
+            $struct = StructuralElement::findOneBySQL("id = ? AND range_id = ? AND range_type = 'course'", [
+                $this->entry_element_id,
+                Context::getId(),
+            ]);
+        }
+        $canExport = !empty($struct) ? $struct->canEdit($GLOBALS['user']) : false;
+        $this->setIndexSidebar($canExport);
     }
 
     public function dashboard_action(): void
@@ -86,10 +97,9 @@ class Course_CoursewareController extends AuthenticatedController
         } else {
             Navigation::activateItem('course/courseware/manager');
         }
-
     }
 
-    private function setIndexSidebar(): void
+    private function setIndexSidebar(bool $canExport): void
     {
         $sidebar = Sidebar::Get();
         $actions = new TemplateWidget(
@@ -103,135 +113,171 @@ class Course_CoursewareController extends AuthenticatedController
             $this->get_template_factory()->open('course/courseware/view_widget')
         );
         $sidebar->addWidget($views)->addLayoutCSSClass('courseware-view-widget');
+
+        if ($canExport) {
+            $exports = new TemplateWidget(
+                _('Export '),
+                $this->get_template_factory()->open('course/courseware/export_widget')
+            );
+            $sidebar->addWidget($exports)->addLayoutCSSClass('courseware-export-widget');
+        }
     }
 
-    private function getProgressData(bool $course_progress = false): array
+    private function getProgressData(bool $showProgressForAllParticipants = false): iterable
     {
-        $data = [];
+        /** @var ?\Course $course */
+        $course = Context::get();
+        if (!$course || !$course->courseware) {
+            return [];
+        }
 
-        $cid = Context::getId();
+        $instance = new Instance($course->courseware);
+        $user = \User::findCurrent();
 
-        $elements = StructuralElement::findBySQL('range_id = ?', [$cid]);
+        $elements = $this->findElements($instance, $user);
+        $progress = $this->computeSelfProgresses($instance, $user, $elements, $showProgressForAllParticipants);
+        $progress = $this->computeCumulativeProgresses($instance, $elements, $progress);
 
-        foreach ($elements as $element) {
-            $el = [
-                'id' => $element->id,
-                'name' => $element->title,
-                'parent_id' => $element->parent->id,
-                'parent_name' => $element->parent->title,
-                'children' => $this->getChildren($element->children),
-            ];
-            $el['progress'] = $this->getProgress($element, $course_progress);
+        return $this->prepareProgressData($elements, $progress);
+    }
 
-            array_push($data, $el);
-        }
+    private function findElements(Instance $instance, User $user): iterable
+    {
+        $elements = $instance->getRoot()->findDescendants($user);
+        $elements[] = $instance->getRoot();
+
+        return array_combine(array_column($elements, 'id'), $elements);
+    }
 
-        //update children progress
-        foreach ($data as &$element) {
-            if (count($element['children'])) {
-                foreach ($element['children'] as &$child) {
-                    foreach ($data as $el) {
-                        if ($el['id'] == $child['id']) {
-                            $child['progress'] = $el['progress'];
-                        }
-                    }
+    private function computeChildrenOf(iterable &$elements): iterable
+    {
+        $childrenOf = [];
+        foreach ($elements as $elementId => $element) {
+            if ($element['parent_id']) {
+                if (!isset($childrenOf[$element['parent_id']])) {
+                    $childrenOf[$element['parent_id']] = [];
                 }
+                $childrenOf[$element['parent_id']][] = $elementId;
             }
         }
 
-        return $data;
+        return $childrenOf;
     }
 
-    private function getChildren($children): array
-    {
-        $data = [];
-        foreach ($children as $child) {
-            $el = [
-                'id' => $child->id,
-                'name' => $child->title,
+    private function computeSelfProgresses(
+        Instance $instance,
+        User $user,
+        iterable &$elements,
+        bool $showProgressForAllParticipants
+    ): iterable {
+        $progress = [];
+        /** @var \Course $course */
+        $course = $instance->getRange();
+        $allBlockIds = $instance->findAllBlocksGroupedByStructuralElementId(function ($row) {
+            return $row['id'];
+        });
+        $courseMemberIds = $showProgressForAllParticipants
+            ? array_column($course->getMembersWithStatus('autor'), 'user_id')
+            : [$user->getId()];
+
+        $sql =
+            'SELECT block_id, COUNT(grade) as count, SUM(grade) as grade ' .
+            'FROM cw_user_progresses ' .
+            'WHERE block_id IN (?) AND user_id IN (?) ' .
+            'GROUP BY block_id';
+        $userProgresses = \DBManager::get()->fetchGrouped($sql, [$allBlockIds, $courseMemberIds]);
+
+        foreach ($elements as $elementId => $element) {
+            $selfProgress = $this->getSelfProgresses($allBlockIds, $elementId, $userProgresses, $courseMemberIds);
+            $progress[$elementId] = [
+                'self' => $selfProgress['counter'] ? $selfProgress['progress'] / $selfProgress['counter'] : 1,
             ];
-            array_push($data, $el);
         }
 
-        return $data;
+        return $progress;
     }
 
-    private function getProgress(StructuralElement $element, bool $course_progress = false): array
-    {
-        $descendants = $element->findDescendants();
-        $count = count($descendants);
-        $progress = 0;
-        $own_progress = 0;
-        $course = Seminar::GetInstance(Context::getId());
-
-        foreach ($descendants as $el) {
-            $block = $this->getBlocks($el->id, $course_progress, $course);
-            if ($block['counter'] > 0) {
-                $progress += $block['progress'] / $block['counter'];
-            } else {
-                $progress += 1;
-            }
+    private function getSelfProgresses(
+        array &$allBlockIds,
+        string $elementId,
+        array &$userProgresses,
+        array &$courseMemberIds
+    ): array {
+        $blks = $allBlockIds[$elementId] ?: [];
+        if (!count($blks)) {
+            return [
+                'counter' => 0,
+                'progress' => 1,
+            ];
         }
 
-        $own_blocks = $this->getBlocks($element->id, $course_progress, $course);
-
-        if ($own_blocks['counter'] > 0) {
-            $own_progress = $own_blocks['progress'] / $own_blocks['counter'];
-        } else {
-            $own_progress = 1;
-        }
+        $data = [
+            'counter' => count($blks),
+            'progress' => 0,
+        ];
 
-        $count = count($descendants);
-        if ($count > 0) {
-            $progress = ($progress + $own_progress) / ($count + 1);
-        } else {
-            $progress = $own_progress;
+        $usersCounter = count($courseMemberIds);
+        foreach ($blks as $blk) {
+            $progresses = $userProgresses[$blk];
+            $usersProgress = $progresses['count'] ? (float) $progresses['sum'] : 0;
+            $data['progress'] += $usersProgress / $usersCounter;
         }
 
-        return ['total' => round($progress, 2) * 100, 'current' => round($own_progress, 2) * 100];
+        return $data;
     }
 
-    private function getBlocks(string $element_id, bool $course_progress = false, $course): array
+    private function computeCumulativeProgresses(Instance $instance, iterable &$elements, iterable &$progress): iterable
     {
-        $containers = Courseware\Container::findBySQL('structural_element_id = ?', [intval($element_id)]);
-        $blocks = [];
-        $blocks['counter'] = 0;
-        $blocks['progress'] = 0;
-        $users_counter = count($course->getMembersWithStatus('autor'));
-
-        foreach ($containers as $container) {
-            $counter = $container->countBlocks();
-            $blocks['counter'] += $counter;
-            if ($counter > 0) {
-                $blks = Courseware\Block::findBySQL('container_id = ?', [$container->id]);
-                foreach ($blks as $item) {
-                    if ($course_progress) {
-                        if ($users_counter > 0) {
-                            $progresses = Courseware\UserProgress::findBySQL('block_id = ?', [$item->id]);
-                            $users_progress = 0;
-                            foreach ($progresses as $prog) {
-                                if (array_key_exists($prog->user_id, $course->getMembersWithStatus('autor'))) {
-                                    $users_progress += $prog->grade;
-                                }
-                            }
-
-                            $blocks['progress'] += $users_progress / $users_counter;
-                        }
-                    } else {
-                        $progress = Courseware\UserProgress::findOneBySQL('user_id = ? and block_id = ?', [
-                            $GLOBALS['user']->id,
-                            $item->id,
-                        ]);
-                        $blocks['progress'] += $progress->grade;
-                    }
+        $childrenOf = $this->computeChildrenOf($elements);
+
+        // compute `cumulative` of each element
+        $visitor = function (&$progress, $element) use (&$childrenOf, &$elements, &$visitor) {
+            $elementId = $element->getId();
+            $numberOfNodes = 0;
+            $cumulative = 0;
+
+            // visit children first
+            if (isset($childrenOf[$elementId])) {
+                foreach ($childrenOf[$elementId] as $childId) {
+                    $visitor($progress, $elements[$childId]);
+                    $numberOfNodes += $progress[$childId]['numberOfNodes'];
+                    $cumulative += $progress[$childId]['cumulative'];
                 }
             }
+
+            $progress[$elementId]['cumulative'] = $cumulative + $progress[$elementId]['self'];
+            $progress[$elementId]['numberOfNodes'] = $numberOfNodes + 1;
+
+            return $progress;
+        };
+
+        $visitor($progress, $instance->getRoot());
+
+        return $progress;
+    }
+
+    private function prepareProgressData(iterable &$elements, iterable &$progress): iterable
+    {
+        $data = [];
+        foreach ($elements as $elementId => $element) {
+            $elementProgress = $progress[$elementId];
+            $cumulative = $elementProgress['cumulative'] / $elementProgress['numberOfNodes'];
+
+            $data[$elementId] = [
+                'id' => (int) $elementId,
+                'parent_id' => (int) $element['parent_id'],
+                'name' => $element['title'],
+                'progress' => [
+                    'cumulative' => round($cumulative, 2) * 100,
+                    'self' => round($elementProgress['self'], 2) * 100,
+                ],
+            ];
         }
 
-        return $blocks;
+        return $data;
     }
 
-    private function getChapterCounter(array $chapters): array
+    private function getChapterCounter(array &$chapters): array
     {
         $finished = 0;
         $started = 0;
@@ -239,13 +285,13 @@ class Course_CoursewareController extends AuthenticatedController
 
         foreach ($chapters as $chapter) {
             if ($chapter['parent_id'] != null) {
-                if ($chapter['progress']['current'] == 0) {
+                if ($chapter['progress']['self'] == 0) {
                     $ahead += 1;
                 }
-                if ($chapter['progress']['current'] > 0 && $chapter['progress']['current'] < 100) {
+                if ($chapter['progress']['self'] > 0 && $chapter['progress']['self'] < 100) {
                     $started += 1;
                 }
-                if ($chapter['progress']['current'] == 100) {
+                if ($chapter['progress']['self'] == 100) {
                     $finished += 1;
                 }
             }

app/controllers/course/details.php

@@ -205,7 +205,6 @@ class Course_DetailsController extends AuthenticatedController
 
             if ($GLOBALS['SessionSeminar'] === $this->course->id) {
                 Navigation::activateItem('/course/main/details');
-                SkipLinks::addIndex(Navigation::getItem('/course/main/details')->getTitle(), 'main_content', 100);
             } else {
                 $sidebarlink = true;
                 $enrolment_info = $this->sem->getEnrolmentInfo($GLOBALS['user']->id);

app/controllers/course/elearning.php

@@ -35,8 +35,8 @@ class Course_ElearningController extends AuthenticatedController
         PageLayout::setTitle(Context::getHeaderLine(). " - " . _("Lernmodule"));
 
         checkObject(); // do we have an open object?
-        checkObjectModule('elearning_interface');
-        object_set_visit_module('elearning_interface');
+        $module = checkObjectModule('ElearningInterface');
+        object_set_visit_module($module->getPluginId());
 
         $this->search_key = Request::get('search_key');
         $GLOBALS['search_key'] = $this->search_key;
@@ -147,7 +147,7 @@ class Course_ElearningController extends AuthenticatedController
             URLHelper::getURL('dispatch.php/elearning/my_accounts'),
             Icon::create('person')
         );
-        if (count($this->course_output['courses']))
+        if ($this->course_output['courses'])
             foreach ($this->course_output['courses'] as $course) {
                 $widget->addLink(
                     sprintf(_('Direkt zum Kurs in %s'), $course['cms_name']),

app/controllers/course/enrolment.php

@@ -124,7 +124,6 @@ class Course_EnrolmentController extends AuthenticatedController
                     } else {
                         $msg = _("Die Plätze in dieser Veranstaltung werden automatisch verteilt.");
                         if ($limit = $courseset->getAdmissionRule('LimitedAdmission')) {
-                            $msg_details[] = sprintf(_("Diese Veranstaltung gehört zu einem Anmeldeset mit %s Veranstaltungen. Sie können maximal %s davon belegen. Bei der Verteilung werden die von Ihnen gewünschten Prioritäten berücksichtigt."), count($courseset->getCourses()), $limit->getMaxNumber());
                             $this->user_max_limit = $limit->getMaxNumberForUser($user_id);
                             if (Config::get()->IMPORTANT_SEMNUMBER) {
                                 $order = "ORDER BY VeranstaltungsNummer, Name";
@@ -132,6 +131,14 @@ class Course_EnrolmentController extends AuthenticatedController
                                 $order = "ORDER BY Name";
                             }
                             $this->priocourses = Course::findMany($courseset->getCourses(), $order);
+                            if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+                                $this->priocourses = array_filter($this->priocourses,
+                                    function ($c) {
+                                        return $c->visible;
+                                    }
+                                );
+                            }
+                            $msg_details[] = sprintf(_("Diese Veranstaltung gehört zu einem Anmeldeset mit %s Veranstaltungen. Sie können maximal %s davon belegen. Bei der Verteilung werden die von Ihnen gewünschten Prioritäten berücksichtigt."), count($this->priocourses), $limit->getMaxNumber());
                             $this->user_prio = AdmissionPriority::getPrioritiesByUser($courseset->getId(), $user_id);
                             $this->max_limit = $limit->getMaxNumber();
                             $this->prio_stats = AdmissionPriority::getPrioritiesStats($courseset->getId());

app/controllers/course/files.php

@@ -26,6 +26,7 @@ class Course_FilesController extends AuthenticatedController
             throw new CheckObjectException(_('Es wurde keine passende Veranstaltung gefunden.'));
         }
         $this->course = Context::get();
+        object_set_visit_module($this->studip_module->getPluginId());
         $this->last_visitdate = object_get_visit($this->course->id, $this->studip_module->getPluginId());
 
         PageLayout::setHelpKeyword('Basis.Dateien');
@@ -34,13 +35,11 @@ class Course_FilesController extends AuthenticatedController
         Navigation::activateItem('/course/files');
 
         if (is_object($GLOBALS['user']) && $GLOBALS['user']->id !== 'nobody') {
+            $constraints = FileManager::getUploadTypeConfig($this->course->id);
+
             PageLayout::addHeadElement('script', ['type' => 'text/javascript'], sprintf(
                 'STUDIP.Files.setUploadConstraints(%s);',
-                json_encode([
-                    'filesize'   => $GLOBALS['UPLOAD_TYPES']['default']['file_sizes'][$GLOBALS['user']->perms],
-                    'type'       => $GLOBALS['UPLOAD_TYPES']['default']['type'],
-                    'file_types' => $GLOBALS['UPLOAD_TYPES']['default']['file_types'],
-                ])
+                json_encode($constraints)
             ));
         }
     }
@@ -196,6 +195,7 @@ class Course_FilesController extends AuthenticatedController
         $this->range_type = 'course';
         $this->show_default_sidebar = true;
         $this->form_action = $this->url_for('file/bulk/' . $folder->getId());
+        $this->enable_table_filter = true;
         $this->render_template('files/flat.php', $this->layout);
     }
 

app/controllers/course/lti.php

@@ -242,7 +242,7 @@ class Course_LtiController extends StudipController
         ]);
 
         foreach ($custom_parameters as $param) {
-            list($key, $value) = explode('=', $param);
+            list($key, $value) = explode('=', $param, 2);
             if (isset($value)) {
                 $lti_link->addCustomParameter(trim($key), trim($value));
             }
@@ -351,7 +351,7 @@ class Course_LtiController extends StudipController
         ]);
 
         foreach ($custom_parameters as $param) {
-            list($key, $value) = explode('=', $param);
+            list($key, $value) = explode('=', $param, 2);
             if (isset($value)) {
                 $lti_link->addCustomParameter(trim($key), trim($value));
             }
@@ -383,7 +383,7 @@ class Course_LtiController extends StudipController
                             'code' => 'studip.de',
                             'vendor_name' => ['default_value' => 'Stud.IP e.V.'],
                             'website' => 'https://www.studip.de/',
-                            'timestamp' => date(c)
+                            'timestamp' => date('c')
                         ]
                     ]
                 ],
@@ -391,7 +391,7 @@ class Course_LtiController extends StudipController
                     'service_owner_name' => ['default_value' => Config::get()->UNI_NAME_CLEAN],
                     'description' => ['default_value' => $GLOBALS['UNI_INFO']],
                     'support' => ['email' => $GLOBALS['UNI_CONTACT']],
-                    'timestamp' => date(c)
+                    'timestamp' => date('c')
                 ]
             ],
             'capability_offered' => [