X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FForum.pm;h=d31f4d3c04cd7a080ecc3530490652913518ccf4;hb=256609e2df07f5dd40a33ace6163d2b72a269246;hp=17ef00b5ce20fe76c7edd30e0edbe0d9ce3ea1bd;hpb=31e4eaf3a4a406789d63f2c5d81c366091164404;p=ndwebbie.git diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm index 17ef00b..d31f4d3 100644 --- a/ND/Web/Pages/Forum.pm +++ b/ND/Web/Pages/Forum.pm @@ -82,12 +82,12 @@ 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')); } $DBH->commit or $ND::ERROR .= p($DBH->errstr); @@ -129,7 +129,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