From: timriker <timriker@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Mon, 12 Jul 2004 22:13:05 +0000 (+0000)
Subject: more  ->  changes
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e90869fa73c898e68a689535ebeeda757ab86fe2;p=infobot.git

more  ->  changes


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

diff --git a/blootbot/src/IRC/Irc.pl b/blootbot/src/IRC/Irc.pl
index 1ffda4f..d359f30 100644
--- a/blootbot/src/IRC/Irc.pl
+++ b/blootbot/src/IRC/Irc.pl
@@ -10,7 +10,7 @@ no strict 'refs';
 
 use vars qw(%floodjoin %nuh %dcc %cache %conns %channels %param %mask
 	%chanconf %orig %ircPort %ircstats %last %netsplit);
-use vars qw($irc $nickserv $ident $conn $msgType $who $talkchannel
+use vars qw($irc $nickserv $conn $msgType $who $talkchannel
 	$addressed);
 use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
 		$pubcount $pubtime $pubsize);
@@ -273,6 +273,7 @@ sub msg {
 
 # Usage: &action(nick || chan, txt);
 sub action {
+    my $mynick = $conn->nick();
     my ($target, $txt) = @_;
     if (!defined $txt) {
 	&WARN("action: txt == NULL.");
@@ -284,7 +285,7 @@ sub action {
 	chop($txt) while (length $txt > 480);
     }
 
-    &status("* $ident/$target $txt");
+    &status("* $mynick/$target $txt");
     $conn->me($target, $txt);
 }
 
@@ -521,6 +522,7 @@ sub deop {
 sub kick {
     my ($nick,$chan,$msg) = @_;
     my (@chans) = ($chan eq "") ? (keys %channels) : lc($chan);
+    my $mynick = $conn->nick();
 
     if ($chan ne "" and &validChan($chan) == 0) {
 	&ERROR("kick: invalid channel $chan.");
@@ -535,7 +537,7 @@ sub kick {
 	    next;
 	}
 
-	if (!exists $channels{$chan}{o}{$ident}) {
+	if (!exists $channels{$chan}{o}{$mynick}) {
 	    &status("kick: do not have ops on $chan :(");
 	    next;
 	}
@@ -548,6 +550,7 @@ sub kick {
 sub ban {
     my ($mask,$chan) = @_;
     my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan);
+    my $mynick = $conn->nick();
     my $ban	= 0;
 
     if ($chan !~ /^\*?$/ and &validChan($chan) == 0) {
@@ -556,7 +559,7 @@ sub ban {
     }
 
     foreach $chan (@chans) {
-	if (!exists $channels{$chan}{o}{$ident}) {
+	if (!exists $channels{$chan}{o}{$mynick}) {
 	    &status("ban: do not have ops on $chan :(");
 	    next;
 	}
@@ -572,12 +575,13 @@ sub ban {
 sub unban {
     my ($mask,$chan) = @_;
     my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan);
+    my $mynick = $conn->nick();
     my $ban	= 0;
 
     &DEBUG("unban: mask = $mask, chan = @chans");
 
     foreach $chan (@chans) {
-	if (!exists $channels{$chan}{o}{$ident}) {
+	if (!exists $channels{$chan}{o}{$mynick}) {
 	    &status("unBan: do not have ops on $chan :(");
 	    next;
 	}
diff --git a/blootbot/src/IRC/Schedulers.pl b/blootbot/src/IRC/Schedulers.pl
index 932dd94..9c155c4 100644
--- a/blootbot/src/IRC/Schedulers.pl
+++ b/blootbot/src/IRC/Schedulers.pl
@@ -370,6 +370,7 @@ sub newsFlush {
 
 sub chanlimitCheck {
     my $interval = &getChanConfDefault("chanlimitcheckInterval", 10);
+    my $mynick=$conn->nick();
 
     if (@_) {
 	&ScheduleThis($interval, "chanlimitCheck");
@@ -411,7 +412,7 @@ sub chanlimitCheck {
 	    next;
 	}
 
-	if (!exists $channels{$chan}{'o'}{$ident}) {
+	if (!exists $channels{$chan}{'o'}{$mynick}) {
 	    &status("chanlimit: dont have ops on $chan.") unless (exists $cache{warn}{chanlimit}{$chan});
 	    $cache{warn}{chanlimit}{$chan} = 1;
 	    &chanServCheck($chan);
@@ -678,6 +679,7 @@ sub ircCheck {
     $cache{statusSafe} = 1;
     foreach (sort keys %conns) {
 	$conn=$conns{$_};
+	my $mynick=$conn->nick();
 	&DEBUG("ircCheck for $_");
 	my @join = &getJoinChans(1);
 	if (scalar @join) {
@@ -697,7 +699,7 @@ sub ircCheck {
 	    } else {
 		&status('ircCheck: possible lost in space; checking.'.
 		    scalar(gmtime) );
-		&msg($ident, "TEST");
+		&msg($mynick, "TEST");
 		$cache{connect} = time();
 	    }
 	}