X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FForum.pm;h=694259aad23c5a17a4f224179d20ee4963e779d3;hb=1e981193e94930043305f3e8291b91a7584e184d;hp=a166b64ad823e0f134b7b6c6e38dc4b80e2c103d;hpb=e77aef835063ffb36a296769ffdba7ca24233a7d;p=ndwebbie.git diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm index a166b64..694259a 100644 --- a/ND/Web/Pages/Forum.pm +++ b/ND/Web/Pages/Forum.pm @@ -19,8 +19,7 @@ package ND::Web::Pages::Forum; use strict; -use warnings FATAL => 'all'; -no warnings 'uninitialized'; +use warnings; use ND::Web::Forum; use CGI qw/:standard/; use ND::Web::Include; @@ -43,6 +42,8 @@ sub render { $ND::TEMPLATE->param(TITLE => 'Forum'); + $DBH->do(q{UPDATE users SET last_forum_visit = NOW() WHERE uid = $1},undef,$ND::UID) or $ND::ERROR .= p($DBH->errstr); + my $board; if(param('b')){ my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post @@ -79,7 +80,7 @@ sub render { $thread = $DBH->selectrow_hashref($findThread,undef,param('t'),$ND::UID) or $ND::ERROR .= p($DBH->errstr); } - if (defined param('cmd') && param('cmd') eq 'forumpost'){ + if (defined param('cmd') && param('cmd') eq 'Submit'){ $DBH->begin_work; if ($board && $board->{post}){ $thread = addForumThread $DBH,$board,$ND::UID,param('subject'); @@ -91,7 +92,7 @@ sub render { } 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, max(fp.time)::timestamp as last_post + 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 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 @@ -156,7 +157,7 @@ sub render { }else{ #List boards $BODY->param(Overview => 1); $categories->execute or $ND::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 + 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,date_trunc('seconds',max(fp.time)::timestamp) as last_post 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)))