X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FXMLPage.pm;h=ece5bdd877a69ac295e9e408cd4fafa178fce220;hb=b3d60946973fc4d48b32c2447522f0bba02087d3;hp=9e5fce64f846f32f6e11e25a370ca3509bf31d84;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git

diff --git a/NDWeb/XMLPage.pm b/NDWeb/XMLPage.pm
index 9e5fce6..ece5bdd 100644
--- a/NDWeb/XMLPage.pm
+++ b/NDWeb/XMLPage.pm
@@ -17,17 +17,17 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::XMLPage;
+package NDWeb::XMLPage;
 use strict;
 use warnings;
 use CGI qw/:standard/;
 use HTML::Template;
 
 use ND::Include;
-use ND::Web::Page;
-use ND::Web::Include;
+use NDWeb::Page;
+use NDWeb::Include;
 
-use base qw/ND::Web::Page/;
+use base qw/NDWeb::Page/;
 
 sub noAccess () {
 	HTML::Template->new(filename => 'templates/NoAccess.tmpl', global_vars => 1, cache => 1);
@@ -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;