X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=editRaid.pl;h=94ed68da85685c964d3ef05d55b15759c0bd5e07;hb=bea9ca01144b2ecfdd1fb0f7efc7b21f170da8c3;hp=a1de374e59b81b597583d536b882b07c81b035fc;hpb=49477962790fe1b056d500783d36b6bcb5dd0707;p=ndwebbie.git

diff --git a/editRaid.pl b/editRaid.pl
index a1de374..94ed68d 100644
--- a/editRaid.pl
+++ b/editRaid.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 => 'Create/Edit Raids');
@@ -34,11 +32,11 @@ my @alliances = alliances();
 $BODY->param(Alliances => \@alliances);
 
 my $raid;
-if (param('raid') =~ /^(\d+)$/){
+if (defined param 'raid' and 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");
@@ -49,7 +47,7 @@ if (param('cmd') eq 'submit'){
 	}
 }
 
-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'){
@@ -101,7 +99,7 @@ if ($raid){
 			}
 		}
 		if (param('alliance') =~ /^(\d+)$/ && $1 != 1){
-			$LOG->execute($ND::UID,"BC adding alliance $1 to raid");
+			log_message $ND::UID,"BC adding alliance $1 to 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)){
@@ -114,6 +112,7 @@ if ($raid){
 		$groups->execute();
 		while (my $group = $groups->fetchrow_hashref){
 			my $query;
+			next unless defined param $group->{gid};
 			if (param($group->{gid}) eq 'remove'){
 				$query = $delgroup;
 			}elsif(param($group->{gid}) eq 'add'){
@@ -129,12 +128,12 @@ if ($raid){
 			$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 		}
 	}
-	if (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>";
-		}
+}
+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>";
 	}
 }
 
@@ -174,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";
 	}