removed in favor of ND::Include::log_message

[ndwebbie.git] / forum.pl

diff --git a/forum.pl b/forum.pl
index caf81d1680eec9389895d54b0b03c03a7c77a2d6..a9f1be1bd2dfcfaa49cfe3acc9ffcd4b0c647d6e 100644 (file)
--- 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,13 +62,12 @@ 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);
 }
 
-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
@@ -74,29 +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});
@@ -121,7 +100,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 +132,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);