- added support of ircTextCounters - works! thanks to #perl@OPN.

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

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 712ec0ce6c78aba2e8855218325d6b6049e576fb..1cdae16abe68fbdd14126e2357162d3b85fb4cd1 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -1,7 +1,7 @@
 #
 # RootWarn.pl: Warn people about usage of root on IRC.
-#      Author: xk <xk@leguin.openprojects.net>
-#     Version: v0.2c (19991125)
+#      Author: dms
+#     Version: v0.3 (20000923)
 #     Created: 19991008
 #
 
@@ -9,10 +9,11 @@ use strict;
 
 sub rootWarn {
     my ($nick,$user,$host,$chan) = @_;
-    my $attempt = &dbGet("rootwarn", "nick", lc($nick), "attempt") || 0;
+    my $attempt = &dbGet("rootwarn", "attempt", "nick='.lc($nick)."'") || 0;
+    my $warnmode       = &getChanConf("rootWarnMode");
 
     if ($attempt == 0) {       # first timer.
-       if (&IsParam("rootWarnMode") && $param{'rootWarnMode'} =~ /aggressive/i) {
+       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 {
@@ -34,13 +35,11 @@ sub rootWarn {
        }
 
     } else {                   # >3rd time occurrance.
-       if (&IsParam("rootWarnMode")) {
-           if ($param{'rootWarnMode'} =~ /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");
-               }
+       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");
            }
        }
     }
@@ -61,13 +60,19 @@ sub CmdrootWarn {
     my $count = &countKeys("rootwarn");
 
     if ($count == 0) {
-       return "no-one has been warned about root, woohoo";
+       &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 #2.
     $found = 0;
     my $query = "SELECT attempt FROM rootwarn WHERE attempt > 2";
@@ -87,7 +92,7 @@ sub CmdrootWarn {
                " done it at least 3 times.";
     }
 
-    return $reply;
+    &performStrictReply($reply);
 }
 
 1;