- news: latest: use $who instead of $::who - need a standard!

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index c27605ba57ff2fd6c29d76d605349cd929b17d19..f4cb80904acb802a5ecc3809a2fc04180ef3a75c 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -287,7 +287,7 @@ sub tell {
 
     # this one catches most of them
     if ($args =~ /^(\S+) (-?)about (.*)$/i) {
-       $target         = lc $1;
+       $target         = $1;
        $tell_obj       = $3;
        $dont_tell_me   = ($2) ? 1 : 0;
 
@@ -295,19 +295,19 @@ sub tell {
        $query          = $tell_obj;
     } elsif ($args =~ /^(\S+) where (\S+) can (\S+) (.*)$/i) {
        # i'm sure this could all be nicely collapsed
-       $target         = lc $1;
+       $target         = $1;
        $tell_obj       = $4;
        $query          = $tell_obj;
 
     } elsif ($args =~ /^(\S+) (what|where) (.*?) (is|are)[.?!]*$/i) {
-       $target         = lc $1;
+       $target         = $1;
        $qWord          = $2;
        $tell_obj       = $3;
        $verb           = $4;
        $query          = "$qWord $verb $tell_obj";
 
     } elsif ($args =~ /^(.*?) to (\S+)$/i) {
-       $target         = lc $3;
+       $target         = $3;
        $tell_obj       = $2;
        $query          = $tell_obj;
     }
@@ -330,7 +330,7 @@ sub tell {
 #    }
 
     # self.
-    if ($target eq $ident) {   # lc?
+    if ($target =~  /^\Q$ident\E$/i) {
        &msg($who, "Isn't that a bit silly?");
        return;
     }
@@ -355,7 +355,7 @@ sub tell {
        $message        = $tell_obj;
        $done++ unless (&Modules());
 
-       &VERB("teel: setting old values of who and msgType.",2);
+       &VERB("tell: setting old values of who and msgType.",2);
        $who            = $oldwho;
        $msgType        = $oldmtype;
 
@@ -389,10 +389,12 @@ sub DNS {
     my $dns = shift;
     my($match, $x, $y, $result);
     my $pid;
+    $dns =~ s/^\s+|\s+$//g;
 
     if ($dns =~ /(\d+\.\d+\.\d+\.\d+)/) {
        &status("DNS query by IP address: $in");
        $match = $1;
+
        $y = pack('C4', split(/\./, $match));
        $x = (gethostbyaddr($y, &AF_INET));
 
@@ -401,12 +403,14 @@ sub DNS {
        } else {
            $result = "I can't seem to find that address in DNS";
         }
+
     } else {
-       &status("DNS query by name: $in");
-       $x = join('.',unpack('C4',(gethostbyname($in))[4]));
+
+       &status("DNS query by name: $dns");
+       $x = join('.',unpack('C4',(gethostbyname($dns))[4]));
 
        if ($x !~ /^\s*$/) {
-           $result = $in." is ".$x;
+           $result = $dns." is ".$x;
        } else {
            $result = "I can\'t find that machine name";
        }