Add can_kick_deop() and use it in m_kick.

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 73cd655753d0a4644b2023932b5a4c4a87bd5b62..c3e8cd984d123f4baa1faab750349a077f7d5c85 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -194,6 +194,54 @@ find_channel_status(struct membership *msptr, int combine)
        return buffer;
 }
 
+/* is_any_op()
+ *
+ * input       - membership to check for ops
+ * output      - 1 if the user is op, halfop, or owner, 0 elsewise
+ * side effects - 
+ */
+int
+is_any_op(struct membership *msptr)
+{
+       /* Checks for +ah will go here when +ah are implemented */
+       if(is_chanop(msptr))
+               return 1;
+       else
+               return 0;
+}
+
+/* is_chanop_voiced()
+ *
+ * input       - memebership to check for status
+ * output      - 1 if the user is op, halfop, owner, or voice, 0 elsewise
+ * side effects -
+ */
+int
+is_chanop_voiced(struct membership *msptr)
+{
+       /* Checks for +ah will go here when +ah are implemented */
+       if(is_chanop(msptr) || is_voiced(msptr))
+               return 1;
+       else
+               return 0;
+}
+
+/* can_kick_deop()
+ *
+ * input       - two memeberships
+ * output      - 1 if the first memebership can kick/deop the second, 0 elsewise
+ * side effects -
+ */
+int
+can_kick_deop(struct membership *source, struct membership *target)
+{
+       /* This does not do much yet. That will change when +ah is in. */
+       if(!is_any_op(source))
+               return 0;
+       else
+               return 1;
+}
+
 /* add_user_to_channel()
  *
  * input       - channel to add client to, client to add, channel flags
@@ -928,7 +976,7 @@ find_nonickchange_channel(struct Client *client_p)
        {
                msptr = ptr->data;
                chptr = msptr->chptr;
-               if (is_chanop_voiced(msptr))
+               if (is_any_op(msptr))
                        continue;               
                if (chptr->mode.mode & MODE_NONICK)
                        return chptr;
@@ -1127,7 +1175,7 @@ has_common_channel(struct Client *client1, struct Client *client2)
                if(IsMember(client2, ((struct membership *)ptr->data)->chptr))
                        return 1;
        }
-       return;
+       return 0;
 }
 
 /* channel_modes()