X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=7ac8e354487e720876fad29ea593fab385090ad8;hb=2a0730763283fb04dd842b4011b15da8ee9206c7;hp=25a798a7bbfded719463af8055a53f2f0ce11667;hpb=accb7993672db2b43ee7a6feb1a0dcde4fe39e9b;p=ndwebbie.git

diff --git a/ND.pm b/ND.pm
index 25a798a..7ac8e35 100755
--- 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_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
+	fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
 			},undef,$UID) or $ERROR .= p($DBH->errstr);
 
 		$TEMPLATE->param(UnreadPosts => $unread);