X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FEditRaid.pm;fp=ND%2FWeb%2FPages%2FEditRaid.pm;h=4ed3981c9fe33bba91e6d8a786d411719778ad52;hb=a7428ba34cb5ee5e516fd714d152670eb51d8eb4;hp=16eab5e1c4dd58fb3567aa1ff19971e10b8fa8db;hpb=88bab2dd26fcdb7a49a81e9fe6a74022ce079f52;p=ndwebbie.git

diff --git a/ND/Web/Pages/EditRaid.pm b/ND/Web/Pages/EditRaid.pm
index 16eab5e..4ed3981 100644
--- a/ND/Web/Pages/EditRaid.pm
+++ b/ND/Web/Pages/EditRaid.pm
@@ -140,6 +140,7 @@ sub render_body {
 			my $comment = $DBH->prepare(q{UPDATE raid_targets SET comment = ? WHERE id = ?});
 			my $unclaim =  $DBH->prepare(q{DELETE FROM raid_claims WHERE target = ? AND wave = ?});
 			my $block = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave) VALUES(?,-2,?)});
+			my $remove = $DBH->prepare(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?});
 			for $_ (param()){
 				if (/^comment:(\d+)$/){
 					$comment->execute(escapeHTML(param($_)),$1) or $error .= p($DBH->errstr);
@@ -148,18 +149,12 @@ sub render_body {
 					log_message $ND::UID,"BC unclaimed target $1 wave $2.";
 				}elsif(/^block:(\d+):(\d+)$/){
 					$block->execute($1,$2) or $error .= p($DBH->errstr);
+				}elsif(/^remove:(\d+)$/){
+					$remove->execute($raid->{id},$1) or $error .= p($DBH->errstr);
 				}
 			}
 			$DBH->commit or $error .= p($DBH->errstr);
 		}
-
-	}
-	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>";
-		}
 	}
 
 	my $groups = $DBH->prepare(q{SELECT g.gid,g.groupname,raid FROM groups g LEFT OUTER JOIN (SELECT gid,raid FROM raid_access WHERE raid = ?) AS ra ON g.gid = ra.gid WHERE g.attack});
@@ -202,7 +197,7 @@ sub render_body {
 			$order = "$1 DESC";
 		}
 
-		my $targetquery = $DBH->prepare(qq{SELECT r.id,coords(x,y,z),raid,comment,size,score,value,race,planet_status AS planetstatus,relationship,comment,r.planet
+		my $targetquery = $DBH->prepare(qq{SELECT r.id,coords(x,y,z),comment,size,score,value,race,planet_status AS planetstatus,relationship,comment,r.planet
 			FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet 
 			WHERE r.raid = ?
 			ORDER BY $order});