root[wW]arn -> RootWarn

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

diff --git a/files/sample/blootbot.chan b/files/sample/blootbot.chan
index caac6474343d0e5f145517eeb3eb685f9a051137..065d7a1528ac03860aa5ed2fed6f5c7884b1f8bb 100644 (file)
--- a/files/sample/blootbot.chan
+++ b/files/sample/blootbot.chan
@@ -1,10 +1,13 @@
-#v1: blootbot -- infobot -- written Tue Nov 23 04:38:38 2004
+#v1: blootbot -- infobot -- written Tue Nov 23 04:45:45 2004
 
 #botpark
+    +RootWarn
     +autojoin
+    rootWarnMode aggressive
 
 #debian-bots
     +News
+    +RootWarn
     factoidDeleteDelay 7
     ircTextCounters heh hah :) ? hi lol
     +joinfloodCheck
@@ -51,7 +54,6 @@ _default
     +page
     randomFactoidInterval 60
     randomQuoteInterval 60
-    +rootWarn
     +search
     +seen
     seenFlushInterval 60

diff --git a/files/sample/blootbot.config b/files/sample/blootbot.config
index 8646df5f4b6aa81b131df4ecc795f62f5b992b71..678411306da56483029ee98d0ef45d0c32246d7c 100644 (file)
--- a/files/sample/blootbot.config
+++ b/files/sample/blootbot.config
@@ -232,7 +232,7 @@ set randomQuote             true
 set randomFactoid      true
 
 # [0/1] Warn users about root.
