X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fcore.pl;h=802e4c20a72da8c33dd51a4a3440f5ff4d42499d;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=c82c47e666f4e03d896247ab5038c16531d3cb03;hpb=b8c2d709664900b09f849e8b5e1afada0be580df;p=infobot.git

diff --git a/src/core.pl b/src/core.pl
index c82c47e..802e4c2 100644
--- a/src/core.pl
+++ b/src/core.pl
@@ -31,7 +31,7 @@ use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache
 );
 
 ### hash. MUST BE REDUCED IN SIZE!!!
-# 
+#
 use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig
 	    %nuh %talkWho %seen %floodwarn %param %dbh %ircPort
 	    %topic %moduleAge %last %time %mask %file
@@ -60,6 +60,14 @@ $wtime_chanfile	= 0;
 $ucount_chanfile = 0;
 $running	= 0;
 ### more variables...
+# static scalar variables.
+$mask{ip}	= '(\d+)\.(\d+)\.(\d+)\.(\d+)';
+$mask{host}	= '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
+$mask{chan}	= '[\#\&]\S*|_default';
+my $isnick1	= 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
+my $isnick2	= '0-9\-';
+$mask{nick}	= "[$isnick1]{1}[$isnick1$isnick2]*";
+$mask{nuh}	= '\S*!\S*\@\S*';
 $msgtime	= time();
 $msgsize	= 0;
 $msgcount	= 0;
@@ -70,11 +78,10 @@ $nottime	= 0;
 $notsize	= 0;
 $notcount	= 0;
 ###
+$bot_release	= "1.1.0";
 if ( -d "CVS" ) {
     use POSIX qw(strftime);
-    $bot_release	= strftime("cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
-} else {
-    $bot_release	= "1.0.10 (2001xxxx)";
+    $bot_release	.= strftime(" cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
 }
 $bot_version	= "blootbot $bot_release -- $^O";
 $noreply	= "NOREPLY";
@@ -83,6 +90,14 @@ $noreply	= "NOREPLY";
 ### misc commands.
 ###
 
+sub whatInterface {
+    if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {
+	return "IRC";
+    } else {
+	return "CLI";
+    }
+}
+
 sub doExit {
     my ($sig)	= @_;
 
@@ -100,7 +115,7 @@ sub doExit {
 	&status("--- Start of quit.");
 	$ident ||= "blootbot";	# lame hack.
 
-	&status("Memory Usage: $memusage kB");
+	&status("Memory Usage: $memusage KiB");
 
 	&closePID();
 	&closeStats();
@@ -210,7 +225,7 @@ sub IsChanConf {
 	return 0;
     }
 
-    # should we use IsParam() externally where needed or hack it in 
+    # should we use IsParam() externally where needed or hack it in
     # here just in case? fix it later.
     if (&IsParam($param)) {
 	&DEBUG("ICC: found '$param' option in main config file.");
@@ -293,7 +308,7 @@ sub getChanConf {
 	return 0;
     }
 
-    # this looks evil... 
+    # this looks evil...
     if (0 and !defined $chan) {
 	&DEBUG("gCC: ok !chan... doing _default instead.");
     }
@@ -301,7 +316,7 @@ sub getChanConf {
     $c		||= $chan;
     $c		||= "_default";
     $c		= "_default" if ($c eq "*");	# fix!
-    my @c	= grep /^$c$/i, keys %chanconf;
+    my @c	= grep /^\Q$c\E$/i, keys %chanconf;
 
     if (@c) {
 	if (0 and $c[0] ne $c) {
@@ -321,7 +336,7 @@ sub getChanConfDefault {
 
     if (exists $param{$what}) {
 	if (!exists $cache{config}{$what}) {
-	    &status("Config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead");
+	    &status("config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead of chan option");
 	    $cache{config}{$what} = 1;
 	}
 
@@ -331,7 +346,7 @@ sub getChanConfDefault {
     return $val if (defined $val);
 
     $param{$what}	= $default;
-    &status("Config ($chan): auto-setting param{$what} = $default");
+    &status("config ($chan): auto-setting param{$what} = $default");
     $cache{config}{$what} = 1;
     return $default;
 }
@@ -394,13 +409,13 @@ sub showProc {
 	if ($delta == 0) {
 	    return;
 	} elsif ($delta > 500) {
-	    $str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
+	    $str = "MEM:$prefix increased by $delta KiB. (total: $memusage KiB)";
 	} elsif ($delta > 0) {
-	    $str = "MEM:$prefix increased by $delta kB";
+	    $str = "MEM:$prefix increased by $delta KiB";
 	} else {	# delta < 0.
 	    $delta = -$delta;
 	    # never knew RSS could decrease, probably Size can't?
-	    $str = "MEM:$prefix decreased by $delta kB.";
+	    $str = "MEM:$prefix decreased by $delta KiB.";
 	}
 
 	&status($str);
@@ -440,7 +455,7 @@ sub setup {
 
     $param{tempDir} =~ s#\~/#$ENV{HOME}/#;
 
-    &status("Initial memory usage: $memusage kB");
+    &status("Initial memory usage: $memusage KiB");
     &status("-------------------------------------------------------");
 }
 
@@ -476,7 +491,7 @@ sub setupConfig {
 sub startup {
     if (&IsParam("DEBUG")) {
 	&status("enabling debug diagnostics.");
-	### I thought disabling this reduced memory usage by 1000 kB.
+	### I thought disabling this reduced memory usage by 1000 KiB.
 	use diagnostics;
     }