- Manually applied patch from Morten Brix Pedersen. Thanks.

[infobot.git] / blootbot / src / Misc.pl

diff --git a/blootbot/src/Misc.pl b/blootbot/src/Misc.pl
index 5e9bf14579e37cca3dbe4e7ead99a0ad1c823c4e..358515467576b10dedebb1a9bac7906a406fe79d 100644 (file)
--- a/blootbot/src/Misc.pl
+++ b/blootbot/src/Misc.pl
@@ -5,7 +5,7 @@
 #      NOTE: Based on code by Kevin Lenzo & Patrick Cole  (c) 1997
 #
 
-if (&IsParam("useStrict")) { use strict; }
+#use strict;
 
 sub help {
     my $topic = shift;
@@ -16,7 +16,7 @@ sub help {
     $msgType = "private" if ($msgType eq "public");
 
     if (!open(FILE, $file)) {
-       &ERROR("FAILED loadHelp ($file): $!");
+       &ERROR("Failed reading help file ($file): $!");
        return;
     }
 
@@ -295,30 +295,27 @@ sub fixPlural {
 sub getRandomLineFromFile {
     my($file) = @_;
 
-    if (! -f $file) {
-       &WARN("gRLfF: file '$file' does not exist.");
+    if (!open(IN, $file)) {
+       &WARN("gRLfF: could not open ($file): $!");
        return;
     }
 
-    if (open(IN,$file)) {
-       my @lines = <IN>;
+    my @lines = <IN>;
+    close IN;
 
-       if (!scalar @lines) {
-           &ERROR("GRLF: nothing loaded?");
-           return;
-       }
+    if (!scalar @lines) {
+       &ERROR("GRLF: nothing loaded?");
+       return;
+    }
 
-       while (my $line = &getRandom(@lines)) {
-           chop $line;
+    # could we use the filehandler instead and put it through getRandom?
+    while (my $line = &getRandom(@lines)) {
+       chop $line;
 
-           next if ($line =~ /^\#/);
-           next if ($line =~ /^\s*$/);
+       next if ($line =~ /^\#/);
+       next if ($line =~ /^\s*$/);
 
-           return $line;
-       }
-    } else {
-       &WARN("gRLfF: could not open file '$file'.");
-       return;
+       return $line;
     }
 }
 
@@ -343,7 +340,7 @@ sub getLineFromFile {
        chop $line;
        return $line;
     } else {
-       &ERROR("getLineFromFile: could not open file '$file'.");
+       &ERROR("gLFF: Could not open file ($file): $!");
        return 0;
     }
 }
@@ -416,7 +413,10 @@ sub IsHostMatch {
        $local{'host'} = &makeHostMask(lc $3);
     }
 
-    if ($thisnuh =~ /^(\S+)!(\S+)@(\S+)/) {
+    if (!defined $thisnuh) {
+       &WARN("IHM: thisnuh == NULL.");
+       return 0;
+    } elsif ($thisnuh =~ /^(\S+)!(\S+)@(\S+)/) {
        $this{'nick'} = lc $1;
        $this{'user'} = lc $2;
        $this{'host'} = &makeHostMask(lc $3);