make semester and semtype condition optional, fixes #145

Closes #145

Merge request studip/studip!1063

app/controllers/course/members.php

@@ -451,26 +451,23 @@ class Course_MembersController extends AuthenticatedController
             global $perm;
             if ($perm->have_perm('root')) {
                 $parameters = [
-                    'semtypes' => studygroup_sem_types() ?: [],
+                    'semtypes' => studygroup_sem_types() ?: null,
                     'exclude' => [Context::getId()],
-                    'semesters' => array_map(function ($s) { return $s->semester_id; }, Semester::getAll())
                 ];
             } else if ($perm->have_perm('admin')) {
                 $parameters = [
-                    'semtypes' => studygroup_sem_types() ?: [],
+                    'semtypes' => studygroup_sem_types() ?: null,
                     'institutes' => array_map(function ($i) {
                         return $i['Institut_id'];
                     }, Institute::getMyInstitutes()),
                     'exclude' => [Context::getId()],
-                    'semesters' => array_map(function ($s) { return $s->semester_id; }, Semester::getAll())
                 ];
 
             } else {
                 $parameters = [
                     'userid' => $GLOBALS['user']->id,
-                    'semtypes' => studygroup_sem_types() ?: [],
+                    'semtypes' => studygroup_sem_types() ?: null,
                     'exclude' => [Context::getId()],
-                    'semesters' => array_map(function ($s) { return $s->semester_id; }, Semester::getAll())
                 ];
             }
             $coursesearch = MyCoursesSearch::get('Seminar_id', $GLOBALS['perm']->get_perm(), $parameters);

app/controllers/wiki.php

@@ -269,12 +269,6 @@ class WikiController extends AuthenticatedController
             );
         }
 
-        $all_semesters = Semester::getAll();
-        $all_semester_ids = [];
-        foreach ($all_semesters as $semester) {
-            $all_semester_ids[] = $semester->id;
-        }
-
         $this->course_search = new QuickSearch(
             'selected_course_id',
             new MyCoursesSearch(
@@ -282,9 +276,7 @@ class WikiController extends AuthenticatedController
                 $GLOBALS['perm']->get_perm(),
                 [
                     'userid'    => $GLOBALS['user']->id,
-                    'semtypes'  => [],
                     'exclude'   => [$course_id],
-                    'semesters' => $all_semester_ids,
                 ],
                 's.`Seminar_id` IN (
                     SELECT range_id FROM wiki

lib/classes/searchtypes/MyCoursesSearch.class.php

@@ -189,11 +189,17 @@ class MyCoursesSearch extends StandardSearch
     {
         $conditions = [
             '(s.`VeranstaltungsNummer` LIKE :input OR s.`Name` LIKE :input)',
-            's.`status` NOT IN (:semtypes)',
             's.`Seminar_id` NOT IN (:exclude)',
-            'semester_data.`semester_id` IN (:semesters)'
         ];
 
+        if (isset($this->parameters['semtypes'])) {
+            $conditions[] = 's.`status` NOT IN (:semtypes)';
+        }
+
+        if (isset($this->parameters['semesters'])) {
+            $conditions[] = 'semester_data.`semester_id` IN (:semesters)';
+        }
+
         if ($this->additional_sql_conditions) {
             $conditions[] = $this->additional_sql_conditions;
         }