* Fix NULL chan being created in %channels

[infobot.git] / src / Files.pl

diff --git a/src/Files.pl b/src/Files.pl
index d51cecd98d37bdc778c48806a9048d091bc40e1b..b68f21871bb9586a295055e9bd8f12d31b3bc289 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 {
@@ -22,7 +26,7 @@ sub loadLang {
 
     while (<FILE>) {
        chop;
-       if ($_ eq "" || /^#/) {
+       if ($_ eq '' || /^#/) {
            undef $replyName;
            next;
        }
@@ -44,12 +48,12 @@ sub loadLang {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded lang $file ($langCount items)");
+    &status("Loaded $file ($langCount items)");
 }
 
 # File: Irc Servers list.
 sub loadIRCServers {
-    my ($file) = $bot_config_dir."/blootbot.servers";
+    my ($file) = $bot_config_dir."/infobot.servers";
     @ircServers = ();
     %ircPort = ();
 
@@ -63,7 +67,7 @@ sub loadIRCServers {
        next if /^\s*$/;
        next if /^[\#\[ ]/;
 
-       if (/^(\S+)(:(\d+))?$/) {
+       if (/^\s*(\S+?)(:(\d+))?\s*$/) {
            push(@ircServers,$1);
            $ircPort{$1} = ($3 || 6667);
        } else {
@@ -73,7 +77,7 @@ sub loadIRCServers {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded ircServers $file (". scalar(@ircServers) ." servers)");
+    &status("Loaded $file (". scalar(@ircServers) ." servers)");
 }
 
 1;