BUILD : 1.7.8 (618) BUGS : NOTES : Fixed a small error in my previous commit caused by making a few if/else if easier to read

git-svn-id: svn://svn.anope.org/anope/trunk@618 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@466 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 21 insertions, 20 deletions

diff --git a/src/channels.c b/src/channels.c
index 9c433cc0a..654e1681a 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1230,25 +1230,22 @@ void chan_set_correct_modes(User * user, Channel * c)
          * which sends the mode to the uplink and returns true. If the
          * mode is sent, we internally update to finish it off. -GD
          */
-        if (ircd->owner && !(status & CUS_OWNER)) {
-            if (check_should_owner(user, chan))
-                chan_set_user_status(c, user, CUS_OWNER | CUS_OP);
-        } else if (ircd->protect && !(status & CUS_PROTECT)) {
-            if (check_should_protect(user, chan))
-                chan_set_user_status(c, user, CUS_PROTECT | CUS_OP);
-        } else if (ircd->admin && !(status & CUS_PROTECT)) {
-            if (check_should_protect(user, chan))
-                chan_set_user_status(c, user, CUS_PROTECT | CUS_OP);
-        } else if (!(status & CUS_OP)) {
-            if (check_should_op(user, chan))
-                chan_set_user_status(c, user, CUS_OP);
-        } else if (ircd->halfop && !(status & CUS_HALFOP)) {
-            if (check_should_halfop(user, chan))
-                chan_set_user_status(c, user, CUS_HALFOP);
-        } else if (!(status & CUS_VOICE)) {
-            if (check_should_voice(user, chan))
-                chan_set_user_status(c, user, CUS_VOICE);
-        }
+        if (ircd->owner && !(status & CUS_OWNER)
+            && check_should_owner(user, chan))
+            chan_set_user_status(c, user, CUS_OWNER | CUS_OP);
+        else if (ircd->protect && !(status & CUS_PROTECT)
+                 && check_should_protect(user, chan))
+            chan_set_user_status(c, user, CUS_PROTECT | CUS_OP);
+        else if (ircd->admin && !(status & CUS_PROTECT)
+                 && check_should_protect(user, chan))
+            chan_set_user_status(c, user, CUS_PROTECT | CUS_OP);
+        else if (!(status & CUS_OP) && check_should_op(user, chan))
+            chan_set_user_status(c, user, CUS_OP);
+        else if (ircd->halfop && !(status & CUS_HALFOP)
+                 && check_should_halfop(user, chan))
+            chan_set_user_status(c, user, CUS_HALFOP);
+        else if (!(status & CUS_VOICE) && check_should_voice(user, chan))
+            chan_set_user_status(c, user, CUS_VOICE);
     }
 }
 
diff --git a/version.log b/version.log
index 9bac870db..da35cdb27 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="617"
+VERSION_BUILD="618"
 
 # $Log$
 #
+# BUILD : 1.7.8 (618)
+# BUGS  : 
+# NOTES : Fixed a small error in my previous commit caused by making a few if/else if easier to read
+#
 # BUILD : 1.7.8 (617)
 # BUGS  : 
 # NOTES : Fixed: [1] Will not set already set channel modes anymore [2] Do not display entrymsg/greet while syncing [3] Sync state for uplink not always set correctly