mark threads as read

diff --git a/ND.pm b/ND.pm
index 404c8795648e042764cc2c28443b56a476e85981..c54bb77a085b828793d0d6391594d932e10ba951 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -43,6 +43,7 @@ sub handler {
        local $ND::BODY;
        local $ND::TICK;
        local %ND::GROUPS;
+       local $ND::ERROR;
        local $ND::PAGE = $ND::req->param('page');
 
        if ($ENV{'SCRIPT_NAME'} =~ /(\w+)(\.(pl|php|pm))?$/){
@@ -55,7 +56,9 @@ sub handler {
 
 sub page {
        our $DBH = ND::DB::DB();
-       my $error = '';
+       $DBH->do(q{SET timezone = 'GMT'});
+
+       our $ERROR = '';
 
        chdir '/var/www/ndawn/code';
 
@@ -100,9 +103,9 @@ sub page {
        }
 
        unless (my $return = do "$ND::PAGE.pl"){
-               $error .= "<p><b>couldn't parse $ND::PAGE: $@</b></p>" if $@;
-               $error .= "<p><b>couldn't do $ND::PAGE: $!</b></p>"    unless defined $return && defined $!;
-               $error .= "<p><b>couldn't run $ND::PAGE</b></p>"       unless $return;
+               $ERROR .= "<p><b>couldn't parse $ND::PAGE: $@</b></p>" if $@;
+               $ERROR .= "<p><b>couldn't do $ND::PAGE: $!</b></p>"    unless defined $return && defined $!;
+               $ERROR .= "<p><b>couldn't run $ND::PAGE</b></p>"       unless $return;
        }
 
        unless ($XML){
@@ -123,7 +126,7 @@ sub page {
                $TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
 
        }
-       $TEMPLATE->param(Error => $error);
+       $TEMPLATE->param(Error => $ERROR);
        $ND::TEMPLATE->param(BODY => $ND::BODY->output);
        my $output = $TEMPLATE->output;
        print header(-type=> $type, -charset => 'utf-8', -Content_Length => length $output);

diff --git a/ND/Include.pm b/ND/Include.pm
index bec7dd5b1e75bb5f3c053b30843c5e344115e309..e51d0e6b81bae9c9f849e9d390126e98258e52af 100644 (file)
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -20,12 +20,13 @@
 package ND::Include;
 use strict;
 use warnings FATAL => 'all';
+use CGI qw{:standard};
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
 our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel isTech parseMarkup min max listTargets
-       alliances intelquery generateClaimXml/;
+       alliances intelquery generateClaimXml markThreadAsRead/;
 
 sub isMember {
        return exists $ND::GROUPS{Members} || isTech();
@@ -67,6 +68,18 @@ sub parseMarkup {
        return $text;
 }
 
+sub markThreadAsRead {
+       my ($thread) = @_;
+       my $rows = $ND::DBH->do(q{UPDATE forum_thread_visits SET time = now() 
+WHERE uid =    $1 AND ftid = $2},undef,$ND::UID,$thread);
+       if ($rows == 0){
+               $ND::DBH->do(q{INSERT INTO forum_thread_visits (uid,ftid) VALUES ($1,$2)}
+                       ,undef,$ND::UID,$thread) or $ND::ERROR .= p($ND::DBH->errstr);
+       }else{
+               $ND::ERROR .= p($ND::DBH->errstr);
+       }
+}
+
 sub min {
     my ($x,$y) = @_;
     return ($x > $y ? $y : $x);

diff --git a/forum.pl b/forum.pl
index c7f0d047ac3d3fbfa4ae3f7ee23946370b46eacd..8f2698f5b1d0a4a1491fe8ad89feb74c0e4ea61d 100644 (file)
--- a/forum.pl
+++ b/forum.pl
@@ -27,7 +27,14 @@ our $DBH;
 my $error;
 
 my $thread;
-#TODO: fetch thread info.
+if(param('t')){
+       my $query = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post
+FROM forum_boards fb NATURAL JOIN forum_access fa NATURAL JOIN forum_threads ft
+WHERE ft.ftid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
+       WHERE uid = $2))
+GROUP BY ft.ftid,ft.subject});
+       $thread = $DBH->selectrow_hashref($query,undef,param('t'),$ND::UID) or $error .= p($DBH->errstr);
+}
 
 my $board;
 if(param('b')){
@@ -40,8 +47,31 @@ GROUP BY fb.fbid,fb.board});
 }
 
 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 forum_thread_visits ftv ON ftv.ftid = ft.ftid
+WHERE ft.ftid = $1});
+       $posts->execute($thread->{id}) or $error .= p($DBH->errstr);
+       my @posts;
+       my $old = 1;
+       while (my $post = $posts->fetchrow_hashref){
+               if ($old && $post->{unread}){
+                       $old = 0;
+                       push @posts,{Username=> 'New posts', Message => '<a name="NewPosts>"/>'};
+               }
+               $post->{message} = parseMarkup($post->{message});
+               push @posts,$post;
+       }
+       $BODY->param(Posts => \@posts);
+
+       markThreadAsRead($thread->{id});
+
 }elsif($board){ #List threads in this board
-       $BODY->param(Board => 1);
+       $BODY->param(Board => $board->{board});
        $BODY->param(Post => $board->{post});
        $BODY->param(Id => $board->{id});
        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

diff --git a/templates/forum.tmpl b/templates/forum.tmpl
index 7f2095c00454310f98f24095d7ea885a72c6d5ea..8363113257b17c79eb5c02aae2df3ec020a2be52 100644 (file)
--- a/templates/forum.tmpl
+++ b/templates/forum.tmpl
@@ -1,7 +1,15 @@
 <TMPL_VAR NAME=Error>
 <TMPL_IF Thread>
+<h2><TMPL_VAR NAME=Subject></h2>
+<TMPL_LOOP Posts>
+<fieldset class="forum-post">
+<legend class="<TMPL_VAR NAME=Unread>"><b><TMPL_VAR NAME=Username></b> : <TMPL_VAR NAME=Time></legend>
+<TMPL_VAR NAME=Message>
+</fieldset>
+</TMPL_LOOP>
 </TMPL_IF>
 <TMPL_IF Board>
+<h2><TMPL_VAR NAME=Board></h2>
 <table class="boards">
 <tr>
        <th>Unread</th>

diff --git a/templates/skel.tmpl b/templates/skel.tmpl
index 7da889d49a7254894c29fedbbbdaaddb4a8fd342..b25989939c229e88a0260b5298e946fb6583eda1 100644 (file)
--- a/templates/skel.tmpl
+++ b/templates/skel.tmpl
@@ -13,6 +13,7 @@
 <div id="leftbar">
                <ul class="linkbar">
                        <li><a href="main">Main page</a></li>
+                       <li><a href="forum">Forum</a></li>
                </ul>   <p>Tick: <TMPL_VAR NAME=TICK></p>
                <TMPL_IF isMEMBER>
                <p>Member menu</p>