X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=forum.pl;h=e006b201cfc39418eb4c0b8793273e2fb4496c16;hb=03830799201db0b0f28e9c494fdd1b5b5143749c;hp=15116427fbde4adbaa49e300063861db6c339cb4;hpb=ba0d22272efc046f7feaf07ebf190fa9ec6474c7;p=ndwebbie.git

diff --git a/forum.pl b/forum.pl
index 1511642..e006b20 100644
--- a/forum.pl
+++ b/forum.pl
@@ -20,7 +20,7 @@
 use strict;
 use warnings FATAL => 'all';
 no warnings 'uninitialized';
-use ND::Forum;
+use ND::Web::Forum;
 
 $ND::TEMPLATE->param(TITLE => 'Forum');
 
@@ -52,14 +52,7 @@ if(param('t')){
 if (defined param('cmd') && param('cmd') eq 'forumpost'){
 	$DBH->begin_work;
 	if ($board && $board->{post}){
-		my $insert = $DBH->prepare(q{INSERT INTO forum_threads (fbid,subject) VALUES($1,$2)});
-		if ($insert->execute($board->{id},escapeHTML(param('subject')))){
-			$thread = $DBH->selectrow_hashref($findThread,undef,
-				$DBH->last_insert_id(undef,undef,undef,undef,"forum_threads_ftid_seq"),$ND::UID)
-				or $ERROR .= p($DBH->errstr);
-		}else{
-			$ERROR .= p($DBH->errstr);
-		}
+		$thread = addForumThread $DBH,$board,$ND::UID,param('subject');
 	}
 	if ($thread && $thread->{post}){
 		addForumPost($DBH,$thread,$ND::UID,param('message'));
@@ -68,11 +61,12 @@ if (defined param('cmd') && param('cmd') eq 'forumpost'){
 }
 
 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
+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, max(fp.time)::timestamp as last_post
 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
 GROUP BY ft.ftid, ft.subject
-HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= $3});
+HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= $3
+ORDER BY last_post DESC});
 
 if ($thread){ #Display the thread
 	$BODY->param(Thread => viewForumThread $thread);
@@ -101,6 +95,7 @@ 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
+ORDER BY fb.fbid
 });
 	while (my $category = $categories->fetchrow_hashref){
 		$boards->execute($category->{id},$ND::UID) or $ERROR .= p($DBH->errstr);
@@ -128,9 +123,9 @@ GROUP BY fb.fbid,fb.board
 	$BODY->param(Overview => 1);
 	$categories->execute or $ERROR .= p($DBH->errstr);
 my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board,count(NULLIF(COALESCE(fp.fpid::boolean,FALSE) AND COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread
-FROM forum_boards fb NATURAL JOIN forum_access fa LEFT OUTER JOIN (forum_threads ft JOIN forum_posts fp USING (ftid)) ON fb.fbid = ft.fbid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
-WHERE fb.fcid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
-		WHERE uid = $2))
+FROM forum_boards fb LEFT OUTER JOIN (forum_threads ft JOIN forum_posts fp USING (ftid)) ON fb.fbid = ft.fbid LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
+WHERE fb.fcid = $1 AND 
+	fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($2)))
 GROUP BY fb.fbid, fb.board
 ORDER BY fb.fbid	});
 	my @categories;