X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FRootWarn.pl;h=704a45ae4b8a81d6ddac226571f476fd4f22eb35;hb=b1c56270ef9a315b7b586b5ae774d7153c95518c;hp=185130f31718077a5943afe73a2f2d123c70fb04;hpb=4af71a5a1add30c9150be6bb49b7aafabf17e63a;p=infobot.git

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 185130f..704a45a 100644
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -5,101 +5,128 @@
 #     Created: 19991008
 #
 
-### use strict;
+use strict;
+
+use vars qw(%channels %param);
+use vars qw($dbh $found $ident);
 
 sub rootWarn {
-    my ($nick,$user,$host,$chan) = @_;
-    my $attempt = &dbGet("rootwarn", "attempt", "nick='".lc($nick)."'") || 0;
-    my $warnmode	= &getChanConf("rootWarnMode");
-
-    if ($attempt == 0) {	# first timer.
-	if ($warnmode =~ /aggressive/i) {
-	    &status(">>> Detected root user; notifying nick and channel.");
-	    rawout("PRIVMSG $chan :R".("O" x int(rand 80 + 2))."T has landed!");
-	} else {
-	    &status(">>> Detected root user; notifying user");
-	}
-
-	if ($_ = &getFactoid("root")) {
-	    &msg($nick, "root is $_");
-	} else {
-	    &status("root needs to be defined in database.");
-	}
-
-    } elsif ($attempt < 2) {	# 2nd/3rd time occurrance.
-	&status("RootWarn: not first time root user; msg'ing $nick.");
-	if ($_ = &getFactoid("root again")) {
-	    &msg($nick, $_);
-	} else {
-	    &status("root again needs to be defined in database.");
-	}
-
-    } else {			# >3rd time occurrance.
-	if ($warnmode =~ /aggressive/i) {
-	    if ($channels{$chan}{'o'}{$ident}) {
-		&status("RootWarn: $nick... sigh... bye bye.");
-		rawout("MODE $chan +b *!root\@$host");	# ban
-		&kick($chan,$nick,"bye bye");
-	    }
-	}
+    my ( $nick, $user, $host, $chan ) = @_;
+    my $n        = lc $nick;
+    my $attempt  = &sqlSelect( 'rootwarn', 'attempt', { nick => $n } ) || 0;
+    my $warnmode = &getChanConf('rootWarnMode');
+
+    if ( $attempt == 0 ) {    # first timer.
+        if ( defined $warnmode and $warnmode =~ /quiet/i ) {
+            &status('RootWarn: Detected root user; notifying user');
+        }
+        else {
+            &status(
+                'RootWarn: Detected root user; notifying nick and channel.');
+            &msg( $chan, 'ROO' . ( 'O' x int( rand 8 ) ) . "T has landed!" );
+        }
+
+        if ( $_ = &getFactoid('root') ) {
+            &msg( $nick, "RootWarn: $attempt : $_" );
+        }
+        else {
+            &status('"root" needs to be defined in database.');
+        }
+
+    }
+    elsif ( $attempt < 2 ) {    # 2nd/3rd time occurrance.
+        if ( $_ = &getFactoid('root again') ) {
+            &status("RootWarn: not first time root user; msg'ing $nick.");
+            &msg( $nick, "RootWarn: $attempt : $_" );
+        }
+        else {
+            &status('"root again" needs to be defined in database.');
+        }
+
+    }
+    else {                      # >3rd time occurrance.
+                                # disable this for the time being.
+        if ( 0 and $warnmode =~ /aggressive/i ) {
+            if ( $channels{$chan}{'o'}{$ident} ) {
+                &status("RootWarn: $nick... sigh... bye bye.");
+                rawout("MODE $chan +b *!root\@$host");    # ban
+                &kick( $chan, $nick, 'bye bye' );
+            }
+        }
+        elsif ( $_ = &getFactoid('root again') ) {
+            &status("RootWarn: $attempt times; msg'ing $nick.");
+            &msg( $nick, "RootWarn: $attempt : $_" );
+        }
+        else {
+            &status("root again needs to be defined in database.");
+        }
     }
 
     $attempt++;
     ### TODO: OPTIMIZE THIS.
-    if (1) {	# old
-	&dbSet("rootwarn", { nick => lc($nick) }, { attempt => $attempt });
-	&dbSet("rootwarn", { nick => lc($nick) }, { time => time() });
-	&dbSet("rootwarn", { nick => lc($nick) }, { host => $user."\@".$host });
-	&dbSet("rootwarn", { nick => lc($nick) }, { channel => $chan });
-    } else {	# new. replace.
-	&dbSet("rootwarn", "nick", lc($nick), "attempt", $attempt);
-	&dbSet("rootwarn", "nick", lc($nick), "time", time());
-	&dbSet("rootwarn", "nick", lc($nick), "host", $user."\@".$host);
-	&dbSet("rootwarn", "nick", lc($nick), "channel", $chan);
-    }
+    # ok... don't record the attempt if nick==root.
+    return if ( $nick eq 'root' );
+
+    &sqlSet(
+        'rootwarn',
+        { nick => lc($nick) },
+        {
+            attempt => $attempt,
+            time    => time(),
+            host    => $user . "\@" . $host,
+            channel => $chan,
+        }
+    );
 
     return;
 }
 
 # Extras function.
+# TODO: support arguments to get info on a particular nick?
 sub CmdrootWarn {
     my $reply;
-    my $count = &countKeys("rootwarn");
+    my $count = &countKeys('rootwarn');
 
-    if ($count == 0) {
-	&performReply("no-one has been warned about root, woohoo");
-	return;
+    if ( $count == 0 ) {
+        &performReply("no-one has been warned about root, woohoo");
+        return;
     }
 
     # reply #1.
-    $reply = "there ".&fixPlural("has",$count) ." been \002$i\002 ".
-		&fixPlural("rooter",$count) ." warned about root.";
-
-    if ($param{'DBType'} !~ /^mysql$/i) {
-	&FIXME("rootwarn does not yet support non-mysql.");
-	return;
+    $reply = 'there '
+      . &fixPlural( 'has', $count )
+      . " been \002$count\002 "
+      . &fixPlural( 'rooter', $count )
+      . " warned about root.";
+
+    if ( $param{'DBType'} !~ /^(pg|my)sql$/i ) {
+        &FIXME("rootwarn does not yet support non-{my,pg}sql.");
+        return;
     }
 
     # reply #2.
     $found = 0;
     my $query = "SELECT attempt FROM rootwarn WHERE attempt > 2";
-    my $sth = $dbh->prepare($query);
+    my $sth   = $dbh->prepare($query);
     $sth->execute;
 
-    while (my @row = $sth->fetchrow_array) {
-	$found++;
+    while ( my @row = $sth->fetchrow_array ) {
+        $found++;
     }
 
     $sth->finish;
 
     if ($found) {
-	$reply .= " Of which, \002$found\002 ".
-		&fixPlural("rooter",$found)." ".
-		&fixPlural("has",$found).
-		" done it at least 3 times.";
+        $reply .=
+            " Of which, \002$found\002 "
+          . &fixPlural( 'rooter', $found ) . ' '
+          . &fixPlural( 'has',    $found )
+          . " done it at least 3 times.";
     }
 
     &performStrictReply($reply);
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80