From 3c4dfc22fa79ba05dd2f4b772415f19c31b658e7 Mon Sep 17 00:00:00 2001 From: timriker Date: Fri, 9 Jul 2004 18:14:49 +0000 Subject: [PATCH] ws git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@996 c11ca15a-4712-0410-83d8-924469b57eb5 --- src/Modules/UserDCC.pl | 48 +++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl index 301581d..a9ed3e2 100644 --- a/src/Modules/UserDCC.pl +++ b/src/Modules/UserDCC.pl @@ -723,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; @@ -754,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; @@ -795,10 +796,12 @@ sub userDCC { my $chflag; my $user; - if ($args[0] =~ /^$mask{nick}$/i) { # + if ($args[0] =~ /^$mask{nick}$/i) { + # $user = &getUser($args[0]); $chflag = $args[1]; - } else { # + } else { + # $user = &getUser($who); &DEBUG("user $who... nope.") unless (defined $user); $user = &getUser($verifyUser); @@ -1312,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) { @@ -1320,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; } -- 2.39.2