Show if call is covered or not

[ndwebbie.git] / NDWeb / Pages / Calls.pm

diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm
index 9ab76ddf0d697d90fb3e703c7bd1694020f68909..8303b4f42718bb722211e3b364af3ad41d81881e 100644 (file)
--- a/NDWeb/Pages/Calls.pm
+++ b/NDWeb/Pages/Calls.pm
@@ -123,7 +123,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 => escapeHTML $call->{info});
+               $BODY->param(Info => $call->{info});
                $BODY->param(DC => $call->{dc});
                $BODY->param(Member => $call->{member});
                $BODY->param(SMS => $call->{sms});
@@ -159,10 +159,7 @@ sub render_body {
                        }
                        $ships->execute($fleet->{id});
                        my @ships;
-                       my $i = 0;
                        while (my $ship = $ships->fetchrow_hashref){
-                               $i++;
-                               $ship->{ODD} = $i % 2;
                                push @ships,$ship;
                        }
                        $fleet->{Ships} = \@ships;
@@ -188,10 +185,7 @@ sub render_body {
                        $fleet->{CLASS} = $fleet->{mission};
                        $ships->execute($fleet->{id});
                        my @ships;
-                       my $i = 0;
                        while (my $ship = $ships->fetchrow_hashref){
-                               $i++;
-                               $ship->{ODD} = $i % 2;
                                push @ships,$ship;
                        }
                        $fleet->{Ships} = \@ships;
@@ -209,23 +203,16 @@ sub render_body {
                });
                $attackers->execute($call->{id});
                my @attackers;
-               my $i = 0;
                while(my $attacker = $attackers->fetchrow_hashref){
-                       $i++;
-                       $attacker->{ODD} = $i % 2;
                        $outgoings->execute($attacker->{planet},$call->{landing_tick});
                        my @missions;
-                       my $k = 0;
                        while (my $mission = $outgoings->fetchrow_hashref){
                                $mission->{eta} = '?' if not defined $mission->{eta};
                                $mission->{amount} = '?' if not defined $mission->{amount};
-                               $mission->{ODD} = $k++ % 2;
                                $mission->{CLASS} = $mission->{mission};
                                my @ships;
                                $ships->execute($mission->{id});
-                               my $j = 0;
                                while (my $ship = $ships->fetchrow_hashref){
-                                       $ship->{ODD} = $j++ % 2;
                                        push @ships,$ship;
                                }
                                push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
@@ -275,7 +262,6 @@ sub render_body {
                        })or warn $DBH->errstr;
                $query->execute or warn $DBH->errstr;
                my @calls;
-               my $i = 0;
                my $tick = $self->{TICK};
                while (my $call = $query->fetchrow_hashref){
                        if ($call->{defense_points} < $minpoints){
@@ -288,13 +274,10 @@ sub render_body {
                        while ($tick - 24 > $call->{landing_tick}){
                                $tick -= 24;
                                push @calls,{};
-                               $i = 0;
                        }
                        $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
                        $call->{dcstyle} = 'Hostile' unless defined $call->{dc};
-                       $i++;
-                       $call->{ODD} = $i % 2;
-                       $call->{shiptype} = escapeHTML($call->{shiptype});
+                       $call->{shiptype} = $call->{shiptype};
                        push @calls, $call;
                }
                $BODY->param(Calls => \@calls);