X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FFiles.pl;h=b68f21871bb9586a295055e9bd8f12d31b3bc289;hb=97931c98069a7aefcc798cd6e6b5e51c84bd5960;hp=b302604d09a46c2b4e6f1bf4c4cae764a3ca86f9;hpb=626da38d992b33bb84f6f697d13fff7215976f10;p=infobot.git

diff --git a/src/Files.pl b/src/Files.pl
index b302604..b68f218 100644
--- 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)	= $bot_config_dir."/ircII.servers";
+    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;