order by last post

[ndwebbie.git] / raids.pl

diff --git a/raids.pl b/raids.pl
index b131fe575239db3e7c4d295055f646efc5deaa4b..a3cb3cc59170588c523a5d0c69960acaa7810c31 100644 (file)
--- a/raids.pl
+++ b/raids.pl
@@ -19,20 +19,19 @@
 
 use strict;
 use warnings FATAL => 'all';
-no warnings qw(uninitialized);
+use ND::Include;
 use POSIX;
 our $BODY;
 our $DBH;
-our $LOG;
 our $XML;
 
 my $raid;
-if (param('raid') =~ /^(\d+)$/){
+if (defined param('raid')){
        my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords FROM raids WHERE id = ? AND open AND not removed AND id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)});
-       $raid = $DBH->selectrow_hashref($query,undef,$1,$ND::UID);
+       $raid = $DBH->selectrow_hashref($query,undef,param('raid'),$ND::UID);
 }
 
-if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
+if (defined param('cmd') && defined param('target') && defined param('wave') && param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
        my $target = param('target');
        my $wave = param('wave');
        
@@ -49,7 +48,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
                if ($claims->rows == 0){
                        my $query = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave) VALUES(?,?,?)});
                        if($query->execute($target,$ND::UID,$wave)){
-                               $LOG->execute($ND::UID,"Claimed target $target wave $wave.");
+                               log_message $ND::UID,"Claimed target $target wave $wave.";
                        }
                }
        }
@@ -61,11 +60,11 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
                if ($claims->rows != 0){
                        my $query = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave,joinable) VALUES(?,?,?,TRUE)});
                        if($query->execute($target,$ND::UID,$wave)){
-                               $LOG->execute($ND::UID,"Joined target $target wave $wave.");
+                               log_message $ND::UID,"Joined target $target wave $wave.";
                        }
                }
        }
-       if (param('joinable') =~ /(TRUE|FALSE)/){
+       if (param('cmd') eq 'set' && defined param('joinable') && param('joinable') =~ /(TRUE|FALSE)/){
                my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ? AND uid = ?});
                $claims->execute($target,$wave,$ND::UID);
                if ($claims->rows != 0){
@@ -75,7 +74,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
        if (param('cmd') eq 'Unclaim'){
                my $query = $DBH->prepare(qq{DELETE FROM raid_claims WHERE target = ? AND uid = ? AND wave = ?});
                if ($query->execute($target,$ND::UID,$wave)){
-                       $LOG->execute($ND::UID,"Unclaimed target $target wave $wave.");
+                       log_message $ND::UID,"Unclaimed target $target wave $wave.";
                }
        }
        $DBH->commit;
@@ -132,8 +131,10 @@ ORDER BY size});
                        $target{Size} = floor($target->{size}/$num)*$num;
                        $num = pow(10,length($target->{fleetvalue})-2);
                        $target{FleetValue} = floor($target->{fleetvalue}/$num)*$num;
-                       $num = pow(10,length($target->{resvalue})-2);
-                       $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+                       if (defined $target->{resvalue}){
+                               $num = pow(10,length($target->{resvalue})-2);
+                               $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+                       }
                        $target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
 
                        my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans