Updated checkPoints and currentCalls

[NDIRC.git] / Members.pm

diff --git a/Members.pm b/Members.pm
index bbe41c9bce2c7238b73470a2ebfea0a7d4cf81ea..ba62c1dd506adb417bba9c6ccaf602892871b3df 100644 (file)
--- a/Members.pm
+++ b/Members.pm
@@ -28,8 +28,7 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/currentCalls showraids checkPoints findSMS/;
 
 sub currentCalls {
-       my ($verbose) = @_;
-       DB();
+       my ($msg, $command) = @_;
        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,p.x
@@ -51,7 +50,7 @@ SQL
                        $calls .= " (Anti $row[1] ETA: $row[0] Cluster: $row[3] DC: $dc) |"
                }
                chop($calls);
-               if (defined $verbose || length $calls > 0){
+               if (defined $command || length $calls > 0){
                        $ND::server->command("msg $ND::target Current calls: $calls");
                }
        }
@@ -78,8 +77,7 @@ SQL
 }
 
 sub checkPoints {
-       my ($nick) = @_;
-       DB();
+       my ($nick,$command) = @_;
        my $f;
        if ($nick){
                if (officer() || dc() || bc()){
@@ -100,18 +98,18 @@ sub checkPoints {
 }
 
 sub findSMS {
-       my ($nick) = @_;
-       DB();
-       my $f;
+       my ($nick,$command) = @_;
+       unless (defined $nick){
+               $ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro\% will match barrow");
+               return;
+       }
        if (officer() || dc()){
-               $f = $ND::DBH->prepare("SELECT username,COALESCE(sms,'nothing added') FROM users WHERE username ILIKE ?");
+               my $f = $ND::DBH->prepare("SELECT username,COALESCE(sms,'nothing added') FROM users WHERE username ILIKE ?");
                if (my ($username,$sms) = $ND::DBH->selectrow_array($f,undef,$nick)){
-                       $ND::server->command("notice $ND::target $ND::B$username$ND::B has sms $ND::B$sms$ND::B");
+                       $ND::server->command("notice $ND::nick $ND::B$username$ND::B has sms $ND::B$sms$ND::B");
                }else{
-                       $ND::server->command("notice $ND::target No hit, maybe spelling mistake, or add % as wildcard");
+                       $ND::server->command("notice $ND::nick No hit, maybe spelling mistake, or add % as wildcard");
                }
-       }else{
-               $ND::server->command("notice $ND::target Only dcs and above are allowed to check for others");
        }
 }