X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fcore.pl;h=e8975c136a799f11219e10e071d3de9d85c8fbd0;hb=c68ac9b2d4b88535c1a2cfa695f6c4f683f0373c;hp=b49d9b2dbbbfa7dec62356dfab07a30bdb3806eb;hpb=58298d359360a1de27212a1ec0838dbfb7f0b53b;p=infobot.git

diff --git a/src/core.pl b/src/core.pl
index b49d9b2..e8975c1 100644
--- a/src/core.pl
+++ b/src/core.pl
@@ -10,18 +10,20 @@ use strict;
 # dynamic scalar. MUST BE REDUCED IN SIZE!!!
 ### TODO: reorder.
 use vars qw(
+	$bot_misc_dir $bot_pid $bot_base_dir $bot_src_dir
+	$bot_data_dir $bot_config_dir $bot_state_dir $bot_run_dir
 	$answer $correction_plausible $talkchannel $bot_release
 	$statcount $memusage $user $memusageOld $bot_version $dbh
-	$shm $host $msg $bot_misc_dir $bot_pid $bot_base_dir $noreply
-	$bot_src_dir $conn $irc $learnok $nick $ident $no_syscall
+	$shm $host $msg $noreply $conn $irc $learnok $nick $ident
 	$force_public_reply $addrchar $userHandle $addressedother
 	$floodwho $chan $msgtime $server $firsttime $wingaterun
-	$flag_quit $msgType
+	$flag_quit $msgType $no_syscall
 	$utime_userfile	$wtime_userfile	$ucount_userfile
 	$utime_chanfile	$wtime_chanfile	$ucount_chanfile
 	$pubsize $pubcount $pubtime
 	$msgsize $msgcount $msgtime
 	$notsize $notcount $nottime
+	$running
 );
 
 # dynamic hash.
@@ -56,6 +58,7 @@ $ucount_userfile = 0;
 $utime_chanfile	= 0;
 $wtime_chanfile	= 0;
 $ucount_chanfile = 0;
+$running	= 0;
 ### more variables...
 $msgtime	= time();
 $msgsize	= 0;
@@ -99,6 +102,7 @@ sub doExit {
 
 	&closeDCC();
 	&closePID();
+	&closeStats();
 	&seenFlush();
 	&quit($param{'quitMsg'}) if (&whatInterface() =~ /IRC/);
 	&writeUserFile();
@@ -298,6 +302,31 @@ sub getChanConf {
     return $chanconf{"_default"}{$param};
 }
 
+#####
+#  Usage: &findChanConf($param);
+#  About: Retrieve value for 'param' value from any chan.
+# Return: scalar for success, undef for failure.
+sub findChanConf {
+    my($param)	= @_;
+
+    if (!defined $param) {
+	&WARN("param == NULL.");
+	return 0;
+    }
+
+    my $c;
+    foreach $c (keys %chanconf) {
+	foreach (keys %{ $chanconf{$c} }) {
+	    next unless (/^$param$/);
+
+	    &DEBUG("chanconf{$c}{$_} ...");
+	    return $chanconf{$c}{$_};
+	}
+    }
+
+    return;
+}
+
 sub showProc {
     my ($prefix) = $_[0] || "";
 
@@ -362,7 +391,7 @@ sub setup {
     }
 
     # read.
-    &loadLang($bot_misc_dir.		"/blootbot.lang");
+    &loadLang($bot_data_dir. "/blootbot.lang");
     &loadIRCServers();
     &readUserFile();
     &readChanFile();
@@ -390,7 +419,7 @@ sub setup {
 
 sub setupConfig {
     $param{'VERBOSITY'} = 1;
-    &loadConfig($bot_misc_dir."/blootbot.config");
+    &loadConfig($bot_config_dir."/blootbot.config");
 
     foreach ("ircNick", "ircUser", "ircName", "DBType", "tempDir") {
 	next if &IsParam($_);
@@ -413,8 +442,8 @@ sub setupConfig {
     }
 
     # static scalar variables.
-    $file{utm}	= "$bot_base_dir/$param{'ircUser'}.uptime";
-    $file{PID}	= "$bot_base_dir/$param{'ircUser'}.pid";
+    $file{utm}	= "$bot_state_dir/$param{'ircUser'}.uptime";
+    $file{PID}	= "$bot_run_dir/$param{'ircUser'}.pid";
 }
 
 sub startup {
@@ -455,8 +484,9 @@ sub restart {
 
 	### crappy bug in Net::IRC?
 	if (!$conn->connected and time - $msgtime > 900) {
-	    &status("reconnecting because of uncaught disconnect.");
+	    &status("reconnecting because of uncaught disconnect \@ ".scalar(localtime) );
 ###	    $irc->start;
+	    &clearIRCVars();
 	    $conn->connect();
 ###	    return;
 	}
@@ -465,7 +495,7 @@ sub restart {
 
 	&DCCBroadcast("-HUP called.","m");
 	&shutdown();
-	&loadConfig($bot_misc_dir."/blootbot.config");
+	&loadConfig($bot_config_dir."/blootbot.config");
 	&reloadAllModules() if (&IsParam("DEBUG"));
 	&setup();
 
@@ -481,8 +511,7 @@ sub loadConfig {
 
     if (!open(FILE, $file)) {
 	&ERROR("FAILED loadConfig ($file): $!");
-	&status("Please copy files/sample.config to files/blootbot.config");
-	&status("  and edit files/blootbot.config, modify to tastes.");
+	&status("Please read the INSTALL file on how to install and setup this file.");
 	exit 0;
     }