minor fixes

diff --git a/ND.pm b/ND.pm
index 46a9de3877b166927b4ae30c657d088ce6462012..7ac8e354487e720876fad29ea593fab385090ad8 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -115,11 +115,11 @@ sub page {
 
                my ($unread) = $DBH->selectrow_array(q{
                        SELECT count(*) AS unread
-FROM forum_boards fb NATURAL JOIN forum_access fa NATURAL JOIN forum_threads ft 
+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 (gid = -1 OR gid IN (SELECT gid FROM groupmembers
-       WHERE uid = $1))
+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);

diff --git a/forum.pl b/forum.pl
index caf81d1680eec9389895d54b0b03c03a7c77a2d6..30bd3abe7e9882f25a648695426b21008fbefe02 100644 (file)
--- a/forum.pl
+++ b/forum.pl
@@ -66,7 +66,7 @@ if (defined param('cmd') && param('cmd') eq 'submit'){
        $DBH->commit or $ERROR .= p($DBH->errstr);
 }
 
-my $categories = $DBH->prepare(q{SELECT fcid AS id,category FROM forum_categories});
+my $categories = $DBH->prepare(q{SELECT fcid AS id,category FROM forum_categories ORDER BY fcid});
 my $threads = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject,count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts
 FROM forum_threads ft JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 WHERE ft.fbid = $1
@@ -82,7 +82,8 @@ if ($thread){ #Display the thread
        my $posts = $DBH->prepare(q{SELECT u.username,date_trunc('minute',fp.time::timestamp) AS time,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread
 FROM forum_threads ft JOIN forum_posts fp USING (ftid) NATURAL JOIN users u LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 WHERE ft.ftid = $1
-ORDER BY fp.time ASC});
+ORDER BY fp.time ASC
+});
        $posts->execute($thread->{id},$ND::UID) or $ERROR .= p($DBH->errstr);
        my @posts;
        my $old = 1;
@@ -121,7 +122,8 @@ ORDER BY fp.time ASC});
 FROM forum_boards fb NATURAL JOIN forum_access fa
 WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
        WHERE uid = $2))
-GROUP BY fb.fbid,fb.board});
+GROUP BY fb.fbid,fb.board
+});
        while (my $category = $categories->fetchrow_hashref){
                $boards->execute($category->{id},$ND::UID) or $ERROR .= p($DBH->errstr);
                my @boards;
@@ -152,7 +154,7 @@ FROM forum_boards fb NATURAL JOIN forum_access fa LEFT OUTER JOIN (forum_threads
 WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
                WHERE uid = $2))
 GROUP BY fb.fbid, fb.board
-               });
+ORDER BY fb.fbid       });
        my @categories;
        while (my $category = $categories->fetchrow_hashref){
                $boards->execute($category->{id},$ND::UID) or $ERROR .= p($DBH->errstr);