-set rootWarn           false
+set RootWarn           false
 #   passive    -- be polite plus stuff, compliant to OPN, heh.
 #   aggressive -- ...
 set rootWarnMode       passive

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 77870bf591c84c17c4173a9e1abfde85548ad140..c9ca19e5f4db8b75d2d6dbf7f27479126ac630a5 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -207,8 +207,8 @@ sub parseCmdHook {
 &addCmdHook("extra", 'u(ser)?info', ('CODEREF' => 'userinfo',
        'Identifier' => 'userinfo', 'Help' => 'userinfo',
        'Module' => 'userinfo') );
-&addCmdHook("extra", 'rootWarn', ('CODEREF' => 'CmdrootWarn',
-       'Identifier' => 'rootWarn', 'Module' => 'rootwarn') );
+&addCmdHook("extra", 'RootWarn', ('CODEREF' => 'CmdrootWarn',
+       'Identifier' => 'RootWarn', 'Module' => 'RootWarn') );
 &addCmdHook("extra", 'seen', ('CODEREF' => 'seen', 'Identifier' =>
        'seen') );
 &addCmdHook("extra", 'Dict', ('CODEREF' => 'Dict::Dict',

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index 19c7cbdad774bd54eac80365a3c5e6f37fb40eac..dc710d4babcea63cbeb698049d8b4a566992d961 100644 (file)
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -806,17 +806,17 @@ sub rehashConfVars {
        &DEBUG("rehashConfVars: _ => $_");
 
        if (/^news$/ and $i) {
-           &loadMyModule("news");
+           &loadMyModule('News');
            delete $cache{confvars}{$_};
        }
 
        if (/^uptime$/ and $i) {
-           &loadMyModule("uptime");
+           &loadMyModule('uptime');
            delete $cache{confvars}{$_};
        }
 
        if (/^rootwarn$/i and $i) {
-           &loadMyModule($_);
+           &loadMyModule('RootWarn');
            delete $cache{confvars}{$_};
        }
     }

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index d841df6a7c01eaecc0b525766737228cd9b6f58d..3ed802c0f63f906d2f3636ef4e77b93686e1ced7 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -572,7 +572,7 @@ sub on_join {
 
     ### ROOTWARN:
     &rootWarn($who,$user,$host,$chan) if (
-               &IsChanConf("rootWarn") &&
+               &IsChanConf('RootWarn') &&
                $user =~ /^~?r(oo|ew|00)t$/i
     );
 

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index ae44676965e352a819a7de17d912e162193c0827..fc3055069c750479a25a726ecca934a173d41bce 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -13,29 +13,29 @@ use vars qw($dbh $found $ident);
 sub rootWarn {
     my ($nick,$user,$host,$chan) = @_;
     my $n      = lc $nick;
-    my $attempt = &sqlSelect("rootwarn", "attempt", { nick => $n } ) || 0;
-    my $warnmode       = &getChanConf("rootWarnMode");
+    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");
+           &status('RootWarn: Detected root user; notifying user');
        } else {
-           &status("rootwarn: Detected root user; notifying nick and channel.");
+           &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 : $_");
+       if ($_ = &getFactoid('root')) {
+           &msg($nick, "RootWarn: $attempt : $_");
        } else {
-           &status("root needs to be defined in database.");
+           &status('"root" needs to be defined in database.');
        }
 
     } elsif ($attempt < 2) {   # 2nd/3rd time occurrance.
-       if ($_ = &getFactoid("root again")) {
+       if ($_ = &getFactoid('root again')) {
            &status("RootWarn: not first time root user; msg'ing $nick.");
-           &msg($nick, "rootwarn: $attempt : $_");
+           &msg($nick, "RootWarn: $attempt : $_");
        } else {
-           &status("root again needs to be defined in database.");
+           &status('"root again" needs to be defined in database.');
        }
 
     } else {                   # >3rd time occurrance.
@@ -44,11 +44,11 @@ sub rootWarn {
            if ($channels{$chan}{'o'}{$ident}) {
                &status("RootWarn: $nick... sigh... bye bye.");
                rawout("MODE $chan +b *!root\@$host");  # ban
-               &kick($chan,$nick,"bye bye");
+               &kick($chan,$nick,'bye bye');
            }
-       } elsif ($_ = &getFactoid("root again")) {
+       } elsif ($_ = &getFactoid('root again')) {
            &status("RootWarn: $attempt times; msg'ing $nick.");
-           &msg($nick, "rootwarn: $attempt : $_");
+           &msg($nick, "RootWarn: $attempt : $_");
        } else {
            &status("root again needs to be defined in database.");
        }
@@ -59,7 +59,7 @@ sub rootWarn {
     # ok... don't record the attempt if nick==root.
     return if ($nick eq "root");
 
-    &sqlSet("rootwarn", { nick => lc($nick) }, {
+    &sqlSet('rootwarn', { nick => lc($nick) }, {
        attempt => $attempt,
        time    => time(),
        host    => $user."\@".$host,
@@ -73,7 +73,7 @@ sub rootWarn {
 # 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");

diff --git a/src/modules.pl b/src/modules.pl
index 263bd4354af57fccf0ee0bf73891d4fdd7a539cf..9429dfd4b1a4a78eeae9afdf26cc24cc60fd0130 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -42,7 +42,7 @@ if ($@) {
        "Math"          => "Math.pl",
        "Plug"          => "Plug.pl",
        "Quote"         => "Quote.pl",
-       "rootwarn"      => "RootWarn.pl",
+       "RootWarn"      => "RootWarn.pl",
        "rss"           => "Rss.pl",
        "search"        => "Search.pl",
        "slashdot"      => "Slashdot3.pl",
@@ -64,7 +64,7 @@ if ($@) {
 my @myModulesLoadNow;
 my @myModulesReloadNot;
 BEGIN {
-    @myModulesLoadNow  = ('topic', 'uptime', 'News', 'rootWarn', 'symdump', 'botmail');
+    @myModulesLoadNow  = ('topic', 'uptime', 'News', 'RootWarn', 'symdump', 'botmail');
     @myModulesReloadNot        = ('IRC/Irc.pl','IRC/Schedulers.pl');
 }
 
@@ -190,9 +190,7 @@ sub loadMyModulesNow {
            next;
        }
 
-       # weird hack to get rootwarn to work.
-       # it may break on other cases though, any ideas?
-       &loadMyModule( $myModules{$_} || $myModules{lc $_} );
+       &loadMyModule($myModules{$_});
        $loaded++;
     }