Changeset 1311 in ExiteCMS for trunk/modules/user_info_panel/user_info_panel.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/modules/user_info_panel/user_info_panel.php (modified) (2 diffs)

trunk/modules/user_info_panel/user_info_panel.php

@@ -18 +18 @@
 $variables = array();
 
-if (isset($userdata['user_id'])) {
+if (iMEMBER) {
     // store the user's ID and name
     $variables['user_id'] = isset($userdata['user_id'])?$userdata['user_id']:0;
@@ -31 +31 @@
         $variables['adminpage5'] = checkrights("T");
     }
+    // new PM messages
     $variables['new_pm_msg'] = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id ='".$userdata['user_id']."' AND pmindex_to_id='".$userdata['user_id']."' AND pmindex_read_datestamp = '0'");
+    // new forum messages
     if ($userdata['user_posts_unread']) {
-        // include the users own posts
-        $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)", 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
-        $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)", 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)))"
+            );
+    } 
     $variables['new_post_msg'] = ($result ? mysql_result($result, 0) : 0);
     // check if the forum_threads_list_panel module is installed