Changeset 1311 in ExiteCMS for trunk/forum/index.php

Timestamp:

02/27/08 11:25:49 (4 years ago)

Author:

hverton

Message:

added the new thread_first_read field to all posts unread queries, to get a more accurante unread posts number

File:

• trunk/forum/index.php (modified) (1 diff)

trunk/forum/index.php

@@ -81 +81 @@
     if (iMEMBER) {
         if ($userdata['user_posts_unread']) {
-            // include the users own posts
-            $result2 = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['forum_id']."' AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].") AND (p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)", false);
+            $result = dbquery("
+                SELECT count(*) as unread 
+                    FROM ".$db_prefix."posts p 
+                        LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    WHERE tr.user_id = '".$userdata['user_id']."' 
+                        AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                        AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                            OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                );
         } else {
-            // filter the users own posts
-            $result2 = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['forum_id']."' AND p.post_author != '".$userdata['user_id']."' AND p.post_edituser != '".$userdata['user_id']."' AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].") AND (p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)", false);
-        }
+            $result = dbquery("
+                SELECT count(*) as unread 
+                    FROM ".$db_prefix."posts p 
+                        LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    WHERE tr.user_id = '".$userdata['user_id']."' 
+                        AND p.post_author != '".$userdata['user_id']."'
+                        AND p.post_edituser != '".$userdata['user_id']."'
+                        AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                        AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                            OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                );
+        } 
         $data['unread_posts'] = ($result2 ? mysql_result($result2, 0) : 0);
     } else {