titles for buttons, and fixed error on updatetarget list

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

diff --git a/ND/Web/XMLPage.pm b/ND/Web/XMLPage.pm
index b7e70151488fe02f7d40c349e13aa8fe0c0e0fb5..0868ce1d829f33d16dead9b6bf25501eb28d713a 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);
@@ -129,6 +129,7 @@ sub render : method {
        $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;
 };