From: Michael Andreen <harv@ruin.nu>
Date: Fri, 29 Dec 2006 17:19:17 +0000 (+0000)
Subject: more fatal warnings and other cleanup
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=74929efc936d3f6ec1c892697eaf18342327c227;p=ndwebbie.git

more fatal warnings and other cleanup
---

diff --git a/raids.pl b/raids.pl
index b131fe5..1ebaad6 100644
--- a/raids.pl
+++ b/raids.pl
@@ -19,7 +19,6 @@
 
 use strict;
 use warnings FATAL => 'all';
-no warnings qw(uninitialized);
 use POSIX;
 our $BODY;
 our $DBH;
@@ -27,12 +26,12 @@ our $LOG;
 our $XML;
 
 my $raid;
-if (param('raid') =~ /^(\d+)$/){
+if (defined param('raid')){
 	my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords FROM raids WHERE id = ? AND open AND not removed AND id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)});
-	$raid = $DBH->selectrow_hashref($query,undef,$1,$ND::UID);
+	$raid = $DBH->selectrow_hashref($query,undef,param('raid'),$ND::UID);
 }
 
-if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
+if (defined param('cmd') && defined param('target') && defined param('wave') && param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
 	my $target = param('target');
 	my $wave = param('wave');
 	
@@ -65,7 +64,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
 			}
 		}
 	}
-	if (param('joinable') =~ /(TRUE|FALSE)/){
+	if (param('cmd') eq 'set' && defined param('joinable') && param('joinable') =~ /(TRUE|FALSE)/){
 		my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ? AND uid = ?});
 		$claims->execute($target,$wave,$ND::UID);
 		if ($claims->rows != 0){
@@ -132,8 +131,10 @@ ORDER BY size});
 			$target{Size} = floor($target->{size}/$num)*$num;
 			$num = pow(10,length($target->{fleetvalue})-2);
 			$target{FleetValue} = floor($target->{fleetvalue}/$num)*$num;
-			$num = pow(10,length($target->{resvalue})-2);
-			$target{ResValue} = floor($target->{resvalue}/$num)*$num;
+			if (defined $target->{resvalue}){
+				$num = pow(10,length($target->{resvalue})-2);
+				$target{ResValue} = floor($target->{resvalue}/$num)*$num;
+			}
 			$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
 
 			my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans 
diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index a32417a..0361f53 100644
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -34,9 +34,9 @@
 <form action="<TMPL_VAR NAME=PAGE>" method="post">
 	<p>
 		<input type="button" value="Update claims"
-			onclick = "update('<TMPL_VAR NAME=PAGE>?xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
+			onclick = "update('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
 		<input type="button" value="Update target list"
-			onclick = "listTargets('<TMPL_VAR NAME=PAGE>?xml=1&amp;raid=<TMPL_VAR NAME=Raid>')"/>
+			onclick = "listTargets('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
 	</p>
 </form>
 </TMPL_IF>
@@ -73,7 +73,7 @@
 	<TMPL_IF Ajax>
 	<TMPL_LOOP Claims>
      <input type="button" value="Claim wave <TMPL_VAR NAME=Wave>"
-        onclick = "claim('<TMPL_VAR NAME=PAGE>?xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
+        onclick = "claim('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
 	</TMPL_LOOP>
 	<TMPL_ELSE>
 	<TMPL_LOOP Claims>
@@ -89,7 +89,7 @@
 </TMPL_LOOP>
 <TMPL_IF Ajax>
 	<script type="text/javascript">
-	update('<TMPL_VAR NAME=PAGE>?xml=1&amp;raid=<TMPL_VAR NAME=Raid>');
+	update('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>');
 	</script>
 </TMPL_IF>