Fix tracking

Author: justusdieckmann

classes/readtracking.php

@@ -470,18 +470,29 @@ public static function get_untracked_moodleoverflows($userid, $courseid) {
      *
      * @return int|mixed
      */
-    public static function moodleoverflow_count_unread_posts_moodleoverflow($cm, $course) {
+    public static function moodleoverflow_count_unread_posts_moodleoverflow($cm) {
         global $DB, $USER;
 
-        // Get the moodleoverflow ids.
-        $moodleoverflowid = $cm->instance;
-
+        $moodleoverflow = $DB->get_record_sql("SELECT m.*, tm.id as hasdisabledtracking " .
+                "FROM {moodleoverflow} m " .
+                "LEFT JOIN {moodleoverflow_tracking} tm ON m.id = tm.moodleoverflowid AND tm.userid = :userid " .
+                "WHERE m.id = :moodleoverflowid", ['userid' => $USER->id, 'moodleoverflowid' => $cm->instance]);
+
+        // Return if tracking is off, or ((optional or forced, but forced disallowed by admin) and user has disabled tracking).
+        if ($moodleoverflow->trackingtype == MOODLEOVERFLOW_TRACKING_OFF || (
+                        ($moodleoverflow->trackingtype == MOODLEOVERFLOW_TRACKING_OPTIONAL || (
+                                        $moodleoverflow->trackingtype == MOODLEOVERFLOW_TRACKING_FORCED &&
+                                        !get_config('moodleoverflow', 'allowforcedreadtracking')
+                                )
+                        ) && $moodleoverflow->hasdisabledtracking)) {
+            return 0;
+        }
         // Get the current timestamp and the cutoffdate.
-        $now        = round(time(), -2);
+        $now = round(time(), -2);
         $cutoffdate = $now - (get_config('moodleoverflow', 'oldpostdays') * 24 * 60 * 60);
 
         // Define a sql-query.
-        $params = array($USER->id, $moodleoverflowid, $cutoffdate);
+        $params = array($USER->id, $cm->instance, $cutoffdate);
         $sql    = "SELECT COUNT(p.id)
                   FROM {moodleoverflow_posts} p
                   JOIN {moodleoverflow_discussions} d ON p.discussion = d.id

index.php

@@ -251,8 +251,7 @@
                 if (isset($untracked[$moodleoverflow->id])) {
                     $unreadlink = '-';
 
-                } else if ($unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm,
-                    $course)
+                } else if ($unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm)
                 ) {
                     // There are unread posts in the moodleoverflow instance.
 

lib.php

@@ -1078,8 +1078,7 @@ function moodleoverflow_cm_info_view(cm_info $cm) {
 
     $cantrack = \mod_moodleoverflow\readtracking::moodleoverflow_can_track_moodleoverflows();
     if ($cantrack) {
-        $unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm,
-            $cm->get_course());
+        $unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm);
         if ($unread) {
             $out = '<span class="unread"> <a href="' . $cm->url . '">';
             if ($unread == 1) {