Add to the descriptions of owner and halfop in refrence.conf.

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

diff --git a/src/channel.c b/src/channel.c
index d00be83c185b570008267c922a17d2495383513b..0fd0f03863b601b13939b5fed057446697b09fd3 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -194,6 +194,38 @@ 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;
+}
+
 /* add_user_to_channel()
  *
  * input       - channel to add client to, client to add, channel flags
@@ -725,6 +757,9 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
 
        s_assert(source_p->localClient != NULL);
 
+       if(IsOverride(source_p))
+               return 0;
+
        rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
        rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
        if(source_p->localClient->mangledhost != NULL)
@@ -847,6 +882,9 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
        if(is_chanop_voiced(msptr))
                return CAN_SEND_OPV;
 
+       if(IsOverride(source_p))
+               return CAN_SEND_NONOP;
+
        if(chptr->mode.mode & MODE_MODERATED)
                return CAN_SEND_NO;
 
@@ -879,7 +917,7 @@ find_bannickchange_channel(struct Client *client_p)
        char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
 
-       if (!MyClient(client_p))
+       if (!MyClient(client_p) || IsOverride(client_p))
                return NULL;
 
        rb_sprintf(src_host, "%s!%s@%s", client_p->name, client_p->username, client_p->host);
@@ -922,7 +960,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;
@@ -1104,6 +1142,26 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in
        }
 }
 
+/* has_common_channel()
+ * 
+ * input       - pointer to client
+ *                     - pointer to another client
+ * output      - 1 if the two have a channel in common, 0 elsewise
+ * side effects - none
+ */
+int
+has_common_channel(struct Client *client1, struct Client *client2)
+{
+       rb_dlink_node *ptr;
+
+       RB_DLINK_FOREACH(ptr, client1->user->channel.head)
+       {
+               if(IsMember(client2, ((struct membership *)ptr->data)->chptr))
+                       return 1;
+       }
+       return 0;
+}
+
 /* channel_modes()
  *
  * inputs       - pointer to channel