Added model and renamed submodule

[ndwebbie.git] / NDWeb / XMLPage.pm

diff --git a/NDWeb/XMLPage.pm b/NDWeb/XMLPage.pm
index 9e5fce64f846f32f6e11e25a370ca3509bf31d84..288bfb20b01321cc3df8e48d5575f1b4ed24482e 100644 (file)
--- 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;
 
@@ -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());