nicer output

[ndwebbie.git] / ND.pm

diff --git a/ND.pm b/ND.pm
index 25a798a7bbfded719463af8055a53f2f0ce11667..46a9de3877b166927b4ae30c657d088ce6462012 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -113,9 +113,13 @@ sub page {
 
                $fleetupdate = 0 unless defined $fleetupdate;
 
-               my ($unread) = $DBH->selectrow_array(q{SELECT count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread
-FROM forum_threads ft JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
-       (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
+               my ($unread) = $DBH->selectrow_array(q{
+                       SELECT count(*) AS unread
+FROM forum_boards fb NATURAL JOIN forum_access fa NATURAL JOIN forum_threads ft 
+       JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
+               (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
+WHERE ftv.time IS NULL OR fp.time > ftv.time AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
+       WHERE uid = $1))
                        },undef,$UID) or $ERROR .= p($DBH->errstr);
 
                $TEMPLATE->param(UnreadPosts => $unread);