X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FCalls.pm;h=cbeaa05707301ed1fd71b921a06521ab3f682906;hb=1dd5131f6b4484797de54bd9bd2d67220c921608;hp=73b0916b118515feca901ff848c31fa9b252625f;hpb=0d4db7e56891d629fc2bbabdd17de9276b86db09;p=ndwebbie.git diff --git a/ND/Web/Pages/Calls.pm b/ND/Web/Pages/Calls.pm index 73b0916..cbeaa05 100644 --- a/ND/Web/Pages/Calls.pm +++ b/ND/Web/Pages/Calls.pm @@ -126,7 +126,7 @@ sub render_body { $BODY->param(DefensePoints => $call->{defense_points}); $BODY->param(LandingTick => $call->{landing_tick}); $BODY->param(ETA => $call->{landing_tick}-$self->{TICK}); - $BODY->param(Info => $call->{info}); + $BODY->param(Info => escapeHTML $call->{info}); $BODY->param(DC => $call->{dc}); if ($call->{covered}){ $BODY->param(Cover => 'Uncover'); @@ -216,7 +216,7 @@ sub render_body { SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, c.dc, TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount, TRIM('/' FROM concat(i.eta||' /')) AS eta, TRIM('/' FROM concat(i.shiptype||' /')) AS shiptype, - TRIM('/' FROM concat(c.landing_tick - tick() ||' /')) AS curreta, + (c.landing_tick - tick()) AS curreta, TRIM('/' FROM concat(p2.alliance ||' /')) AS alliance, TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers FROM calls c @@ -245,6 +245,7 @@ sub render_body { push @calls,{}; $i = 0; } + $call->{attackers} =~ s{(\d+:\d+:\d+)}{$1}g; $call->{dc} = 'Hostile' unless defined $call->{dc}; $i++; $call->{ODD} = $i % 2;