standard TODO: and FIXME:

[infobot.git] / src / Modules / RootWarn.pl

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 6944b196583c8215ea37a28bdd3d58e839829895..ae44676965e352a819a7de17d912e162193c0827 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -5,11 +5,15 @@
 #     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 $n      = lc $nick;
+    my $attempt = &sqlSelect("rootwarn", "attempt", { nick => $n } ) || 0;
     my $warnmode       = &getChanConf("rootWarnMode");
 
     if ($attempt == 0) {       # first timer.
@@ -17,25 +21,24 @@ sub rootWarn {
            &status("rootwarn: Detected root user; notifying user");
        } else {
            &status("rootwarn: Detected root user; notifying nick and channel.");
-           rawout("PRIVMSG $chan :ROO".("O" x int(rand 68))."T has landed!");
+           &msg($chan, "ROO".("O" x int(rand 8))."T has landed!");
        }
 
        if ($_ = &getFactoid("root")) {
-           &msg($nick, "root is $_");
+           &msg($nick, "rootwarn: $attempt : $_");
        } 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, $_);
+           &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}) {
@@ -43,29 +46,31 @@ sub rootWarn {
                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.
     # ok... don't record the attempt if nick==root.
-    if (1 and $nick ne "root") {       # 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. TODO
-       &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);
-    }
+    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?
+# TODO: support arguments to get info on a particular nick?
 sub CmdrootWarn {
     my $reply;
     my $count = &countKeys("rootwarn");
@@ -79,8 +84,8 @@ sub CmdrootWarn {
     $reply = "there ".&fixPlural("has",$count) ." been \002$count\002 ".
                &fixPlural("rooter",$count) ." warned about root.";
 
-    if ($param{'DBType'} !~ /^mysql$/i) {
-       &FIXME("rootwarn does not yet support non-mysql.");
+    if ($param{'DBType'} !~ /^(pg|my)sql$/i) {
+       &FIXME("rootwarn does not yet support non-{my,pg}sql.");
        return;
     }