* Fix NULL chan being created in %channels

[infobot.git] / src / Files.pl

diff --git a/src/Files.pl b/src/Files.pl
index bfe79baba3768070397fc3b0b019fa56e16e3e75..b68f21871bb9586a295055e9bd8f12d31b3bc289 100644 (file)
--- a/src/Files.pl
+++ b/src/Files.pl
@@ -5,7 +5,11 @@
 #  Created: 19991221
 #
 
-if (&IsParam("useStrict")) { use strict; }
+use strict;
+
+use vars qw(%lang %ircPort);
+use vars qw(@ircServers);
+use vars qw($bot_config_dir);
 
 # File: Language support.
 sub loadLang {
@@ -14,7 +18,7 @@ sub loadLang {
     my $replyName;
 
     if (!open(FILE, $file)) {
-       &ERROR("FAILED loadLang ($file): $!");
+       &ERROR("Failed reading lang file ($file): $!");
        exit 0;
     }
 
@@ -22,7 +26,7 @@ sub loadLang {
 
     while (<FILE>) {
        chop;
-       if ($_ eq "" || /^#/) {
+       if ($_ eq '' || /^#/) {
            undef $replyName;
            next;
        }
@@ -44,17 +48,17 @@ 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) = @_;
+    my ($file) = $bot_config_dir."/infobot.servers";
     @ircServers = ();
     %ircPort = ();
 
     if (!open(FILE, $file)) {
-       &ERROR("FAILED loadIRCServers ($file): $!");
+       &ERROR("Failed reading server list ($file): $!");
        exit 0;
     }
 
@@ -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;