undo simonrvn default arch change

[infobot.git] / src / core.pl

diff --git a/src/core.pl b/src/core.pl
index 20a85c3e27656e7599d6750e3cc8d7601bd77b66..ccb526b74ddc78089bc7f5121bb5dd3b7ea8242b 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -127,7 +127,7 @@ sub doExit {
        }
        &writeUserFile();
        &writeChanFile();
-       &uptimeWriteFile()      if (&IsChanConf('Uptime'));
+       &uptimeWriteFile()      if (&IsParam('Uptime'));
        &sqlCloseDB();
        &closeSHM($shm);
 
@@ -229,10 +229,10 @@ sub IsChanConf {
        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;
     }
 
@@ -339,7 +339,6 @@ sub getChanConf {
 
 sub getChanConfDefault {
     my($what, $default, $chan) = @_;
-
     $chan      ||= "_default";
 
     if (exists $param{$what}) {
@@ -454,12 +453,12 @@ sub setup {
     &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}/#;