Merge branch 'MOODLE_500_STABLE'

mkemmerling · mkemmerling · commit 04e313e72b98 · 2026-01-19T12:58:30.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+
+5.0.1 (2025-09-29)
+-------------------
+* [BUG] #8534 - fix incorrect usage of deprecated.txt
+* [BUG] #8535 - add missing privacy provider table coverage for table publication_overrides
+* [BUG] #8551 - remove table borders in Moodle ≥ 5.0 - github pull request #102 - lucaboesch
+
 5.0.0 (2025-06-11)
 -------------------
 * Moodle 5.0.0 compatible version
diff --git a/classes/local/allfilestable/base.php b/classes/local/allfilestable/base.php
@@ -645,7 +645,7 @@ public function col_timemodified($values) {
         list(, $files, ) = $this->get_files($values->id);
 
         $filetable = new \html_table();
-        $filetable->attributes = ['class' => 'filetable'];
+        $filetable->attributes = ['class' => 'filetable table-reboot'];
 
         foreach ($files as $file) {
             if (has_capability('mod/publication:approve', $this->context)
@@ -682,7 +682,7 @@ public function col_files($values) {
         list(, $files, ) = $this->get_files($values->id);
         global $OUTPUT;
         $filetable = new \html_table();
-        $filetable->attributes = ['class' => 'filetable'];
+        $filetable->attributes = ['class' => 'filetable table-reboot'];
 
         foreach ($files as $file) {
             if ((has_capability('mod/publication:approve', $this->context))
@@ -720,7 +720,7 @@ public function col_studentapproval($values) {
         list(, $files, ) = $this->get_files($values->id);
 
         $table = new \html_table();
-        $table->attributes = ['class' => 'statustable'];
+        $table->attributes = ['class' => 'statustable table-reboot'];
 
         foreach ($files as $file) {
             if (has_capability('mod/publication:approve', $this->context)
@@ -797,7 +797,7 @@ public function col_visibleforstudents($values) {
         list(, $files, ) = $this->get_files($values->id);
 
         $table = new \html_table();
-        $table->attributes = ['class' => 'statustable'];
+        $table->attributes = ['class' => 'statustable table-reboot'];
 
         foreach ($files as $file) {
             if ($this->publication->has_filepermission($file->get_id())) {
@@ -826,7 +826,7 @@ public function col_publicationstatus($values) {
         list(, $files, ) = $this->get_files($values->id);
 
         $table = new \html_table();
-        $table->attributes = ['class' => 'statustable'];
+        $table->attributes = ['class' => 'statustable table-reboot'];
 
         foreach ($files as $file) {
             $row = [];
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -83,6 +83,16 @@ public static function get_metadata(collection $collection): collection {
         $collection->add_database_table('publication_file', $publicationfile, 'privacy:metadata:files');
         $collection->add_database_table('publication_groupapproval', $publicationgroupapproval, 'privacy:metadata:groupapproval');
 
+        $publicationoverrides = [
+                'userid' => 'privacy:metadata:userid',
+                'groupid' => 'privacy:metadata:groupid',
+                'allowsubmissionsfromdate' => 'privacy:metadata:allowsubmissionsfromdate',
+                'duedate' => 'privacy:metadata:duedate',
+                'approvalfromdate' => 'privacy:metadata:approvalfromdate',
+                'approvaltodate' => 'privacy:metadata:approvaltodate',
+        ];
+        $collection->add_database_table('publication_overrides', $publicationoverrides, 'privacy:metadata:overrides');
+
         $collection->add_user_preference('publication_perpage', 'privacy:metadata:publicationperpage');
 
         // Link to subplugins.
@@ -107,6 +117,7 @@ public static function get_contexts_for_userid(int $userid): contextlist {
                 'guserid' => $userid,
                 'extuserid' => $userid,
                 'fuserid' => $userid,
+                'ovruserid' => $userid,
         ];
 
         $enroled = enrol_get_all_users_courses($userid);
@@ -138,13 +149,15 @@ public static function get_contexts_for_userid(int $userid): contextlist {
 LEFT JOIN {publication_extduedates} ext ON p.id = ext.publication
 LEFT JOIN {publication_file} f ON p.id = f.publication
 LEFT JOIN {publication_groupapproval} ga ON f.id = ga.fileid
+LEFT JOIN {publication_overrides} po ON p.id = po.publication
 LEFT JOIN {assign} a ON p.importfrom = a.id
 LEFT JOIN {groups} g ON g.courseid = p.course
 LEFT JOIN {groups_members} gm ON g.id = gm.groupid AND gm.userid = :guserid
     WHERE ((p.importfrom > 0 AND a.teamsubmission > 0)
            AND ((gm.userid = :userid AND (ext.userid = gm.groupid OR f.userid = gm.groupid))
                OR (gm.userid IS NULL AND f.userid = 0 AND a.preventsubmissionnotingroup = 0 AND g.courseid $enrolsql)))
-           OR ((p.importfrom <= 0 OR a.teamsubmission = 0) AND (ext.userid = :extuserid OR f.userid = :fuserid))";
+           OR ((p.importfrom <= 0 OR a.teamsubmission = 0) AND (ext.userid = :extuserid OR f.userid = :fuserid))
+           OR (po.userid = :ovruserid OR po.groupid = gm.groupid)";
         $contextlist = new contextlist();
         $contextlist->add_from_sql($sql, $params);
 
@@ -227,6 +240,27 @@ public static function get_users_in_context(userlist $userlist) {
                   JOIN {publication_groupapproval} ga ON p.id = ga.fileid
                  WHERE ctx.id = :contextid AND ctx.contextlevel = :contextlevel";
         $userlist->add_from_sql('userid', $sql, $params);
+
+        // Get all users with user-specific overrides.
+        $sql = "SELECT po.userid
+                  FROM {context} ctx
+                  JOIN {course_modules} cm ON cm.id = ctx.instanceid
+                  JOIN {modules} m ON m.id = cm.module AND m.name = :modulename
+                  JOIN {publication} p ON p.id = cm.instance
+                  JOIN {publication_overrides} po ON po.publication = p.id
+                 WHERE ctx.id = :contextid AND ctx.contextlevel = :contextlevel AND po.userid IS NOT NULL";
+        $userlist->add_from_sql('userid', $sql, $params);
+
+        // Get all users who belong to a group with an override.
+        $sql = "SELECT gm.userid
+                  FROM {context} ctx
+                  JOIN {course_modules} cm ON cm.id = ctx.instanceid
+                  JOIN {modules} m ON m.id = cm.module AND m.name = :modulename
+                  JOIN {publication} p ON p.id = cm.instance
+                  JOIN {publication_overrides} po ON po.publication = p.id
+                  JOIN {groups_members} gm ON gm.groupid = po.groupid
+                 WHERE ctx.id = :contextid AND ctx.contextlevel = :contextlevel AND po.groupid IS NOT NULL";
+        $userlist->add_from_sql('userid', $sql, $params);
     }
 
     /**
@@ -261,9 +295,11 @@ public static function delete_data_for_users(approved_userlist $userlist) {
 
                 list($usersql, $userparams) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED, 'usr');
 
-                // Delete users' files, extended due dates and groupapprovals for this publication!
+                // Delete users' files, extended due dates, overrides and groupapprovals for this publication!
                 $DB->delete_records_select('publication_extduedates', "publication = :id AND userid ".$usersql,
                         ['id' => $id] + $userparams);
+                $DB->delete_records_select('publication_overrides', "publication = :id AND userid ".$usersql,
+                        ['id' => $id] + $userparams);
                 $files = $DB->get_records_select('publication_file', "publication = :id AND userid ".$usersql,
                         ['id' => $id] + $userparams);
 
@@ -344,6 +380,7 @@ public static function export_user_data(approved_contextlist $contextlist) {
             static::export_user_preferences($user->id);
             static::export_extensions($context, $publication, $user);
             static::export_files($context, $publication, $user, []);
+            static::export_overrides($context, $publication, $user);
         }
     }
 
@@ -395,6 +432,60 @@ public static function export_extensions(\context $context, \publication $pub, \
         }
     }
 
+    /**
+     * Export publication overrides relevant to this user (user and group-based).
+     *
+     * @param  \context $context Context
+     * @param  \publication $pub The publication object.
+     * @param  \stdClass $user The user object.
+     * @throws \dml_exception
+     */
+    protected static function export_overrides(\context $context, \publication $pub, \stdClass $user) {
+        global $DB;
+
+        $publicationid = $pub->get_instance()->id;
+        $courseid = $pub->get_instance()->course;
+
+        // User-specific overrides.
+        $overrides = $DB->get_records('publication_overrides', [
+                'publication' => $publicationid,
+                'userid' => $user->id,
+        ]);
+
+        // Group-based overrides for any of user's groups in this course.
+        $groups = groups_get_user_groups($courseid, $user->id);
+        $groupids = [];
+        if (!empty($groups) && isset($groups[0]) && is_array($groups[0])) {
+            $groupids = $groups[0];
+        }
+        if (!empty($groupids)) {
+            list($insql, $inparams) = $DB->get_in_or_equal($groupids, SQL_PARAMS_NAMED, 'grp');
+            $sql = "SELECT * FROM {publication_overrides} WHERE publication = :publication AND groupid " . $insql;
+            $recs = $DB->get_records_sql($sql, ['publication' => $publicationid] + $inparams);
+            $overrides = $overrides + $recs;
+        }
+
+        foreach ($overrides as $ovr) {
+            $data = (object)[
+                    'userid' => $ovr->userid,
+                    'groupid' => $ovr->groupid,
+            ];
+            if (!is_null($ovr->allowsubmissionsfromdate) && $ovr->allowsubmissionsfromdate != 0) {
+                $data->allowsubmissionsfromdate = transform::datetime($ovr->allowsubmissionsfromdate);
+            }
+            if (!is_null($ovr->duedate) && $ovr->duedate != 0) {
+                $data->duedate = transform::datetime($ovr->duedate);
+            }
+            if (!is_null($ovr->approvalfromdate) && $ovr->approvalfromdate != 0) {
+                $data->approvalfromdate = transform::datetime($ovr->approvalfromdate);
+            }
+            if (!is_null($ovr->approvaltodate) && $ovr->approvaltodate != 0) {
+                $data->approvaltodate = transform::datetime($ovr->approvaltodate);
+            }
+            writer::with_context($context)->export_data([], $data);
+        }
+    }
+
     /**
      * Fetches all of the user's files and adds them to the export
      *
@@ -647,6 +738,7 @@ public static function delete_data_for_all_users_in_context(\context $context) {
                 }
 
                 $DB->delete_records('publication_extduedates', ['publication' => $id]);
+                $DB->delete_records('publication_overrides', ['publication' => $id]);
             }
         }
     }
@@ -736,6 +828,7 @@ public static function delete_data_for_user(approved_contextlist $contextlist) {
             }
 
             $DB->delete_records('publication_extduedates', ['publication' => $pub->id, 'userid' => $user->id]);
+            $DB->delete_records('publication_overrides', ['publication' => $pub->id, 'userid' => $user->id]);
         }
     }
 }
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
@@ -1,26 +1,5 @@
-requiremodintro,mod_publication
-configrequiremodintro,mod_publication
-configobtainteacherapproval,mod_publication
-configobtainstudentapproval,mod_publication
-notice_uploadrequireapproval,mod_publication
-notice_uploadnoapproval,mod_publication
-notice_groupimportrequireallapproval,mod_publication
-notice_groupimportrequireoneapproval,mod_publication
-notice_groupappovalnotrequired,mod_publication
-notice_studentappovalrequired,mod_publication
-notice_studentappovalnotrequired,mod_publication
-notice_importrequireapproval,mod_publication
-notice_importnoapproval,mod_publication
 notice_obtainteacherapproval_studentsapproval,mod_publication
 notice_obtainapproval_import_both,mod_publication
 notice_obtainapproval_import_studentonly,mod_publication
 notice_obtainapproval_upload_teacher,mod_publication
 notice_obtainapproval_upload_automatic,mod_publication
-warning_changefromobtainteacherapproval,mod_publication
-warning_changetoobtainteacherapproval,mod_publication
-warning_changefromobtainstudentapproval,mod_publication
-warning_changetoobtainstudentapproval,mod_publication
-emailteachermail,mod_publication
-emailteachermailhtml,mod_publication
-emailstudentsmail,mod_publication
-emailstudentsmailhtml,mod_publication
diff --git a/lang/en/publication.php b/lang/en/publication.php
@@ -223,6 +223,7 @@
 $string['pending'] = 'Pending';
 $string['pluginadministration'] = 'Student folder administration';
 $string['pluginname'] = 'Student folder';
+$string['privacy:extensionduedate'] = 'Extension due date';
 $string['privacy:metadata:approval'] = 'Whether the group member has approved or rejected for publication.';
 $string['privacy:metadata:contenthash'] = 'SHA1 hash of the file\'s content, used to determine if the file changed.';
 $string['privacy:metadata:extduedates'] = 'Stores information about overridden/extended due dates for mod_publication.';
diff --git a/version.php b/version.php
@@ -28,8 +28,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2025061100;
+$plugin->version  = 2025061101;
 $plugin->requires = 2025041400;
 $plugin->component = 'mod_publication';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release  = "v5.0.0";
+$plugin->release  = "v5.0.1";
