X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=editRaid.pl;h=4f3a76b37f63cdd5fd071a8879692be8899b4937;hb=dfdaf29be0eb73b0b900ce3bced443120b1fca96;hp=e39e279b2dc669d91ad2defa3b0c4e8dcf209d0b;hpb=701ab8c5f5b65089fe9201dbe49f9c4b7e04c624;p=ndwebbie.git

diff --git a/editRaid.pl b/editRaid.pl
index e39e279..4f3a76b 100644
--- a/editRaid.pl
+++ b/editRaid.pl
@@ -18,10 +18,12 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
 use POSIX;
 our $BODY;
 our $DBH;
 our $LOG;
+my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Create/Edit Raids');
 
@@ -35,18 +37,18 @@ if (param('raid') =~ /^(\d+)$/){
 	my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords,open FROM raids WHERE id = ?});
 	$raid = $DBH->selectrow_hashref($query,undef,$1);
 }
-if (param('cmd') eq 'submit'){
+if (defined param('cmd') && param('cmd') eq 'submit'){
 	my $query = $DBH->prepare(q{INSERT INTO raids (tick,waves,message) VALUES(?,?,'')});
 	if ($query->execute(param('tick'),param('waves'))){
 		$raid = $DBH->last_insert_id(undef,undef,undef,undef,"raids_id_seq");
 		my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords,open FROM raids WHERE id = ?});
 		$raid = $DBH->selectrow_hashref($query,undef,$raid);
 	}else{
-		print "<p> Something went wrong: ".$DBH->errstr."</p>";
+		$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 	}
 }
 
-if ($raid){
+if ($raid && defined param('cmd')){
 	if (param('cmd') eq 'remove'){
 		$DBH->do(q{UPDATE raids SET open = FALSE, removed = TRUE WHERE id = ?},undef,$raid->{id});
 	}elsif (param('cmd') eq 'Open'){
@@ -66,6 +68,11 @@ if ($raid){
 		if($DBH->do(q{UPDATE raids SET released_coords = FALSE WHERE id = ?},undef,$raid->{id})){
 			$raid->{released_coords} = 0;
 		}
+	}elsif (param('cmd') eq 'comment'){
+		$DBH->do(q{UPDATE raid_targets SET comment = ? WHERE id = ?}
+			,undef,escapeHTML(param('comment')),param('target'))
+			or $error .= p($DBH->errstr);
+
 	}elsif (param('cmd') eq 'change'){
 		$DBH->begin_work;
 		my $message = escapeHTML(param('message'));
@@ -74,14 +81,14 @@ if ($raid){
 		$raid->{tick} = param('tick');
 		unless ($DBH->do(qq{UPDATE raids SET message = ?, tick = ?, waves = ? WHERE id = ?}
 				,undef,$message,param('tick'),param('waves'),$raid->{id})){
-			print "<p> Something went wrong: ".$DBH->errstr."</p>";
+			$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 		}
 		my $sizelimit = '';
 		if (param('sizelimit') =~ /^(\d+)$/){
 			$sizelimit = "AND p.size >= $1";
 			unless ($DBH->do(qq{DELETE FROM raid_targets WHERE id IN (SELECT t.id FROM current_planet_stats p 
 	JOIN raid_targets t ON p.id = t.planet WHERE p.size < ? AND t.raid = ?)},undef,$1,$raid->{id})){
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		my $targets = param('targets');
@@ -89,7 +96,7 @@ if ($raid){
 	SELECT ?, id FROM current_planet_stats p WHERE x = ? AND y = ? AND COALESCE(z = ?,TRUE) $sizelimit)});
 		while ($targets =~ m/(\d+):(\d+)(?::(\d+))?/g){
 			unless ($addtarget->execute($raid->{id},$1,$2,$3)){
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		if (param('alliance') =~ /^(\d+)$/ && $1 != 1){
@@ -97,7 +104,7 @@ if ($raid){
 			my $addtarget = $DBH->prepare(qq{INSERT INTO raid_targets(raid,planet) (
 	SELECT ?,id FROM current_planet_stats p WHERE alliance_id = ? $sizelimit)});
 			unless ($addtarget->execute($raid->{id},$1)){
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		my $groups = $DBH->prepare('SELECT gid,groupname FROM groups WHERE attack');
@@ -113,20 +120,20 @@ if ($raid){
 			}
 			if ($query){
 				unless ($query->execute($raid->{id},$group->{gid})){
-					print "<p> Something went wrong: ".$DBH->errstr."</p>";
+					$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 				}
 			}
 		}
 		unless ($DBH->commit){
-			print "<p> Something went wrong: ".$DBH->errstr."</p>";
+			$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 		}
 	}
-	if (param('removeTarget')){
-		print "test";
-		unless($DBH->do(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?}
-				,undef,$raid->{id},param('removeTarget'))){
-			print "<p> Something went wrong: ".$DBH->errstr."</p>";
-		}
+}
+if ($raid && param('removeTarget')){
+	$error .= "test";
+	unless($DBH->do(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?}
+			,undef,$raid->{id},param('removeTarget'))){
+		$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 	}
 }
 
@@ -166,7 +173,7 @@ if ($raid){
 	$BODY->param(Message => $raid->{message});
 	
 	my $order = "p.x,p.y,p.z";
-	if (param('order') =~ /^(score|size|value|xp|race)$/){
+	if (param('order') && param('order') =~ /^(score|size|value|xp|race)$/){
 		$order = "$1 DESC";
 	}
 
@@ -174,7 +181,7 @@ if ($raid){
 		FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet 
 		WHERE r.raid = ?
 		ORDER BY $order});
-	$targetquery->execute($raid->{id}) or print $DBH->errstr;
+	$targetquery->execute($raid->{id}) or $error .= $DBH->errstr;
 	my @targets;
 	while (my $target = $targetquery->fetchrow_hashref){
 		push @targets,$target;
@@ -184,5 +191,6 @@ if ($raid){
 	$BODY->param(Waves => 3);
 	$BODY->param(LandingTick => $ND::TICK+12);
 }
+$BODY->param(Error => $error);
 
 1;