tiny changes that I've missed

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@307 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index cb9c30ea0860a3a3e881c3098ae25900f0fadcee..ba4245195c24ae36650201259bf58453f01b264c 100644 (file)
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -372,7 +372,7 @@ sub verifyUser {
     my ($user,$m);
 
     if ($userHandle = $dcc{'CHATvrfy'}{$who}) {
-       &VERB("vUser: cached auth for $who.",2);
+       &DEBUG("vUser: cached auth for $who.");
        return $userHandle;
     }
 

diff --git a/src/Factoids/Norm.pl b/src/Factoids/Norm.pl
index 47839ea501893b8080a37e1ee845db324d8daddb..92b1513b0f9a081dce09948f13c5472ba9e3fbbb 100644 (file)
--- a/src/Factoids/Norm.pl
+++ b/src/Factoids/Norm.pl
@@ -87,7 +87,7 @@ sub switchPerson {
                $in =~ s/(^|\W)your(\W|$)/$1$param{'ircNick'}\'s$2/ig;
        }
 
-       $in;
+       return $in;
 }
 
 # ---

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index 1cef70959dc1ad983d8bc14520ee807516e0113e..1001c0b9ce8e32a99512becdfdb8fd1adc0652ba 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -100,14 +100,14 @@ sub doQuestion {
     }
 
     ### TODO: Use &Forker(); move function to Freshmeat.pl.
-    if (&IsParam("freshmeatForFactoid")) {
+    if (&IsChanConf("freshmeatForFactoid")) {
        &loadMyModule($myModules{'freshmeat'});
        $result = &Freshmeat::showPackage($query);
        return $result if (defined $result);
     }
 
     ### TODO: Use &Forker(); move function to Debian.pl
-    if (&IsParam("debianForFactoid")) {
+    if (&IsChanConf("debianForFactoid")) {
        &loadMyModule($myModules{'debian'});
        $result = &Debian::DebianFind($query);  # ???
        ### TODO: debian module should tell, through shm, that it went
@@ -129,7 +129,7 @@ sub doQuestion {
        }
     }
 
-    $reply;
+    return $reply;
 }
 
 1;

diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index c11938b866b54bd5e89dac03e627d6cc59c817d5..d0375be4e35cbf6ea169d184097a84f04f5787aa 100644 (file)
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -310,5 +310,4 @@ sub smart_replace {
     return $string;
 }
 
-
 1;

diff --git a/src/Factoids/Update.pl b/src/Factoids/Update.pl
index af6f4c4533d65e35ed2e1acd1b3671158425e705..1a2cf3a02f3d951d8e2fc6fd4fef376d9c49fc51 100644 (file)
--- a/src/Factoids/Update.pl
+++ b/src/Factoids/Update.pl
@@ -52,7 +52,7 @@ sub update {
     my $also    = ($rhs =~ s/^also //i);
     my $also_or = ($also and $rhs =~ s/\s+(or|\|\|)\s+//);
 
-    if (&IsParam("freshmeatForFactoid")) {
+    if (&IsChanConf("freshmeatForFactoid")) {
        if (&dbGet("freshmeat", "name", $lhs, "name")) {
            &msg($who, "permission denied. (freshmeat)");
            &status("alert: $who wanted to teach me something that freshmeat already has info on.");

diff --git a/src/Misc.pl b/src/Misc.pl
index 22cd0ea571df8f3d9379fad3662d273e10d783dc..2ae258da301d674065c48817ab07db8e16e5ede0 100644 (file)
--- a/src/Misc.pl
+++ b/src/Misc.pl
@@ -611,10 +611,10 @@ sub hasProfanity {
 sub hasParam {
     my ($param) = @_;
 
-    ### TODO: specific reason why it failed.
     if (&IsChanConf($param)) {
        return 1;
     } else {
+       ### TODO: specific reason why it failed.
        &msg($who, "unfortunately, \002$param\002 is disabled in my configuration") unless ($addrchar);
        return 0;
     }

diff --git a/src/core.pl b/src/core.pl
index b075235c7b9d8c023b1b5eaed393e6053d9e654f..d868f8e015bcce4d965fd67ef2955ae1f124c18a 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -85,7 +85,7 @@ sub doExit {
        &quit($param{'quitMsg'}) if (&whatInterface() =~ /IRC/);
        &writeUserFile();
        &writeChanFile();
-       &uptimeWriteFile()      if (&IsParam("uptime"));
+       &uptimeWriteFile()      if (&ChanConfList("uptime"));
        &closeDB();
        &closeSHM($shm);
        &dumpallvars()          if (&IsParam("dumpvarsAtExit"));
@@ -364,6 +364,7 @@ sub restart {
            return;
        }
 
+       &DCCBroadcast("-HUP called.","m");
        &shutdown();
        &loadConfig($bot_misc_dir."/blootbot.config");
        &reloadAllModules() if (&IsParam("DEBUG"));

diff --git a/src/modules.pl b/src/modules.pl
index 333c43e145950a3d9f5e78d8658e94261cc62a52..8bb69093f16e6e141332a12563211080cb68cf5e 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -44,6 +44,7 @@ if ($@) {
        "wingate"       => "Wingate.pl",
        "insult"        => "insult.pl",
        "nickometer"    => "nickometer.pl",
+       "babelfish"     => "babel.pl",
 );
 @myModulesLoadNow      = ('topic', 'uptime',);
 @myModulesReloadNot    = ('IRC/Irc.pl','IRC/Schedulers.pl');