X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FRaids.pm;h=2382a8fed360ac0503ca26f7da1123f6433afc2f;hb=1ac7abba88180254eaf3a65e1aded1c6d7c42576;hp=4b454589af81e11a6bebc19e4bba811a72d39a49;hpb=e1dcc7600950592294588f5980bef59a018dd768;p=ndwebbie.git diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm index 4b45458..2382a8f 100644 --- a/NDWeb/Pages/Raids.pm +++ b/NDWeb/Pages/Raids.pm @@ -119,13 +119,18 @@ sub render_body { my $target = param('target'); my $wave = param('wave'); - my $findtarget = $DBH->prepare("SELECT rt.id FROM raid_targets rt NATURAL JOIN raid_access ra NATURAL JOIN groupmembers where uid = ? AND id = ?"); + $DBH->begin_work; + my $findtarget = $DBH->prepare(q{SELECT rt.id FROM raid_targets rt + NATURAL JOIN raid_access ra NATURAL JOIN groupmembers + WHERE uid = ? AND id = ? + FOR UPDATE + }); my $result = $DBH->selectrow_array($findtarget,undef,$ND::UID,$target); if ($result != $target){ + $DBH->rollback; return $self->noAccess; } - $DBH->begin_work; if (param('cmd') eq 'Claim'){ my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ?}); $claims->execute($target,$wave); @@ -222,9 +227,9 @@ sub render_body { $target{Id} = $target->{id}; $target{Race} = $target->{race}; my $num = pow(10,length($target->{score})-2); - $target{Score} = ceil($target->{score}/$num)*$num; + $target{Score} = "Hidden"; #ceil($target->{score}/$num)*$num; $num = pow(10,length($target->{value})-2); - $target{Value} = ceil($target->{value}/$num)*$num; + $target{Value} = "Hidden"; #ceil($target->{value}/$num)*$num; $num = pow(10,length($target->{size})-2); $target{Size} = floor($target->{size}/$num)*$num; $num = pow(10,length($target->{fleetvalue})-2); @@ -282,7 +287,7 @@ sub render_body { $size -= $roids; my $xp = 0; if ($planet){ - $xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value}); + $xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value}); } push @roids,{Wave => $i, Roids => $roids, XP => $xp}; if ($self->{AJAX}){