From c724c3fd709a39e7df89b2d9539c601c9e350874 Mon Sep 17 00:00:00 2001 From: Sebastian Schenk Date: Fri, 11 Aug 2023 15:11:12 +0200 Subject: hide unlicensed files from messages, biest #3026 --- lib/models/FileRef.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/models/FileRef.php b/lib/models/FileRef.php index fe878a8..22a2577 100644 --- a/lib/models/FileRef.php +++ b/lib/models/FileRef.php @@ -589,7 +589,7 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange protected static function getUploadedFilesSql($user_id, $begin = null, $end = null, $course_id = '', $unknown_license_only = false, $file_limit = 0, $file_offset = 0) { $sql = ''; - if ($course_id) { + if ($course_id || $unknown_license_only) { $sql = 'INNER JOIN `folders` ON `file_refs`.`folder_id` = `folders`.`id` WHERE '; @@ -599,10 +599,13 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange 'user_id' => $user_id ]; if ($unknown_license_only) { - $sql .= " AND ( + $sql .= " AND ( ( `file_refs`.`content_terms_of_use_id` IN ('', 'UNDEF_LICENSE') OR `file_refs`.`content_terms_of_use_id` IS NULL + ) AND ( + `folders`.`range_type` != 'message' + ) )"; } -- cgit v1.0