X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=calls.pl;h=0b843dfdb09dd910ad4e3481cced2294f39a4914;hb=7a75ed412208e6cd5f0720026a94dc21bb5e62c2;hp=b56a639e41aac5ba77e0c820baf47a43376c2bbe;hpb=aa6a1cd834d42beaf03b7b9ddb5e5686ea3b132e;p=ndwebbie.git

diff --git a/calls.pl b/calls.pl
index b56a639..0b843df 100644
--- a/calls.pl
+++ b/calls.pl
@@ -26,7 +26,7 @@ my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Defense Calls');
 
-die "You don't have access" unless isBC();
+die "You don't have access" unless isDC();
 
 my $call;
 if (param('call') =~ /^(\d+)$/){
@@ -170,13 +170,17 @@ ORDER BY p.x,p.y,p.z});
 	}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, 
-	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,
-	TRIM('/' FROM concat(p2.alliance ||'/')) AS alliance,
-	TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||'/')) AS attackers
+	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,
+	TRIM('/' FROM concat(p2.alliance ||' /')) AS alliance,
+	TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
 FROM calls c 
 	JOIN incomings i ON i.call = c.id
 	JOIN users u ON c.member = u.uid
@@ -190,9 +194,17 @@ ORDER BY c.landing_tick DESC
 	my @calls;
 	my $i = 0;
 	while (my $call = $query->fetchrow_hashref){
+		if ($call->{defense_points} < $minpoints){
+			$call->{DefPrio} = 'LowestPrio';
+		}elsif ($call->{defense_points} < $maxpoints){
+			$call->{DefPrio} = 'MediumPrio';
+		}else{
+			$call->{DefPrio} = 'HighestPrio';
+		}
+		$i++;
 		$call->{ODD} = $i % 2;
+		$call->{shiptype} = escapeHTML($call->{shiptype});
 		push @calls, $call;
-		$i++;
 	}
 	$BODY->param(Calls => \@calls);
 }