$notsize = 0;
$notcount = 0;
###
-$bot_release = "1.3.2";
+$bot_release = "1.3.3";
if ( -d "CVS" ) {
use POSIX qw(strftime);
$bot_release .= strftime(" cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
}
&writeUserFile();
&writeChanFile();
- &uptimeWriteFile() if (&IsChanConf('Uptime'));
+ &uptimeWriteFile() if (&IsParam('Uptime'));
&sqlCloseDB();
&closeSHM($shm);
return 0;
}
- # should we use IsParam() externally where needed or hack it in
- # here just in case? fix it later.
+ # these should get moved to your .chan file instead of the .config
+ # .config items overide any .chan entries
if (&IsParam($param)) {
- &DEBUG("ICC: found '$param' option in main config file.");
+ &WARN("ICC: found '$param' option in main config file.");
return 1;
}
if (0 and $c[0] ne $c) {
&WARN("c ne chan ($c[0] ne $chan)");
}
+ if (!defined $chanconf{$c[0]}{$param} and ($c ne '_default')) {
+ return &getChanConf($param, '_default');
+ }
+ #&DEBUG("gCC: $param,$c \"" . $chanconf{$c[0]}{$param} . '"');
return $chanconf{$c[0]}{$param};
}
-# &DEBUG("gCC: returning _default... ");
+ #&DEBUG("gCC: returning _default... " . $chanconf{"_default"}{$param});
return $chanconf{"_default"}{$param};
}
sub getChanConfDefault {
my($what, $default, $chan) = @_;
-
$chan ||= "_default";
if (exists $param{$what}) {
&checkTables();
&status("Setup: ". &countKeys("factoids") ." factoids.");
- &getChanConfDefault("sendPrivateLimitLines", 3);
- &getChanConfDefault("sendPrivateLimitBytes", 1000);
- &getChanConfDefault("sendPublicLimitLines", 3);
- &getChanConfDefault("sendPublicLimitBytes", 1000);
- &getChanConfDefault("sendNoticeLimitLines", 3);
- &getChanConfDefault("sendNoticeLimitBytes", 1000);
+ &getChanConfDefault("sendPrivateLimitLines", 3, $chan);
+ &getChanConfDefault("sendPrivateLimitBytes", 1000, $chan);
+ &getChanConfDefault("sendPublicLimitLines", 3, $chan);
+ &getChanConfDefault("sendPublicLimitBytes", 1000, $chan);
+ &getChanConfDefault("sendNoticeLimitLines", 3, $chan);
+ &getChanConfDefault("sendNoticeLimitBytes", 1000, $chan);
$param{tempDir} =~ s#\~/#$ENV{HOME}/#;