From 077833722ef75050ab46a7ccd8d254e5d90d699a Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Tue, 24 Apr 2001 12:58:49 +0000
Subject: [PATCH] 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
---
 src/IRC/Irc.pl        | 2 ++
 src/IRC/IrcHelpers.pl | 2 +-
 src/IRC/IrcHooks.pl   | 6 +-----
 src/IRC/Schedulers.pl | 7 ++++++-
 src/logger.pl         | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 0c25bb8..36d57aa 100644
--- 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 cbacea0..52948dd 100644
--- 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 0d5ea9f..f04e08b 100644
--- 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 8830f2f..d14c12c 100644
--- 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 ad4efa5..3e159ae 100644
--- 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) {
-- 
2.39.5