moved nick lock checking to lock only. detected by irq@OPN

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 93a3a32d25782417a8cf60d57bb1e79f138cac7c..e9766cde7eef4764bd31bdb6a2a13e4406d018f2 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -69,7 +69,7 @@ sub process {
                return;
            }
        }
-       $joinverb{$thischan} = $who;    # used for on_join self.
+       $cache{join}{$thischan} = $who; # used for on_join self.
 
        &joinchan($chankey);
        &status("JOIN $chankey <$who>");
@@ -424,19 +424,19 @@ sub FactoidStuff {
            return;
        }
 
-       # strongly requested by #debian on 19991028. -xk
-       if (1 and $faqtoid !~ /^\Q$who\E$/i and &IsFlag("o") ne "o") {
-           &msg($who,"sorry, locking cannot be used since it can be abused unneccesarily.");
-           &status("Replace 1 with 0 in Process.pl#~324 for locking support.");
-           return;
-       }
-
        if (&getFactoid($faqtoid) eq "") {
            &msg($who, "factoid \002$faqtoid\002 does not exist");
            return;
        }
 
        if ($function eq "lock") {
+           # strongly requested by #debian on 19991028. -xk
+           if (1 and $faqtoid !~ /^\Q$who\E$/i and &IsFlag("o") ne "o") {
+               &msg($who,"sorry, locking cannot be used since it can be abused unneccesarily.");
+               &status("Replace 1 with 0 in Process.pl#~324 for locking support.");
+               return;
+           }
+
            &CmdLock($faqtoid);
        } else {
            &CmdUnLock($faqtoid);