oops

[ndwebbie.git] / ND / Web / XMLPage.pm

diff --git a/ND/Web/XMLPage.pm b/ND/Web/XMLPage.pm
index 561fdc8f608c9535c91219eb13239916ca76ce56..d1804f1a02ea2c40d8a7d417209868f460258b81 100644 (file)
--- a/ND/Web/XMLPage.pm
+++ b/ND/Web/XMLPage.pm
@@ -54,7 +54,7 @@ ORDER BY r.tick+c.wave,x,y,z});
                push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
                        , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}
                        , AJAX => $self->{AJAX}, JoinName => $target->{joinable} ? 'N' : 'J'
-                       , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'};
+                       , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE', JoinableTitle => $target->{joinable} ? 'Disable join' : 'Make target joinable'};
        }
        my $template = HTML::Template->new(filename => "templates/targetlist.tmpl", cache => 1);
        $template->param(Targets => \@targets);
@@ -80,6 +80,9 @@ sub render : method {
        $self->process;
 
        my $type = 'text/html';
+       if ($self->{HTTP_ACCEPT} =~ m{application/xhtml\+xml}){
+               $type = 'application/xhtml+xml'
+       }
        my $body;
        if ($self->{XML}){
                $type = 'text/xml';
@@ -92,6 +95,10 @@ sub render : method {
 
        $body = $self->render_body($body);
 
+       unless ($body){
+               return;
+       }
+
        unless ($self->{XML}){
                my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$self->{UID});
 
@@ -109,7 +116,7 @@ sub render : method {
                $template->param(isHC => $self->isHC);
                $template->param(isDC => $self->isDC());
                $template->param(isBC => $self->isBC());
-               $template->param(isIntel => $self->isBC());
+               $template->param(isIntel => $self->isIntel());
                $template->param(isAttacker => $ATTACKER && (!$self->isMember() || ((($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET})));
                if ($ATTACKER && (!$self->isMember() || ((($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET}))){
                        $template->param(Targets => $self->listTargets);
@@ -118,11 +125,11 @@ sub render : method {
                my ($css) = $DBH->selectrow_array(q{SELECT css FROM users WHERE uid = $1},undef,$ND::UID);
                $template->param(CSS => $css);
                $template->param(TITLE => $self->{TITLE});
-
        }
        $template->param(Error => $ND::ERROR);
        $template->param(BODY => $body->output);
        my $output = $template->output;
+       $output =~ s/[^\x{9}\x{A}\x{D}\x{20}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]//g;
        print header(-type=> $type, -charset => 'utf-8', -Content_Length => length $output);
        print $output;
 };