fix more warnings

set $ident in nick()

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@464 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 0c25bb8951e59004562391c1e896d8978984cc33..36d57aae2ad52fe5a41f79e7c40c65d92577af65 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -550,6 +550,8 @@ sub nick {
     if ($nick =~ /^$mask{nick}$/) {
        &DEBUG("nick: Changing nick to $nick (from $ident)");
        rawout("NICK ".$nick);
+       # unfortunately, on_nick doesn't catch ourself.
+       $ident  = $nick;
        return 1;
     }
     &DEBUG("nick: failed... why oh why (nick => $nick)");

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index cbacea0b53fcdbdf51ee409efcdac487e7f6c70f..52948dd569eb60e2b4172d56d44657b18abb3121 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -303,7 +303,7 @@ sub chanServCheck {
     &DEBUG("chanServCheck($chan) called.");
 
     if ( &IsParam("nickServ_pass") and !$nickserv) {
-       &DEBUG("chanServ_ops($_): nickserv enabled but not alive?  (ircCheck)");
+       &DEBUG("chanServ_ops($chan): nickserv enabled but not alive? (ircCheck)");
        return;
     }
     return if (exists $channels{$chan}{'o'}{$ident});

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 0d5ea9f5dc72f72b1b6e39716e0859c8d86ccc30..f04e08b1e2f5fac7c27e75e27ed84617434e7247 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -369,11 +369,6 @@ sub on_endofnames {
     &status("$b_blue$chan$ob: [$chanstats]");
 
     &chanServCheck($chan);
-
-    if (scalar @joinchan) {    # remaining channels to join.
-       # lets do two at once!
-       &joinNextChan();
-    }
     &joinNextChan();
 }
 
@@ -625,6 +620,7 @@ sub on_nick {
     delete $nuh{lc $nick};
 
     # successful self-nick change.
+    &DEBUG("on_nick... nick => $nick, ident => $ident");
     if ($ident eq "$nick-" or "$ident-" eq $nick) {
        &DEBUG("on_nick: well... we need this bug fixed.");
        &DEBUG("ident => $ident");

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 8830f2f753473a74adef8d4e6d4571ff4cb365a5..d14c12ced7d040d1cf389e24b09fa2d4f2b85c41 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -364,7 +364,11 @@ sub chanlimitCheck {
            ### run NAMES again and flush it.
        }
 
-       next unless (!defined $limit or $limit != $newlimit);
+       next unless (!defined $limit);
+       if ($limit == $newlimit) {
+           $cache{chanlimitChange}{$chan} = time();
+           next;
+       }
 
        if (!exists $channels{$chan}{'o'}{$ident}) {
            &status("ChanLimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan});
@@ -856,6 +860,7 @@ sub shmFlush {
 
 ### this is semi-scheduled
 sub getNickInUse {
+    &DEBUG("gNIU: ident => $ident, ircNick => $param{'ircNick'}");
     if ($ident eq $param{'ircNick'}) {
        &status("okay, got my nick back.");
        return;

diff --git a/src/logger.pl b/src/logger.pl
index ad4efa53a4dd9979548eb96272c387a1af20eb8c..3e159ae3390cfe8646a38743da7247dea6956e83 100644 (file)
--- a/src/logger.pl
+++ b/src/logger.pl
@@ -191,7 +191,7 @@ sub status {
 
     if ($input eq $logold) {
        # allow perl flooding
-       $logrepeat++ unless (/!WARN! PERL: Use of uninitialized/);
+       $logrepeat++ unless ($input =~ /PERL: Use of uninitialized/);
 
        # todo: prevent massive repetitive throttling.
        if ($logrepeat >= 3) {