diff options
| author | Peter Thienel <thienel@data-quest.de> | 2024-05-29 15:35:25 +0000 |
|---|---|---|
| committer | Peter Thienel <thienel@data-quest.de> | 2024-05-29 15:35:25 +0000 |
| commit | b506b133d371742ef23b3a22cc1c6bb20c860d40 (patch) | |
| tree | 4e2461ed1fb0e8c51ed4687bafddf0c10b2a349a | |
| parent | a01e9fc71e4eea50f357fc2fa9ccdfa1388972f2 (diff) | |
Resolve "Externe Seiten: Die Sichbarkeit von Veranstaltungen wird an weiteren Stellen nicht berücksichtigt"
Closes #4231
Merge request studip/studip!3063
| -rw-r--r-- | lib/extern/ExternPagePersBrowse.php | 3 | ||||
| -rw-r--r-- | lib/extern/ExternPagePersonDetails.php | 3 | ||||
| -rw-r--r-- | lib/extern/ExternPageTimetable.php | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/extern/ExternPagePersBrowse.php b/lib/extern/ExternPagePersBrowse.php index ceb72d5..1eb5a04 100644 --- a/lib/extern/ExternPagePersBrowse.php +++ b/lib/extern/ExternPagePersBrowse.php @@ -32,7 +32,7 @@ class ExternPagePersBrowse extends ExternPage /** * @see ExternPage::getDataFields() - + * @param array $classes * @return array */ @@ -343,6 +343,7 @@ class ExternPagePersBrowse extends ExternPage LEFT JOIN auth_user_md5 aum ON su.user_id = aum.user_id WHERE ui.Institut_id = ? AND su.status = 'dozent' + AND s.visible = 1 AND ui.externdefault = 1 AND " . get_ext_vis_query() . " AND ui.inst_perms = 'dozent' diff --git a/lib/extern/ExternPagePersonDetails.php b/lib/extern/ExternPagePersonDetails.php index 8fb6540..a62d482 100644 --- a/lib/extern/ExternPagePersonDetails.php +++ b/lib/extern/ExternPagePersonDetails.php @@ -146,7 +146,8 @@ class ExternPagePersonDetails extends ExternPage LEFT JOIN `seminar_user` USING(`seminar_id`) LEFT JOIN `sem_types` ON `sem_types`.`id` = `seminare`.`status` - WHERE `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`) + WHERE `seminare`.`visible` = 1 + AND `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`) AND `seminar_user`.`user_id` = :user_id AND `seminar_user`.`status` = 'dozent' AND `sem_types`.`class` IN (:semclasses)"; diff --git a/lib/extern/ExternPageTimetable.php b/lib/extern/ExternPageTimetable.php index 5d8dfd9..1e0e66a 100644 --- a/lib/extern/ExternPageTimetable.php +++ b/lib/extern/ExternPageTimetable.php @@ -119,7 +119,11 @@ class ExternPageTimetable extends ExternPage LEFT JOIN `seminar_inst` ON `seminare`.`Seminar_id` = `seminar_inst`.`Seminar_id`"; $query .= " - WHERE (`termine`.`date` >= :start AND `termine`.`date` <= :end) " + WHERE ( + `seminare`.`visible` = 1 + AND termine`.`date` >= :start + AND `termine`.`date` <= :end + )" . $this->getEventTypeSQL($params) . $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids) . $this->getInstitutesSQL($params) |