units -> Units

[infobot.git] / src / Modules / UserDCC.pl

diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl
index c813f56ac107bdf4c3955ec9ffd36f9bc0b29780..86812df4c14b921e50cca5218ec8497e67a99d07 100644 (file)
--- a/src/Modules/UserDCC.pl
+++ b/src/Modules/UserDCC.pl
@@ -115,7 +115,7 @@ sub userDCC {
     # dump variables.
     if ($message =~ /^dumpvars$/i) {
        return unless (&hasFlag("o"));
-       return unless (&IsParam("dumpvars"));
+       return unless (&IsParam("DumpVars"));
 
        &status("Dumping all variables...");
        &dumpallvars();
@@ -125,8 +125,8 @@ sub userDCC {
 
     # dump variables ][.
     if ($message =~ /^symdump$/i) {
-       return unless (&hasFlag("o"));
-       return unless (&IsParam("symdump"));
+       return unless (&hasFlag('o'));
+       return unless (&IsParam('DumpVars2'));
 
        &status("Dumping all variables...");
        &symdumpAllFile();
@@ -349,6 +349,23 @@ sub userDCC {
        return;
     }
 
+    # do.
+    if ($message =~ s/^do\s+(\S+)\s+(.*)//) {
+       return unless (&hasFlag("o"));
+       my ($chan,$msg) = (lc $1, $2);
+
+       &DEBUG("chan => '$1', msg => '$msg'.");
+
+       # TODO: add nick destination.
+       if (&validChan($chan)) {
+           &action($chan, $msg);
+       } else {
+           &msg($who,"i'm not on \002$chan\002, sorry.");
+       }
+
+       return;
+    }
+
     # die.
     if ($message =~ /^die$/) {
        return unless (&hasFlag("n"));
@@ -568,7 +585,7 @@ sub userDCC {
            }
 
            foreach (keys %vals) {
-               &pSReply("  $what = $_(" . scalar(keys %{$vals{$_}}) . "): ".join(' ', keys %{ $vals{$_} } ) );
+               &pSReply("  $what = $_(" . scalar(keys %{$vals{$_}}) . "): ".join(' ', sort keys %{ $vals{$_} } ) );
            }
 
            &pSReply("End of list.");
@@ -706,8 +723,8 @@ sub userDCC {
            return;
        }
 
-       my $u           = &getUser($who);
-       my $crypt       = &mkcrypt($args[0]);
+       my $u = &getUser($who);
+       my $crypt = &mkcrypt($args[0]);
 
        &pSReply("Set your passwd to '$crypt'");
        $users{$u}{PASS} = $crypt;
@@ -737,7 +754,8 @@ sub userDCC {
            return;
        }
 
-       if (scalar @args == 1) {        # del pass.
+       if (scalar @args == 1) {
+           # del pass.
            if (!&IsFlag("n") and $who !~ /^\Q$verifyUser\E$/i) {
                &pSReply("cannot remove passwd of others.");
                return;
@@ -778,10 +796,12 @@ sub userDCC {
 
        my $chflag;
        my $user;
-       if ($args[0] =~ /^$mask{nick}$/i) {     # <nick>
+       if ($args[0] =~ /^$mask{nick}$/i) {
+           # <nick>
            $user       = &getUser($args[0]);
            $chflag     = $args[1];
-       } else {                                # <flags>
+       } else {
+           # <flags>
            $user       = &getUser($who);
            &DEBUG("user $who... nope.") unless (defined $user);
            $user       = &getUser($verifyUser);
@@ -945,14 +965,14 @@ sub userDCC {
            return;
        }
 
-       if ($mask !~ /^$mask{nuh}$/) {
-           &pSReply("error: mask ($mask) is not a real hostmask.");
-           return;
-       }
-
        my $count = scalar keys %{ $users{$user}{HOSTS} };
 
        if ($state) {                           # add.
+           if ($mask !~ /^$mask{nuh}$/) {
+               &pSReply("error: mask ($mask) is not a real hostmask.");
+               return;
+           }
+
            if (exists $users{$user}{HOSTS}{$mask}) {
                &pSReply("mask $mask already exists.");
                return;
@@ -1295,7 +1315,7 @@ sub userDCC {
 
        if ($str eq "+") {
            if (scalar @args != 2) {
-               &pSReply(".+host requires hostmask argument.");
+               &pSReply("+user requires hostmask argument.");
                return;
            }
        } elsif (scalar @args != 1) {
@@ -1303,29 +1323,30 @@ sub userDCC {
            return;
        }
 
-       if ($state) {                   # adduser.
+       if ($state) {
+           # adduser.
            if (scalar @args == 1) {
                $args[1]        = &getHostMask($args[0]);
                &pSReply("Attemping to guess $args[0]'s hostmask...");
 
                # crude hack... crappy Net::IRC
                $conn->schedule(5, sub {
-       # hopefully this is right.
-       my $nick = (keys %{ $cache{nuhInfo} })[0];
-       if (!defined $nick) {
-           &pSReply("couldn't get nuhinfo... adding user without a hostmask.");
-           &userAdd($nick);
-           return;
-       }
-
-       my $mask = &makeHostMask( $cache{nuhInfo}{$nick}{NUH} );
+                   # hopefully this is right.
+                   my $nick = (keys %{ $cache{nuhInfo} })[0];
+                   if (!defined $nick) {
+                       &pSReply("couldn't get nuhinfo... adding user without a hostmask.");
+                       &userAdd($nick);
+                       return;
+                   }
+                   my $mask = &makeHostMask( $cache{nuhInfo}{$nick}{NUH} );
 
-       if ( &userAdd($nick, $mask) ) { # success.
-               &pSReply("Added $nick with flags $users{$nick}{FLAGS}");
-               my @hosts = keys %{ $users{$nick}{HOSTS} };
-               &pSReply("hosts: @hosts");
-       }
-});
+                   if ( &userAdd($nick, $mask) ) {
+                       # success.
+                       &pSReply("Added $nick with flags $users{$nick}{FLAGS}");
+                       my @hosts = keys %{ $users{$nick}{HOSTS} };
+                       &pSReply("hosts: @hosts");
+                   }
+               });
                return;
            }