X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND.pm;h=46a9de3877b166927b4ae30c657d088ce6462012;hb=30ff54d1d68e41a17bd8a7ff57e4104021e52ff5;hp=befe1b9560b8d2acfaa769b36ab2a7e230c26564;hpb=40f379f98b8350710b02d1f68a90d337ad13ab92;p=ndwebbie.git

diff --git a/ND.pm b/ND.pm
index befe1b9..46a9de3 100755
--- a/ND.pm
+++ b/ND.pm
@@ -31,7 +31,6 @@ 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,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))?$/){
@@ -56,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';
 
@@ -82,7 +84,8 @@ sub page {
 
 	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)$/;
@@ -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){
@@ -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_access fa 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 (gid = -1 OR gid IN (SELECT gid FROM groupmembers
+	WHERE uid = $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);