X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=calls.pl;h=342f47d080e8bfc39299f2760faf24ce6491393a;hb=03830799201db0b0f28e9c494fdd1b5b5143749c;hp=8aab04a63540aaa10a071b0ea2a604888fd59ca5;hpb=ccf38f8bef1adef7c1ef8797d8c84e477bc82305;p=ndwebbie.git

diff --git a/calls.pl b/calls.pl
index 8aab04a..342f47d 100644
--- a/calls.pl
+++ b/calls.pl
@@ -19,11 +19,9 @@
 
 use strict;
 use warnings FATAL => 'all';
-no warnings qw(uninitialized);
-use POSIX;
+use ND::Include;
 our $BODY;
 our $DBH;
-our $LOG;
 my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Defense Calls');
@@ -31,7 +29,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 
@@ -41,14 +39,14 @@ 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')){
 			if ($DBH->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
 					,undef,param('tick'),$call->{id})){
 				$call->{landing_tick} = param('tick');
-				$LOG->execute($ND::UID,"DC updated landing tick for call $call->{id}");
+				log_message $ND::UID,"DC updated landing tick for call $call->{id}";
 			}else{
 				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
@@ -57,7 +55,7 @@ if ($call){
 			if ($DBH->do(q{UPDATE calls SET info = ? WHERE id = ?}
 					,undef,param('info'),$call->{id})){
 				$call->{info} = param('info');
-				$LOG->execute($ND::UID,"DC updated info for call $call->{id}");
+				log_message $ND::UID,"DC updated info for call $call->{id}";
 			}else{
 				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
@@ -89,7 +87,7 @@ if ($call){
 		for my $param (param()){
 			if ($param =~ /^change:(\d+)$/){
 				if($query->execute($1,$call->{id})){
-					$LOG->execute($ND::UID,"DC deleted fleet: $1, call $call->{id}");
+					log_message $ND::UID,"DC deleted fleet: $1, call $call->{id}";
 				}else{
 					$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 				}
@@ -103,7 +101,7 @@ if ($call){
 			if ($param =~ /^change:(\d+)$/){
 				my $shiptype = escapeHTML(param("shiptype:$1"));
 				if($query->execute($shiptype,$1,$call->{id})){
-					$LOG->execute($ND::UID,"DC set fleet: $1, call $call->{id} to: $shiptype");
+					log_message $ND::UID,"DC set fleet: $1, call $call->{id} to: $shiptype";
 				}else{
 					$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 				}
@@ -171,12 +169,14 @@ 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');