* Stop recursive is also loops

[infobot.git] / src / Factoids / Core.pl

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index f32736126c6d889015ebdfba603147bfe8d697e6..e33685c91f712214a267652cb45f453f00a8f1a0 100644 (file)
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -146,7 +146,6 @@ sub FactoidStuff {
        }
 
        $faqtoid =~ tr/A-Z/a-z/;
-       $faqtoid =~ s/^cmd:/CMD:/; # basic command forgetting
        my $result = &getFactoid($faqtoid);
 
        # if it doesn't exist, well... it doesn't!
@@ -159,11 +158,9 @@ sub FactoidStuff {
        my $author      = &getFactInfo($faqtoid, "created_by");
        my $count       = &getFactInfo($faqtoid, "requested_count") || 0;
        # don't delete if requested $limit times
-       my $limit       = &getChanConfDefault(
-                               "factoidPreventForgetLimit", 100, $chan);
+       my $limit       = &getChanConfDefault('factoidPreventForgetLimit', 100, $chan);
        # don't delete if older than $limitage seconds (modified by requests below)
-       my $limitage    = &getChanConfDefault(
-                               "factoidPreventForgetLimitTime", 7 * 24 * 60 * 60, $chan);
+       my $limitage    = &getChanConfDefault('factoidPreventForgetLimitTime', 7 * 24 * 60 * 60, $chan);
        my $t           = &getFactInfo($faqtoid, "created_time") || 0;
        my $age         = time() - $t;
 
@@ -171,7 +168,7 @@ sub FactoidStuff {
        $limitage       = $limitage*($count+1)/$limit if ($count < $limit);
        # isauthor and isop.
        my $isau        = (defined $author and &IsHostMatch($author) == 2) ? 1 : 0;
-       my $isop        = (&IsFlag("o") eq "o") ? 1 : 0;
+       my $isop        = (&IsFlag("o") eq "o") ? 1 : 0;
 
        if (IsFlag("r") ne "r" && !$isop) {
            &msg($who, "you don't have access to remove factoids");
@@ -244,7 +241,7 @@ sub FactoidStuff {
 
        # lets do it!
 
-       if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay")) {
+       if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay") > 0) {
            if (!($isop or $isau) and $faqtoid =~ / #DEL#$/) {
                &msg($who, "cannot delete it ($faqtoid).");
                return;
@@ -293,7 +290,7 @@ sub FactoidStuff {
 
        my $i = 0;
        $i++ if (&IsParam("factoidDeleteDelay"));
-       $i++ if (&IsChanConf("factoidDeleteDelay"));
+       $i++ if (&IsChanConf("factoidDeleteDelay") > 0);
        if (!$i) {
            &performReply("safe delete has been disable so what is there to undelete?");
            return;
@@ -306,7 +303,6 @@ sub FactoidStuff {
        }
 
        $faqtoid =~ tr/A-Z/a-z/;
-       $faqtoid =~ s/^cmd:/CMD:/; # basic command undeleteing
        my $result = &getFactoid($faqtoid." #DEL#");
        my $check  = &getFactoid($faqtoid);
 
@@ -431,11 +427,16 @@ sub FactoidStuff {
                    &performReply("that's too long");
                    return;
                }
+               # empty
+               if (length $result == 0) {
+                   &performReply("factoid would be empty. use forget?");
+                   return;
+               }
                # min length.
                my $faqauth = &getFactInfo($faqtoid, "created_by");
                if ((length $result)*2 < length $was and
                        &IsFlag("o") ne "o" and
-                       &IsHostMask($faqauth) != 2
+                       &IsHostMatch($faqauth) != 2
                ) {
                    &performReply("too drastic change of factoid.");
                }
@@ -496,8 +497,8 @@ sub FactoidStuff {
     if (defined $result and $result !~ /^0?$/) {       # question.
        &status("question: <$who> $message");
        $count{'Question'}++;
-    } elsif (&IsChanConf("Math") > 0 and $addressed) { # perl math.
-       &loadMyModule("Math");
+    } elsif (&IsChanConf('Math') > 0 and $addressed) { # perl math.
+       &loadMyModule('Math');
        my $newresult = &perlMath();
 
        if (defined $newresult and $newresult ne "") {
@@ -513,7 +514,7 @@ sub FactoidStuff {
     }
 
     # why would a friendly bot get passed here?
-    if (&IsParam("friendlyBots")) {
+    if (&IsParam('friendlyBots')) {
        return if (grep lc($_) eq lc($who), split(/\s+/, $param{'friendlyBots'}));
     }