ftid in planets instead of planet in forum_threads

[ndwebbie.git] / forum.pl

diff --git a/forum.pl b/forum.pl
index 15116427fbde4adbaa49e300063861db6c339cb4..cdd51fec478d0ac40bb4047a133da8bb831b483e 100644 (file)
--- 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'));
@@ -128,9 +121,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;