From 08424c9191b4c7d7be2446239d651e21d636644c Mon Sep 17 00:00:00 2001
From: djmcgrath <djmcgrath@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Wed, 16 Apr 2008 18:01:56 +0000
Subject: [PATCH] * Fix previous patches missing "and" statements

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1665 c11ca15a-4712-0410-83d8-924469b57eb5
---
 src/Factoids/Core.pl   | 26 +++++++++++++++++---------
 src/Factoids/Update.pl |  9 ++++++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index bf8cfcd..2bbf404 100644
--- 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 08c6826..ace4d5e 100644
--- 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;
         }
     }
 
-- 
2.39.2