Add command name as argument and modify quote commands

[NDIRC.git] / Members.pm

diff --git a/Members.pm b/Members.pm
index 49485f90f2e0160a1c1fa28dc3e7ff1045a35779..bbe41c9bce2c7238b73470a2ebfea0a7d4cf81ea 100644 (file)
--- a/Members.pm
+++ b/Members.pm
@@ -16,10 +16,10 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Members;
+package NDIRC::Members;
 use strict;
 use warnings;
-use ND::IRC::Access;
+use NDIRC::Access;
 use ND::DB;
 require Exporter;
 
@@ -32,12 +32,14 @@ sub currentCalls {
        DB();
        if (1){ #TODO: add check for member
                my $f = $ND::DBH->prepare(<<SQL
-       SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username
+       SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username,p.x
        FROM calls c 
                JOIN incomings i ON i.call = c.id
                LEFT OUTER JOIN users dc ON dc.uid = c.dc
+               JOIN users u ON u.uid = c.member
+               JOIN current_planet_stats p ON u.planet = p.id
        WHERE open AND (c.landing_tick - tick()) >= 7
-       GROUP BY c.id,c.landing_tick,dc.username
+       GROUP BY c.id,c.landing_tick,dc.username,p.x
        ORDER BY c.landing_tick;
 SQL
 );
@@ -46,7 +48,7 @@ SQL
                while (my @row = $f->fetchrow()){
                        chop($row[1]);
                        my $dc = defined $row[2] ? $row[2] : '';
-                       $calls .= " (Anti $row[1] ETA: $row[0] DC: $dc) |"
+                       $calls .= " (Anti $row[1] ETA: $row[0] Cluster: $row[3] DC: $dc) |"
                }
                chop($calls);
                if (defined $verbose || length $calls > 0){