X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FFiles.pl;h=a3dae2e407581d71d867f0d1904b97bbdf78289d;hb=0284f9bee1661a9ca31f0dcfdb2f32446697122a;hp=36d57b34feb247c7624792eda72e60f7db86ecbd;hpb=74d6a1a6252e04e2b1356b651708113318d6f0d1;p=infobot.git

diff --git a/src/Files.pl b/src/Files.pl
index 36d57b3..a3dae2e 100644
--- a/src/Files.pl
+++ b/src/Files.pl
@@ -1,11 +1,15 @@
 #
 # Files.pl: Open and close, read and probably write files.
 #   Author: dms
-#  Version: v0.2 (2000502)
+#  Version: v0.3 (20010120)
 #  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;
     }
 
@@ -44,44 +48,17 @@ sub loadLang {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded lang $file ($langCount items)");
-}
-
-# File: Ignore list.
-sub loadIgnore {
-    my ($file)	= @_;
-    %ignoreList	= ();
-
-    if (!open(FILE, $file)) {
-	&ERROR("FAILED loadIgnore ($file): $!");
-	return;
-    }
-
-    my $count = 0;
-    while (<FILE>) {
-	chomp;
-	next if /^\s*\#/;
-	next unless /\S/;
-
-	if (/^(\S+)[\t\s]+(\S+)([\t\s]+.*)?$/) {
-	    $ignoreList{$2} = 1;
-	    $count++;
-	}
-    }
-    close FILE;
-
-    $file =~ s/^.*\///;
-    &status("Loaded ignore $file ($count masks)");
+    &status("Loaded $file ($langCount items)");
 }
 
 # File: Irc Servers list.
 sub loadIRCServers {
-    my ($file) = @_;
+    my ($file)	= $bot_config_dir."/blootbot.servers";
     @ircServers = ();
     %ircPort = ();
 
     if (!open(FILE, $file)) {
-	&ERROR("FAILED loadIRCServers ($file): $!");
+	&ERROR("Failed reading server list ($file): $!");
 	exit 0;
     }
 
@@ -100,66 +77,7 @@ sub loadIRCServers {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded ircServers $file (". scalar(@ircServers) ." servers)");
-}
-
-# File: User List.
-sub loadUsers {
-    my ($file) = @_;
-    %userList = ();	# clear it.
-
-    if (!open(FILE, $file)) {
-	&ERROR("FAILED loadUsers ($file): $!");
-	exit 0;
-    }
-
-    my $userName;
-
-    while (<FILE>) {
-	next if /^\s*$/;
-	next if /^#/;
-
-	if (/^UserEntry\s+(.+?)\s/) {
-	    $userName = $1;
-	    if (/\s*\{\s*/) {
-		while (<FILE>) {
-		    if (/^\s*(\w+)\s+(.+);$/) {
-			my ($opt,$val) = ($1,$2);
-
-			$opt =~ tr/A-Z/a-z/;
-			$val =~ s/\"//g;
-			$val =~ s/\+// if ($opt =~ /^flags$/i);
-
-			if ($opt =~ /^mask$/i) {
-			    $userList{$userName}{$opt}{$val} = 1;
-			} else {
-			    $userList{$userName}{$opt} = $val;
-			}
-		    } elsif (/^\s*\}\s*$/) {
-			last;
-		    }
-		}
-	    } else {
-		&status("parse error: User Entry $userName without right brace");
-	    }
-	}
-    }
-    close FILE;
-
-    return unless (&IsParam("VERBOSITY"));
-
-    $file =~ s/^.*\///;
-    &status("Loaded userlist $file (". scalar(keys %userList) ." users)");
-    foreach $userName (keys %userList) {
-	last if ($param{VERBOSITY} < 2);
-
-	&status("  $userName:");
-	&status("    flags: +$userList{$userName}{'flags'}");
-
-	foreach (keys %{$userList{$userName}{'mask'}}) {
-	    &status("    hostmask: $_");
-	}
-    }
+    &status("Loaded $file (". scalar(@ircServers) ." servers)");
 }
 
 1;