oops

[ndwebbie.git] / ND / Web / Pages / Forum.pm

diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm
index 6cc441f87ff1af732438a923aac4392202b894f0..b18bc350c8ddb08044395c922377f5b02ba402de 100644 (file)
--- a/ND/Web/Pages/Forum.pm
+++ b/ND/Web/Pages/Forum.pm
@@ -25,23 +25,22 @@ use CGI qw/:standard/;
 use ND::Web::Include;
 use ND::Include;
 
-$ND::PAGES{forum} = {parse => \&parse, process => \&process, render=> \&render};
+use base qw/ND::Web::XMLPage/;
+
+$ND::Web::Page::PAGES{forum} = __PACKAGE__;
 
 sub parse {
-       my ($uri) = @_;
-       if ($uri =~ m{^/.*/allUnread}){
+       my $self = shift;
+       if ($self->{URI} =~ m{^/.*/allUnread}){
                param('allUnread',1);
        }
 }
 
-sub process {
-
-}
-
-sub render {
-       my ($DBH,$BODY) = @_;
-
-       $ND::TEMPLATE->param(TITLE => 'Forum');
+sub render_body {
+       my $self = shift;
+       my ($BODY) = @_;
+       $self->{TITLE} = 'Forum';
+       my $DBH = $self->{DBH};
 
        $DBH->do(q{UPDATE users SET last_forum_visit = NOW() WHERE uid = $1},undef,$ND::UID) or $ND::ERROR .= p($DBH->errstr);
 
@@ -82,15 +81,18 @@ sub render {
        }
 
        if (defined param('cmd')){
-               if(param('cmd') eq 'Submit'){
+               if(param('cmd') eq 'Submit' or param('cmd') eq 'Preview'){
                        $DBH->begin_work;
                        if ($board && $board->{post}){
                                $thread = addForumThread $DBH,$board,$ND::UID,param('subject');
                        }
-                       if ($thread && $thread->{post}){
+                       if (param('cmd') eq 'Submit' and $thread && $thread->{post}){
                                addForumPost($DBH,$thread,$ND::UID,param('message'));
+                               $self->{RETURN} = 'REDIRECT';
+                               $self->{REDIR_LOCATION} = "/forum?t=$thread->{id}#NewPosts";
                        }
                        $DBH->commit or $ND::ERROR .= p($DBH->errstr);
+                       return if $self->{RETURN};
                }
                if(param('cmd') eq 'Move' && $board->{moderate}){
                        $DBH->begin_work;
@@ -129,7 +131,10 @@ sub render {
                GROUP BY fb.fbid,fb.board
                ORDER BY fb.fbid
                        });
-       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, date_trunc('seconds',max(fp.time)::timestamp) as last_post, ft.sticky
+       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,
+               date_trunc('seconds',max(fp.time)::timestamp) as last_post,
+               min(fp.time)::date as posting_date, ft.sticky
                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,ft.sticky
@@ -159,6 +164,7 @@ sub render {
                        $boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
                        my @boards;
                        while (my $board = $boards->fetchrow_hashref){
+                               next if $board->{id} < 0;
                                $threads->execute($board->{id},$ND::UID,1) or $ND::ERROR .= p($DBH->errstr);
                                my $i = 0;
                                my @threads;
@@ -202,7 +208,6 @@ sub render {
                        my @categories;
                        while (my $category = $categories->fetchrow_hashref){
                                $boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
-                               #TODO: really need to do this outside, so you don't need moderate access
 
                                my @boards;
                                while (my $b = $boards->fetchrow_hashref){
@@ -216,9 +221,11 @@ sub render {
                        }
                        $BODY->param(Categories => \@categories);
                }
-       my ($category) = $DBH->selectrow_array(q{SELECT category FROM forum_categories WHERE fcid = $1}
-               ,undef,$board->{fcid}) or $ND::ERROR .= p($DBH->errstr);
+               my ($category) = $DBH->selectrow_array(q{SELECT category FROM forum_categories WHERE fcid = $1}
+                       ,undef,$board->{fcid}) or $ND::ERROR .= p($DBH->errstr);
+               $BODY->param(Category =>  $category);
 
+       }elsif($self->{URI} =~ m{^/.*/search/(.*)}){ #List threads in this board
        }else{ #List boards
                $BODY->param(Overview => 1);
                $categories->execute or $ND::ERROR .= p($DBH->errstr);