make forum/allUnread work

[ndwebbie.git] / ND.pm

diff --git a/ND.pm b/ND.pm
index befe1b9560b8d2acfaa769b36ab2a7e230c26564..e95198a8898fbc709b1a595fe9b87f6b85834531 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -24,14 +24,13 @@ use HTML::Template;
 use DBI;
 use DBD::Pg qw(:pg_types);
 use Apache2::Request;
-use ND::Include;
+use ND::Web::Include;
 use ND::DB;
 use Tie::File;
 use Fcntl 'O_RDONLY';
 use strict;
 use warnings FATAL => 'all';
 
-tie our @PAGES, 'Tie::File', "/var/www/ndawn/code/pages", mode => O_RDONLY or die $!;
 
 sub handler {
        local $ND::r = shift;
@@ -44,11 +43,15 @@ 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))?$/){
                $ND::PAGE = $1 unless $1 eq 'index' and $3 eq 'pl';
        }
+       if ($ENV{REQUEST_URI} =~ m{^.*/(\w+)$}){
+               param($1,1);
+       }
        $ND::PAGE = '' unless defined $ND::PAGE;
        page();
        return Apache2::Const::OK;
@@ -56,7 +59,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';
 
@@ -79,10 +84,8 @@ sub page {
                $ATTACKER = 1 if $attack;
        }
 
-
-       our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
-
-       $ND::PAGE = 'main' unless grep { /^$ND::PAGE$/ } @PAGES;
+       tie my @pages, 'Tie::File', "/var/www/ndawn/code/pages", mode => O_RDONLY, memory => 0 or die $!;
+       $ND::PAGE = 'main' unless grep { /^$ND::PAGE$/ } @pages;
 
        our $XML = 0;
        $XML = 1 if param('xml') and $ND::PAGE =~ /^(raids)$/;
@@ -96,13 +99,13 @@ sub page {
                $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.xml.tmpl", cache => 1);
        }else{
                $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.tmpl", global_vars => 1, cache => 1);
-               $ND::BODY->param(PAGE => $ND::PAGE);
+               $ND::BODY->param(PAGE => '/'.$ND::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){
@@ -110,6 +113,16 @@ sub page {
 
                $fleetupdate = 0 unless defined $fleetupdate;
 
+               my ($unread) = $DBH->selectrow_array(q{
+                       SELECT count(*) AS unread
+FROM forum_boards fb NATURAL JOIN forum_threads ft 
+       JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
+               (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
+WHERE (ftv.time IS NULL OR fp.time > ftv.time) AND fbid > 0 AND
+       fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
+                       },undef,$UID) or $ERROR .= p($DBH->errstr);
+
+               $TEMPLATE->param(UnreadPosts => $unread);
                $TEMPLATE->param(Tick => $TICK);
                $TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember());
                $TEMPLATE->param(isHC => isHC());
@@ -123,7 +136,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);