X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FXMLPage.pm;h=288bfb20b01321cc3df8e48d5575f1b4ed24482e;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=3e026080963f0fd4bcbe52dd322e199576e09379;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git

diff --git a/NDWeb/XMLPage.pm b/NDWeb/XMLPage.pm
index 3e02608..288bfb2 100644
--- a/NDWeb/XMLPage.pm
+++ b/NDWeb/XMLPage.pm
@@ -90,7 +90,8 @@ sub render : method {
 		$template = HTML::Template->new(filename => "templates/xml.tmpl", cache => 1);
 		$body = HTML::Template->new(filename => "templates/$self->{PAGE}.xml.tmpl", cache => 1);
 	}else{
-		$body = HTML::Template->new(filename => "templates/$self->{PAGE}.tmpl", global_vars => 1, cache => 1);
+		$body = HTML::Template->new(filename => "templates/$self->{PAGE}.tmpl", global_vars => 1
+			, cache => 1, loop_context_vars => 1, default_escape => 'HTML');
 		$body->param(PAGE => $self->{PAGE});
 	}
 
@@ -101,7 +102,8 @@ sub render : method {
 	}
 
 	unless ($self->{XML}){
-		my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$self->{UID});
+		#TODO: Need to fix this with new stuff.
+		my $fleetupdate = $DBH->selectrow_array(q{SELECT tick FROM fleets WHERE sender = ? AND mission = 'Full fleet' AND tick > tick() - 24},undef,$self->{PLANET});
 
 		$fleetupdate = 0 unless defined $fleetupdate;
 
@@ -113,7 +115,8 @@ sub render : method {
 		$template->param(UnreadPosts => $unread);
 		$template->param(NewPosts => $newposts);
 		$template->param(Tick => $TICK);
-		$template->param(isMember => (($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET} && $self->isMember);
+		$template->param(isMember => $self->isMember);
+		$template->param(Planet => $self->{PLANET});
 		$template->param(isHC => $self->isHC);
 		$template->param(isDC => $self->isDC());
 		$template->param(isBC => $self->isBC());