- strictify

- remove old if statement involing useStrict.

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

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index 0d4b6dba91d8b7eda3ba4626eaca39a6085af2c6..e28815718a2da2b12abe65c9388981b875079eed 100644 (file)
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -5,7 +5,11 @@
 #   Created: 20010906
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
+
+use vars qw(%param %cache %lang %cmdstats %bots);
+use vars qw($message $who $addressed $chan $h $nuh $ident $msgType
+       $correction_plausable);
 
 # Usage: &validFactoid($lhs,$rhs);
 sub validFactoid {

diff --git a/src/Factoids/DBCommon.pl b/src/Factoids/DBCommon.pl
index 178847d7cd59713205f4b54123a6507b082ead2a..709fd41b24181bc852234bb3696811da09f1fff9 100644 (file)
--- a/src/Factoids/DBCommon.pl
+++ b/src/Factoids/DBCommon.pl
@@ -5,7 +5,7 @@
 #     Created: 19991020
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 #####
 # Usage: &setFactInfo($faqtoid, $key, $val);

diff --git a/src/Factoids/Norm.pl b/src/Factoids/Norm.pl
index 4ce2ba03c55167babbb10437023ed76097811200..f673102a33de0eec42569d456675bd8e65aa7a34 100644 (file)
--- a/src/Factoids/Norm.pl
+++ b/src/Factoids/Norm.pl
@@ -4,7 +4,7 @@
 #   Version: 1997
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 sub normquery {
        my ($in) = @_;

diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index 14f516ac8e448fed1984b99f805e0889ab23aaef..4ba2135ad4259879418dd9150b3c6d8810331cbf 100644 (file)
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -10,7 +10,7 @@
 #   rhs - factoid message.
 ##
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 use vars qw($msgType $uh $lastWho $ident);
 use vars qw(%lang %lastWho);

diff --git a/src/Factoids/Statement.pl b/src/Factoids/Statement.pl
index aec268c0b98bcce4fde9c43513be228e41a4d786..f689fc89cce5e183e9e7acc2df4a7c4b753628dd 100644 (file)
--- a/src/Factoids/Statement.pl
+++ b/src/Factoids/Statement.pl
@@ -13,7 +13,7 @@
 ##             - null for confused.
 ##
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 sub doStatement {
     my($in) = @_;

diff --git a/src/Factoids/Update.pl b/src/Factoids/Update.pl
index 7811bb7adc82deb8e62e87d2488b2dd94f3a9ba4..885538280735b9268d4fbc4f890cd21d37bfe8da 100644 (file)
--- a/src/Factoids/Update.pl
+++ b/src/Factoids/Update.pl
@@ -6,7 +6,7 @@
 #   Created: 1997
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 sub update {
     my($lhs, $mhs, $rhs) = @_;

diff --git a/src/Files.pl b/src/Files.pl
index d51cecd98d37bdc778c48806a9048d091bc40e1b..75c52a1ffd4d5a898feec1dd95d64bfe6f1bc245 100644 (file)
--- a/src/Files.pl
+++ b/src/Files.pl
@@ -5,7 +5,11 @@
 #  Created: 19991221
 #
 
-#use strict;
+use strict;
+
+use vars qw(%lang %ircPort);
+use vars qw(@ircServers);
+use vars qw($bot_config_dir);
 
 # File: Language support.
 sub loadLang {

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index a5a90cafe10754a6dca26c7ac29b1750ed0565c8..b6eb283c6b8fe8f49c38caca3d3389a6ff481815 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -5,10 +5,16 @@
 #      NOTE: Based on code by Kevin Lenzo & Patrick Cole  (c) 1997
 #
 
-if (&IsParam("useStrict")) { use strict; }
+use strict;
 
-use vars qw($nickserv);
-$nickserv      = 0;
+use vars qw(%floodjoin %nuh %dcc %cache %channels %param %mask
+       %chanconf %orig %ircPort %ircstats %last %netsplit);
+use vars qw($irc $nickserv $ident $conn $msgType $who $talkchannel
+       $addressed);
+use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
+               $pubcount $pubtime $pubsize);
+use vars qw($b_blue $ob);
+use vars qw(@joinchan @ircServers);
 
 # static scalar variables.
 $mask{ip}      = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
@@ -19,6 +25,8 @@ my $isnick2   = '0-9\-';
 $mask{nick}    = "[$isnick1]{1}[$isnick1$isnick2]*";
 $mask{nuh}     = '\S*!\S*\@\S*';
 
+$nickserv      = 0;
+
 sub ircloop {
     my $error  = 0;
     my $lastrun = 0;
@@ -636,7 +644,7 @@ sub invite {
 # Usage: &joinNextChan();
 sub joinNextChan {
     if (scalar @joinchan) {
-       $chan = shift @joinchan;
+       my $chan = shift @joinchan;
        &joinchan($chan);
 
        if (my $i = scalar @joinchan) {
@@ -707,6 +715,7 @@ sub IsNickInChan {
 
 sub IsNickInAnyChan {
     my ($nick) = @_;
+    my $chan;
 
     foreach $chan (keys %channels) {
        next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''}  });
@@ -812,10 +821,12 @@ sub getJoinChans {
 
 sub closeDCC {
 #    &DEBUG("closeDCC called.");
+    my $type;
 
     foreach $type (keys %dcc) {
        next if ($type ne uc($type));
  
+       my $nick;
        foreach $nick (keys %{ $dcc{$type} }) {
            next unless (defined $nick);
            &status("DCC CHAT: closing DCC $type to $nick.");

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index b801a2a802548cf55cfb62e833a2e74eac8b07fa..18360d862814aa46bafc8513ad43cc1d7964a635 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -5,7 +5,7 @@
 #         Created: 20000117
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 use POSIX qw(strftime);
 use vars qw(%sched);
@@ -41,10 +41,10 @@ sub setupSchedulers {
     &factoidCheck(2);  # takes a couple of seconds on a 486. defer it
     &newsFlush(1);
 
+    # todo: squeeze this into a one-liner.
 #    my $count = map { exists $sched{$_}{TIME} } keys %sched;
     my $count  = 0;
     foreach (keys %sched) {
-#      next unless (exists $sched{$_}{TIME});
        my $time = $sched{$_}{TIME};
        next unless (defined $time and $time > time());
 

diff --git a/src/Modules/Dict.pl b/src/Modules/Dict.pl
index b055299c8e63d9453e0bb28e7fcbdbc0b4b14cfa..9c49a5bde7d94a96874fee637fac355cf3804ff1 100644 (file)
--- a/src/Modules/Dict.pl
+++ b/src/Modules/Dict.pl
@@ -10,16 +10,18 @@ package Dict;
 use IO::Socket;
 use strict;
 
+#use vars qw(PF_INET);
+
 my $server     = "dict.org";   # need a specific host||ip.
-my $port       = 2628;
-my $proto      = getprotobyname('tcp');
 
 ###local $SIG{ALRM} = sub { die "alarm\n" };
 
 sub Dict {
     my ($query) = @_;
-###    return unless &::loadPerlModule("IO::Socket");
-    my $socket = new IO::Socket;
+#    return unless &::loadPerlModule("IO::Socket");
+    my $socket = new IO::Socket;
+    my $port   = 2628;
+    my $proto  = getprotobyname('tcp');
     my @results;
 
     for ($query) {
@@ -29,6 +31,7 @@ sub Dict {
     }
 
     # connect.
+# TODO: make strict-safe constants... so we can defer IO::Socket load.
     socket($socket, PF_INET, SOCK_STREAM, $proto) or return "error: socket: $!";
     eval {
        alarm 10;

diff --git a/src/Modules/DumpVars2.pl b/src/Modules/DumpVars2.pl
index f507396b227d1f83161eea606e04c0f4a0e47356..eb814335332d6327ed5a64578120f0c2ce3d71f3 100644 (file)
--- a/src/Modules/DumpVars2.pl
+++ b/src/Modules/DumpVars2.pl
@@ -5,7 +5,8 @@
 #       Created: 20020329
 #
 
-#use strict;
+# use strict;  # TODO
+
 use Devel::Symdump;
 
 sub symdumplog {

diff --git a/src/Modules/Math.pl b/src/Modules/Math.pl
index caecf9f70fd594117c61482ac358b2067a58d893..1e23177a79229a0e80587505984d55de08b588f5 100644 (file)
--- a/src/Modules/Math.pl
+++ b/src/Modules/Math.pl
@@ -2,7 +2,9 @@
 # infobot copyright (C) kevin lenzo 1997-98
 #
 
-if (&IsParam("useStrict")) { use strict; }
+use strict;
+
+use vars qw($message);
 
 my %digits = (
        "first",   "1",

diff --git a/src/Modules/News.pl b/src/Modules/News.pl
index 419dfb8f2330a1790cdcedc016cdb3ac555344b0..1c1629d8f91ddce4f384fa4c67acf9f02c8aba2c 100644 (file)
--- a/src/Modules/News.pl
+++ b/src/Modules/News.pl
@@ -15,10 +15,12 @@
 #      Text    - Actual text.
 ###
 
-use vars qw($who $chan);
-
 package News;
 
+use strict;
+
+use vars qw($who $chan);
+
 sub Parse {
     my($what)  = @_;
     $chan      = undef;
@@ -225,6 +227,7 @@ sub writeNews {
        $c = scalar keys %{ $::news{$chan} };
        next unless ($c);
        $cc++;
+       my $item;
 
        foreach $item (sort keys %{ $::news{$chan} }) {
            $c = scalar keys %{ $::news{$chan}{$item} };
@@ -232,6 +235,7 @@ sub writeNews {
            $ci++;
 
            print NEWS "$chan $item\n";
+           my $what;
            foreach $what (sort keys %{ $::news{$chan}{$item} }) {
                print NEWS "    $what: $::news{$chan}{$item}{$what}\n";
            }
@@ -393,7 +397,9 @@ sub list {
        $newest = $t if ($t > $newest);
        if ($e > 1 and $e < $expire) {
            $expire     = $e;
-           $eno        = &newsS2N($item);
+           &::DEBUG("before newsS2N($_)");
+           $eno        = &newsS2N($_);
+           &::DEBUG("after newsS2N($_) == $eno");
        }
     }
     my $timestr = &::Time2String(time() - $newest);

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 086cac506af6663c06a90f44f767dd0967e816fb..cb3d967499637c15df3185a86e56ddd85b3cfe13 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -5,7 +5,10 @@
 #     Created: 19991008
 #
 
-### use strict;
+use strict;
+
+use vars qw(%channels %param);
+use vars qw($dbh $found $ident);
 
 sub rootWarn {
     my ($nick,$user,$host,$chan) = @_;

diff --git a/src/Modules/Topic.pl b/src/Modules/Topic.pl
index 4e7e9aac740f438dbe4e050ce79b2536fb4e3d09..2778fee53556e52fe8c459aa8aec73bdc226601d 100644 (file)
--- a/src/Modules/Topic.pl
+++ b/src/Modules/Topic.pl
@@ -6,8 +6,8 @@
 #
 
 use strict;
-use vars qw(%topiccmp);
-no strict "refs";              ### FIXME!!!
+use vars qw(%topiccmp %topic %channels %orig);
+use vars qw($who $chan $conn $uh $ident);
 
 ###############################
 ##### INTERNAL FUNCTIONS

diff --git a/src/Modules/Units.pl b/src/Modules/Units.pl
index c24ea42c256a1d841199dc4dd2c102378c20972d..bc7be77388a781d4d87ba0e907dbdae27dee305b 100644 (file)
--- a/src/Modules/Units.pl
+++ b/src/Modules/Units.pl
@@ -5,6 +5,8 @@
 
 package Units;
 
+# use strict;  # TODO
+
 #$DEBUG_p = 1;
 #$DEBUG_o = 1;
 #$DEBUG_l = 1;

diff --git a/src/Modules/Uptime.pl b/src/Modules/Uptime.pl
index ca2e58449965c223bdd23919b75686d7ef0eff68..d433952f8be94f85dffbbe10e8e474af68ce1953 100644 (file)
--- a/src/Modules/Uptime.pl
+++ b/src/Modules/Uptime.pl
@@ -5,7 +5,7 @@
 #   Created: 19990925.
 #
 
-# use strict;
+# use strict;  # TODO
 
 my $uptimerecords      = 3;
 

diff --git a/src/Modules/Zippy.pl b/src/Modules/Zippy.pl
index e082791f83a46b3870d11a6ede0b517a4044ebde..73f4d63a54a5ec2afc8553db6e0f5de94e5c97c0 100644 (file)
--- a/src/Modules/Zippy.pl
+++ b/src/Modules/Zippy.pl
@@ -7,6 +7,8 @@
 
 package zippy;
 
+use strict;
+
 my $no_zippy; # Can't think of any situation in which this won't work..
 
 sub zippy::get {

diff --git a/src/Modules/insult.pl b/src/Modules/insult.pl
index e13979113f198db4b650ea3b45ec399c88cb9d63..be37b914b80880ed0b792836b337b566466a4984 100644 (file)
--- a/src/Modules/insult.pl
+++ b/src/Modules/insult.pl
@@ -4,10 +4,10 @@
 #           => use the command hooks system aswell
 #
 
-use strict;
-
 package Insult;
 
+use strict;
+
 sub Insult {
     my ($insultwho) = @_;
     return unless &::loadPerlModule("Net::Telnet");

diff --git a/src/Modules/zfi.pl b/src/Modules/zfi.pl
index de77352af32c5634465ef32c09296080610e8c0b..0d4ed649ae44eb87b906488640a18c36ec6f03c4 100644 (file)
--- a/src/Modules/zfi.pl
+++ b/src/Modules/zfi.pl
@@ -24,6 +24,8 @@ package zfi;
 
 # We reply publicly or privately, depending how we were called
 
+use strict;
+
 my $no_zfi;
 
 BEGIN {
@@ -43,7 +45,7 @@ sub queryText {
        my $res_return = 5;
 
        my $ua = new LWP::UserAgent;
-  $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
+       $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
 
        $ua->timeout(10);
 
@@ -95,7 +97,7 @@ sub queryText {
 sub query {
        my ($args) = @_;
        &::performStrictReply(&queryText($args));
-  return;
+       return;
 }
 
 1;

diff --git a/src/Modules/zsi.pl b/src/Modules/zsi.pl
index c1eb6928fcc6f83b3b09c5a4520b700dc1c2cf8a..6a4a82e7c27d4a1feca9c40588f28b03995ed39a 100644 (file)
--- a/src/Modules/zsi.pl
+++ b/src/Modules/zsi.pl
@@ -26,6 +26,8 @@ package zsi;
 
 my $no_zsi;
 
+use strict;
+
 BEGIN {
        $no_zsi = 0;
        eval "use LWP::UserAgent";
@@ -43,7 +45,7 @@ sub queryText {
        my $res_return = 5;
 
        my $ua = new LWP::UserAgent;
-  $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
+       $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
 
        $ua->timeout(10);
 
@@ -95,7 +97,7 @@ sub queryText {
 sub query {
        my ($args) = @_;
        &::performStrictReply(&queryText($args));
-  return;
+       return;
 }
 
 1;

diff --git a/src/Net.pl b/src/Net.pl
index 083d62be82dd7481f5b2968349085e566528c9fe..306e20a5542aac82da107557cf537bf1575b1f33 100644 (file)
--- a/src/Net.pl
+++ b/src/Net.pl
@@ -5,8 +5,9 @@
 #  Created: 20000309
 #
 
-#use strict;
-use vars qw(%ftp);
+use strict;
+
+use vars qw(%ftp %param);
 
 # Usage: &ftpGet($host,$dir,$file,[$lfile]);
 sub ftpGet {
@@ -144,6 +145,7 @@ sub ftpList {
 
 ### LWP.
 # Usage: &getURL($url, [$post]);
+# todo: rename this to getHTTP
 sub getURL {
     my ($url,$post) = @_;
     my ($ua,$res,$req);

diff --git a/src/Process.pl b/src/Process.pl
index 05f297b95b7cd345fd6b81066d6d0151edae9d7f..75499a23770993099d5bacaa520d7f4c954bcc74 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -6,7 +6,13 @@
 # process the incoming message
 #
 
-#use strict;
+use strict;
+
+use vars qw($who $msgType $addressed $message $ident $user $host $chan
+       $learnok $talkok $force_public_reply $noreply $addrchar
+       $literal $addressedother $userHandle $lobotomized);
+use vars qw(%channels %users %param %cache %chanconf %mask %orig %lang
+       );
 
 sub process {
     $learnok   = 0;    # Able to learn?
@@ -292,6 +298,9 @@ sub process {
     # karma. set...
     if ($message =~ /^(\S+)(--|\+\+)\s*$/ and $addressed) {
        return '' unless (&hasParam("karma"));
+       # well... since it is policy to do bot functions before factoids
+       # karma gets hit if, for example, "g++" is issued.
+       # only way to request it is to put a question mark at the end.
 
        my($term,$inc) = (lc $1,$2);
 
@@ -305,8 +314,8 @@ sub process {
            return;
        }
 
-       my $karma = &dbGet("stats", "counter", "nick=".&dbQuote($term).
-                       " AND type='karma'") || 0;
+       my $karma = &dbGet("stats", "counter",
+               "nick=".&dbQuote($term)." AND type='karma'") || 0;
        if ($inc eq '++') {
            $karma++;
        } else {
@@ -314,8 +323,9 @@ sub process {
        }
 
        &dbSet("stats", 
-               { nick => $term, type => "karma" },
-               { counter => $karma }
+               { nick => $term, type => "karma" },     # WHERE
+#              { counter => $karma }                   # WHAT
+               { -counter => "counter+1" }
        );
 
        return;

diff --git a/src/Shm.pl b/src/Shm.pl
index 41f96bfbeda99ebb76c4a324cb08a10a6eb139fe..5ab3d186501a89807fff7662fa83aa049adb5b92 100644 (file)
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -5,6 +5,8 @@
 #   Created: 20000124
 #
 
+# use strict;  # TODO
+
 use POSIX qw(_exit);
 
 sub openSHM {
@@ -12,7 +14,7 @@ sub openSHM {
     my $size = 2000;
 
     if (&IsParam("noSHM")) {
-       &status("Created shared memory: disabled. [bot may become unreliable]");
+       &status("Shared memory: Disabled. WARNING: bot may become unreliable");
        return 0;
     }
 

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 895d8cb22616eec2c3fe5ce7ded3bffe535dabb7..50f00e6a22584d83602a43c8d257eb8a736ed9a3 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -5,9 +5,11 @@
 #      Created: 20000107
 #
 
-#use strict;
-use vars qw($message $arg $qWord $verb $lobotomized);
-use vars qw(%channels %chanstats %cmdstats);
+use strict;
+use vars qw($message $arg $qWord $verb $lobotomized $who $result $chan
+       $conn $msgType $query $talkchannel $ident $memusage);
+use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
+       %cache %mask %userstats %hooks_main);
 
 ###
 ### Start of command hooks for UserExtra.
@@ -18,7 +20,7 @@ use vars qw(%channels %chanstats %cmdstats);
 &addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', 
        'Cmdstats' => 'Factoid Info', Module => 'factoids', ) );
 &addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', 
-       'Cmdstats' => 'Factoid Statistics', Help => "factstats", 
+       'Cmdstats' => 'Factoid Stats', Help => "factstats", 
        Forker => 1, 'Identifier' => 'factoids', ) );
 &addCmdHook("main", 'help', ('CODEREF' => 'help', 
        'Cmdstats' => 'Help', ) );

diff --git a/src/interface.pl b/src/interface.pl
index 036691afbedf7711dc05a695d2d73b86dc328bf7..c94e926a02d5c51b25bc3f2220511728bb4c4848 100644 (file)
--- a/src/interface.pl
+++ b/src/interface.pl
@@ -1,10 +1,9 @@
 #
 # interface.pl:
-#
 #       Author:
 #
 
-#use strict;
+# use strict;  # TODO
 
 sub whatInterface {
     if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {