X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=editRaid.pl;h=4f3a76b37f63cdd5fd071a8879692be8899b4937;hb=dfdaf29be0eb73b0b900ce3bced443120b1fca96;hp=fd109320880459d6edab93e7740f5b1c3be9bae0;hpb=aa6a1cd834d42beaf03b7b9ddb5e5686ea3b132e;p=ndwebbie.git diff --git a/editRaid.pl b/editRaid.pl index fd10932..4f3a76b 100644 --- a/editRaid.pl +++ b/editRaid.pl @@ -18,6 +18,7 @@ #**************************************************************************/ use strict; +use warnings FATAL => 'all'; use POSIX; our $BODY; our $DBH; @@ -36,7 +37,7 @@ 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"); @@ -47,7 +48,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'){ @@ -67,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')); @@ -122,12 +128,12 @@ if ($raid){ $error .= "

Something went wrong: ".$DBH->errstr."

"; } } - if (param('removeTarget')){ - $error .= "test"; - unless($DBH->do(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?} - ,undef,$raid->{id},param('removeTarget'))){ - $error .= "

Something went wrong: ".$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 .= "

Something went wrong: ".$DBH->errstr."

"; } } @@ -167,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"; }