* Fix previous patches missing "and" statements

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

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index bf8cfcdf77b5ff2aaaf59f8e04ed25ab7df0e8d3..2bbf40422bab90d0ed81614314152eb87ca53b3e 100644 (file)
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -390,14 +390,19 @@ sub FactoidStuff {
         my $created_by = $1;
 
         # Can they even modify factoids?
-        if (&IsFlag('m') ne 'm' and &IsFlag('M') ne 'M' and &IsFlag('o') ne 'o') {
-            &performReply("You do not have permission to modify factoids");
-            return;
+        if (&IsFlag('m') ne 'm' and
+            &IsFlag('M') ne 'M' and
+            &IsFlag('o') ne 'o') {
+                &performReply("You do not have permission to modify factoids");
+                return;
 
         # If they have +M but they didnt create the factoid
-        } elsif (&IsFlag('M') eq 'M' and $who !~ /^\Q$created_by\E$/i &IsFlag('m') ne 'm' &IsFlag('o') ne 'o') {
-            &performReply("factoid '$from' is not yours to modify.");
-            return;
+        } elsif (&IsFlag('M') eq 'M' and
+            $who !~ /^\Q$created_by\E$/i and
+            &IsFlag('m') ne 'm' and
+            &IsFlag('o') ne 'o') {
+                &performReply("factoid '$from' is not yours to modify.");
+                return;
         }
         # Else they have permission, so continue
 
@@ -445,9 +450,12 @@ sub FactoidStuff {
                 return;
 
             # If they have +M but they didnt create the factoid
-            } elsif (&IsFlag('M') eq 'M' and $who !~ /^\Q$created_by\E$/i &IsFlag('m') ne 'm' &IsFlag('o') ne 'o') {
-                &performReply("factoid '$faqtoid' is not yours to modify.");
-                return;
+            } elsif (&IsFlag('M') eq 'M' and
+                $who !~ /^\Q$created_by\E$/i and
+                &IsFlag('m') ne 'm' and
+                &IsFlag('o') ne 'o') {
+                    &performReply("factoid '$faqtoid' is not yours to modify.");
+                    return;
             }
 
                    # excessive length.

diff --git a/src/Factoids/Update.pl b/src/Factoids/Update.pl
index 08c6826ed7bb767c2bf6e0c9aa8576ce05f14821..ace4d5e7a67aafb1ff2047c86ddfe229f6f74e97 100644 (file)
--- a/src/Factoids/Update.pl
+++ b/src/Factoids/Update.pl
@@ -63,9 +63,12 @@ sub update {
             return 1;
 
         # If they have +M but they didnt create the factoid
-        } elsif (&IsFlag('M') eq 'M' and $who !~ /^\Q$created_by\E$/i &IsFlag('m') ne 'm' &IsFlag('o') ne 'o') {
-            &performReply("factoid '$lhs' is not yours to modify.");
-            return 1;
+        } elsif (&IsFlag('M') eq 'M' and
+            $who !~ /^\Q$created_by\E$/i and
+            &IsFlag('m') ne 'm' and
+            &IsFlag('o') ne 'o') {
+                &performReply("factoid '$lhs' is not yours to modify.");
+                return 1;
         }
     }