X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=7bac9f764c9fdf145bd8e1be5d5feeb7ee01b9a8;hb=33379bf7e2909a0f46ccf771a919121e48f9ab41;hp=8b2fdb3d9b2e872213e899edf86c686a1fa490c2;hpb=8551be2ae42a4a4e7a425e2a71ead79c10bf9df4;p=ndwebbie.git diff --git a/ND.pm b/ND.pm index 8b2fdb3..7bac9f7 100755 --- a/ND.pm +++ b/ND.pm @@ -30,7 +30,9 @@ use ND::Include; use Tie::File; use Fcntl 'O_RDONLY'; use strict; -use warnings FATAL => 'all'; +use warnings; + +$SIG{__WARN__} = sub {$ND::ERROR .= p $_[0]}; chdir '/var/www/ndawn/code'; our %PAGES; @@ -101,7 +103,7 @@ 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); } $ND::BODY = $PAGES{$PAGE}->{render}->($DBH,$ND::BODY); @@ -111,9 +113,13 @@ sub page { $fleetupdate = 0 unless defined $fleetupdate; - my ($unread,$lastv) = $DBH->selectrow_array(unread_query,undef,$UID) or $ERROR .= p($DBH->errstr); + my ($last_forum_visit) = $DBH->selectrow_array(q{SELECT last_forum_visit FROM users WHERE uid = $1} + ,undef,$UID) or $ERROR .= p($DBH->errstr); + my ($unread,$newposts) = $DBH->selectrow_array(unread_query,undef,$UID,$last_forum_visit) + or $ERROR .= p($DBH->errstr); $TEMPLATE->param(UnreadPosts => $unread); + $TEMPLATE->param(NewPosts => $newposts); $TEMPLATE->param(Tick => $TICK); $TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember()); $TEMPLATE->param(isHC => isHC());