more fatal warnings and other cleanup

[ndwebbie.git] / calls.pl

diff --git a/calls.pl b/calls.pl
index 5fa57dff1ae9809ab5055664b5d511812379263f..159892c2d0bd99cdfa7e2b411dfb62aaf0b9cc58 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -18,6 +18,7 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
 use POSIX;
 our $BODY;
 our $DBH;
@@ -29,7 +30,7 @@ $ND::TEMPLATE->param(TITLE => 'Defense Calls');
 die "You don't have access" unless isDC();
 
 my $call;
-if (param('call') =~ /^(\d+)$/){
+if (defined param('call') && param('call') =~ /^(\d+)$/){
        my $query = $DBH->prepare(q{
 SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member
 FROM calls c 
@@ -39,7 +40,7 @@ FROM calls c
 WHERE c.id = ?});
        $call = $DBH->selectrow_hashref($query,undef,$1);
 }
-if ($call){
+if ($call && defined param('cmd')){
        if (param('cmd') eq 'Submit'){
                $DBH->begin_work;
                if (param('ctick')){
@@ -160,7 +161,7 @@ WHERE i.call = ?
 ORDER BY p.x,p.y,p.z});
        $attackers->execute($call->{id});
        my @attackers;
-       my $i = 0;
+       $i = 0;
        while(my $attacker = $attackers->fetchrow_hashref){
                $i++;
                $attacker->{ODD} = $i % 2;
@@ -169,19 +170,21 @@ ORDER BY p.x,p.y,p.z});
        $BODY->param(Attackers => \@attackers);
 }else{
        my $where = 'open AND c.landing_tick-6 > tick()';
-       if (param('show') eq 'covered'){
-               $where = 'covered';
-       }elsif (param('show') eq 'all'){
-               $where = 'true';
-       }elsif (param('show') eq 'uncovered'){
-               $where = 'not covered';
+       if (defined param('show')){
+               if (param('show') eq 'covered'){
+                       $where = 'covered';
+               }elsif (param('show') eq 'all'){
+                       $where = 'true';
+               }elsif (param('show') eq 'uncovered'){
+                       $where = 'not covered';
+               }
        }
        my $pointlimits = $DBH->prepare(q{SELECT value :: int FROM misc WHERE id = ?});
        my ($minpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMIN');
        my ($maxpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMAX');
 
        my $query = $DBH->prepare(qq{
-SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, 
+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,
@@ -193,7 +196,7 @@ FROM calls c
        JOIN current_planet_stats p ON u.planet = p.id
        JOIN current_planet_stats p2 ON i.sender = p2.id
 WHERE $where
-GROUP BY c.id, p.x,p.y,p.z, u.username, c.landing_tick, c.info,u.defense_points
+GROUP BY c.id, p.x,p.y,p.z, u.username, c.landing_tick, c.info,u.defense_points,c.dc
 ORDER BY c.landing_tick DESC
                })or $error .= $DBH->errstr;
        $query->execute or $error .= $DBH->errstr;
@@ -213,6 +216,7 @@ ORDER BY c.landing_tick DESC
                        push @calls,{};
                        $i = 0;
                }
+               $call->{dc} = 'Hostile' unless defined $call->{dc};
                $i++;
                $call->{ODD} = $i % 2;
                $call->{shiptype} = escapeHTML($call->{shiptype});