Changeset 1282 in ExiteCMS for modules/common/forum_threads_list_panel/php-files/modules/forum_threads_list_panel/new_posts.php

Timestamp:

02/14/08 15:23:58 (4 years ago)

Author:

hverton

Message:

updated the forum_threads_list_panel module to use the new user option to show/hide the users own posts

File:

• modules/common/forum_threads_list_panel/php-files/modules/forum_threads_list_panel/new_posts.php (modified) (2 diffs)

modules/common/forum_threads_list_panel/php-files/modules/forum_threads_list_panel/new_posts.php

@@ -52 +52 @@
 
 // check if there are any unread posts for this user
-$result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages 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);
+if ($userdata['user_posts_unread']) {
+    $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages 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);
+} else {
+    $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages 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);
+}
 $variables['unread'] = ($result ? mysql_result($result, 0) : 0);
 
@@ -60 +64 @@
     $variables['posts'] = array();
     // get all threads with unread posts, and a count of the unread posts per thread
-    $result = dbquery("
-        SELECT p.forum_id, p.thread_id, count( * ) AS unread, f.forum_name, f.forum_cat, t.thread_subject, t.thread_views, t.thread_lastpost, MIN( p.post_id ) AS post_id
-            FROM ".$db_prefix."posts p
-            LEFT JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
-            LEFT JOIN ".$db_prefix."threads t ON p.thread_id = t.thread_id
-            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)
-            GROUP BY p.thread_id
-        ");
-
+    if ($userdata['user_posts_unread']) {
+        $result = dbquery("
+            SELECT p.forum_id, p.thread_id, count( * ) AS unread, f.forum_name, f.forum_cat, t.thread_subject, t.thread_views, t.thread_lastpost, MIN( p.post_id ) AS post_id
+                FROM ".$db_prefix."posts p
+                LEFT JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                LEFT JOIN ".$db_prefix."threads t ON p.thread_id = t.thread_id
+                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)
+                GROUP BY p.thread_id
+            ");
+    } else {
+        $result = dbquery("
+            SELECT p.forum_id, p.thread_id, count( * ) AS unread, f.forum_name, f.forum_cat, t.thread_subject, t.thread_views, t.thread_lastpost, MIN( p.post_id ) AS post_id
+                FROM ".$db_prefix."posts p
+                LEFT JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                LEFT JOIN ".$db_prefix."threads t ON p.thread_id = t.thread_id
+                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)
+                GROUP BY p.thread_id
+            ");
+    }
     // get the number of unread threads
     $rows = dbrows($result);