nslookup -> dns as a forker

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 6ae80deeac76f34b90087aac504217a2ba209062..9d27eb9d5e52280399af1d0cbef20b0f99d8c4e5 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -19,23 +19,18 @@ use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
 &addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) );
 &addCmdHook("main", 'sched(stats|info)', ('CODEREF' => 'scheduleList', ) );
 &addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo',
-       'Cmdstats' => 'Factoid Info', Module => 'factoids', ) );
+       'Cmdstats' => 'Factoid Info', Module => 'Factoids', ) );
 &addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats',
        'Cmdstats' => 'Factoid Stats', Help => "factstats",
-       Forker => 1, 'Identifier' => 'factoids', ) );
+       Forker => 1, 'Identifier' => 'Factoids', ) );
 &addCmdHook("main", 'help', ('CODEREF' => 'help',
        'Cmdstats' => 'Help', ) );
 &addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) );
-&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell',
-       Help => 'spell', Identifier => 'spell', ) );
-&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS',
-       Help => 'nslookup', Identifier => 'allowDNS',
-       Forker => "NULL", ) );
 &addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell',
        Help => 'tell', Identifier => 'allowTelling',
        Cmdstats => 'Tell') );
-&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse',
-       Module => 'news', 'Cmdstats' => 'News' ) );
+&addCmdHook("main", 'News', ('CODEREF' => 'News::Parse',
+       Module => 'News', 'Cmdstats' => 'News' ) );
 &addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats',
 #      Forker => "NULL",
  ) );
@@ -236,56 +231,6 @@ sub karma {
     }
 }
 
-sub ispell {
-    my $query = shift;
-
-    if (! -x "/usr/bin/ispell") {
-       &msg($who, "no binary found.");
-       return;
-    }
-
-    if (!&validExec($query)) {
-       &msg($who,"argument appears to be fuzzy.");
-       return;
-    }
-
-    my $reply = "I can't find alternate spellings for '$query'";
-
-    foreach (`/bin/echo '$query' | /usr/bin/ispell -a -S`) {
-       chop;
-       last if !length;                # end of query.
-
-       if (/^\@/) {            # intro line.
-           next;
-       } elsif (/^\*/) {               # possibly correct.
-           $reply = "'$query' may be spelled correctly";
-           last;
-       } elsif (/^\&/) {               # possible correction(s).
-           s/^\& (\S+) \d+ \d+: //;
-           my @array = split(/,? /);
-
-           $reply = "possible spellings for $query: @array";
-           last;
-       } elsif (/^\+/) {
-           &DEBUG("spell: '+' found => '$_'.");
-           last;
-       } elsif (/^# (.*?) 0$/) {
-           # none found.
-           last;
-       } else {
-           &DEBUG("spell: unknown: '$_'.");
-       }
-    }
-
-    &pSReply($reply);
-}
-
-sub nslookup {
-    my $query = shift;
-    &status("DNS Lookup: $query");
-    &DNS($query);
-}
-
 sub tell {
     my $args = shift;
     my ($target, $tell_obj) = ('','');
@@ -396,45 +341,6 @@ sub tell {
     &msg($target, $reply);
 }
 
-sub DNS {
-    my $dns = shift;
-    my($match, $x, $y, $result);
-    my $pid;
-    $dns =~ s/^\s+|\s+$//g;
-
-    if (!defined $dns or $dns =~ /^\s*$/ or $dns =~ / /) {
-       &help("dns");
-       return;
-    }
-
-    if ($dns =~ /(\d+\.\d+\.\d+\.\d+)/) {
-       $match = $1;
-       &status("DNS query by IP address: $match");
-
-       $y = pack('C4', split(/\./, $match));
-       $x = (gethostbyaddr($y, &AF_INET));
-
-       if ($x !~ /^\s*$/) {
-           $result = $match." is ".$x unless ($x =~ /^\s*$/);
-       } else {
-           $result = "I can't seem to find that address in DNS";
-       }
-
-    } else {
-
-       &status("DNS query by name: $dns");
-       $x = join('.',unpack('C4',(gethostbyname($dns))[4]));
-
-       if ($x !~ /^\s*$/) {
-           $result = $dns." is ".$x;
-       } else {
-           $result = "I can\'t find that machine name";
-       }
-    }
-
-    &performReply($result);
-}
-
 sub countryStats {
     if (exists $cache{countryStats}) {
        &msg($who,"countrystats is already running!");
@@ -576,10 +482,11 @@ sub userCommands {
        }
 
        if (scalar @args == 2) {
-           if (length $args[0] != 2) {
-               &msg($who, "invalid format...");
-               return;
-           }
+# disable cause $1$ will use md5
+#          if (length $args[0] != 2) {
+#              &msg($who, "invalid format...");
+#              return;
+#          }
 
            &pSReply( crypt($args[1], $args[0]) );
        } else {