X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=forum.pl;h=a9f1be1bd2dfcfaa49cfe3acc9ffcd4b0c647d6e;hb=610aa63899777247036fa48916e1d0ef8fefaf8c;hp=30bd3abe7e9882f25a648695426b21008fbefe02;hpb=2a0730763283fb04dd842b4011b15da8ee9206c7;p=ndwebbie.git

diff --git a/forum.pl b/forum.pl
index 30bd3ab..a9f1be1 100644
--- a/forum.pl
+++ b/forum.pl
@@ -19,6 +19,8 @@
 
 use strict;
 use warnings FATAL => 'all';
+no warnings 'uninitialized';
+use ND::Web::Forum;
 
 $ND::TEMPLATE->param(TITLE => 'Forum');
 
@@ -47,11 +49,11 @@ if(param('t')){
 	$thread = $DBH->selectrow_hashref($findThread,undef,param('t'),$ND::UID) or $ERROR .= p($DBH->errstr);
 }
 
-if (defined param('cmd') && param('cmd') eq 'submit'){
+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},param('subject'))){
+		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);
@@ -60,8 +62,7 @@ if (defined param('cmd') && param('cmd') eq 'submit'){
 		}
 	}
 	if ($thread && $thread->{post}){
-		my $insert = $DBH->prepare(q{INSERT INTO forum_posts (ftid,message,uid) VALUES($1,$2,$3)});
-		$insert->execute($thread->{id},escapeHTML(param('message')),$ND::UID) or $ERROR .= p($DBH->errstr);
+		addForumPost($DBH,$thread,$ND::UID,param('message'));
 	}
 	$DBH->commit or $ERROR .= p($DBH->errstr);
 }
@@ -74,30 +75,7 @@ GROUP BY ft.ftid, ft.subject
 HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= $3});
 
 if ($thread){ #Display the thread
-	$BODY->param(Thread => 1);
-	$BODY->param(Subject => $thread->{subject});
-	$BODY->param(Id => $thread->{id});
-	$BODY->param(Post => $thread->{post});
-
-	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
-});
-	$posts->execute($thread->{id},$ND::UID) or $ERROR .= p($DBH->errstr);
-	my @posts;
-	my $old = 1;
-	while (my $post = $posts->fetchrow_hashref){
-		if ($old && $post->{unread}){
-			$old = 0;
-			$post->{NewPosts} = 1;
-		}
-		$post->{message} = parseMarkup($post->{message});
-		push @posts,$post;
-	}
-	$BODY->param(Posts => \@posts);
-
-	markThreadAsRead($thread->{id});
+	$BODY->param(Thread => viewForumThread $thread);
 
 }elsif($board){ #List threads in this board
 	$BODY->param(Board => $board->{board});