user management

[ndwebbie.git] / intel.pl

diff --git a/intel.pl b/intel.pl
index 2b33c5e4849d19afff8f79f7781aa83ea798f6b4..d596957149e74e6865c09d08d7e7426dc58d5cc3 100644 (file)
--- a/intel.pl
+++ b/intel.pl
@@ -28,7 +28,7 @@ $ND::TEMPLATE->param(TITLE => 'Intel');
 die "You don't have access" unless isIntel() || isHC();
 
 my $planet;
-if (param('coords') =~ /(\d+)(?: |:)(\d+)(?: |:)(\d+)/){
+if (param('coords') =~ /^(\d+)(?: |:)(\d+)(?: |:)(\d+)$/){
        my $query = $DBH->prepare(q{SELECT x,y,z,coords(x,y,z),id, nick, alliance,alliance_id, planet_status,channel FROM current_planet_stats
 WHERE  x = ? AND y = ? AND z = ?});
        $planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3);
@@ -38,7 +38,30 @@ my $showticks = 'AND (i.tick - i.eta) > (tick() - 48)';
 if (param('show') eq 'all'){
        $showticks = '';
 }elsif (param('show') =~ /^(\d+)$/){
-       $showticks = "AND (i.tick - i.eta) > tick() - $1";
+       $showticks = "AND (i.tick - i.eta) > (tick() - $1)";
+}
+
+if (param('cmd') eq 'coords'){
+       my $coords = param('coords');
+       $DBH->do(q{CREATE TEMPORARY TABLE coordlist (
+       x integer NOT NULL,
+       y integer NOT NULL,
+       z integer NOT NULL,
+       PRIMARY KEY (x,y,z)
+               )});
+       my $insert = $DBH->prepare(q{INSERT INTO coordlist (x,y,z) VALUES(?,?,?)});
+       while ($coords =~ m/(\d+):(\d+):(\d+)/g){
+               $insert->execute($1,$2,$3);
+       }
+       my $planets = $DBH->prepare(q{SELECT (((p.x || ':') || p.y) || ':') || p.z AS coords, alliance FROM current_planet_stats p
+       JOIN coordlist c ON p.x = c.x AND p.y = c.y AND p.z = c.z
+ORDER BY alliance, p.x, p.y, p.z});
+       $planets->execute;
+       my @planets;
+       while (my $planet = $planets->fetchrow_hashref){
+               push @planets,$planet;
+       }
+       $BODY->param(CoordList => \@planets);
 }
 
 if ($planet){
@@ -143,6 +166,7 @@ if ($planet){
                                OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack'))
                        AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
                        $showticks}));
+       $query->execute() or print $DBH->errstr;
 
        my @intellists;
        my @intel;
@@ -154,7 +178,7 @@ if ($planet){
                }
                push @intel,$intel;
        }
-       push @intellists,{Message => q{Missions where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};
+       push @intellists,{Message => q{Intel where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};
        $BODY->param(IntelLIsts => \@intellists);
 }
 my $query = $DBH->prepare(q{SELECT i.id, u.username, i.message, report_date FROM intel_messages i