const char *
find_channel_status(struct membership *msptr, int combine)
{
- static char buffer[3];
+ static char buffer[5];
char *p;
p = buffer;
+ if(is_owner(msptr))
+ {
+ if(!combine)
+ return "!";
+ *p++ = '!';
+ }
+
if(is_chanop(msptr))
{
if(!combine)
*p++ = '@';
}
+ if(is_halfop(msptr))
+ {
+ if(!combine)
+ return "%";
+ *p++ = '%';
+ }
+
if(is_voiced(msptr))
*p++ = '+';
return buffer;
}
+/* is_halfop()
+ *
+ * input - membership to check for halfops
+ * output - 1 if the user is halfopped, 0 if the user is not or halfop
+ * is disabled.
+ * side effects -
+ *
+ */
+int
+is_halfop(struct membership *msptr)
+{
+ if(!ConfigChannel.use_halfop)
+ return 0;
+ if(is_chmode_h(msptr))
+ return 1;
+ else
+ return 0;
+}
+
+/* is_owner()
+ *
+ * input - membership to check for owner
+ * output - 1 if the user is an owner, 0 if the user is not or owner
+ * is disabled.
+ * side effects -
+ *
+ */
+int
+is_owner(struct membership *msptr)
+{
+ if(!ConfigChannel.use_owner)
+ return 0;
+ if(is_chmode_a(msptr))
+ return 1;
+ else
+ return 0;
+}
+
+/* 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)
+{
+ if(is_chanop(msptr) || is_halfop(msptr) || is_owner(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)
+{
+ if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(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)
+{
+ if(is_chanop(source) && !is_owner(target))
+ return 1;
+ else if(is_halfop(source) && !is_any_op(target))
+ return 1;
+ else if(is_owner(source))
+ return 1;
+
+ return 0;
+}
+
/* add_user_to_channel()
*
* input - channel to add client to, client to add, channel flags
{
msptr = ptr->data;
chptr = msptr->chptr;
- if (is_chanop_voiced(msptr))
- continue;
- if (chptr->mode.mode & MODE_NONICK)
+ if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr)))
return chptr;
}
return NULL;
if(IsMember(client2, ((struct membership *)ptr->data)->chptr))
return 1;
}
- return;
+ return 0;
}
/* channel_modes()
*pbuf = '\0';
for (i = 0; i < 256; i++)
+ {
+ if(chmode_table[i].set_func == chm_hidden && !IsOper(client_p) && IsClient(client_p))
+ continue;
if(chptr->mode.mode & chmode_flags[i])
*mbuf++ = i;
+ }
if(chptr->mode.limit)
{
}
/* check it begins with # or &, and local chans are disabled */
- else if(!IsChannelName(name))
+ else if(!IsChannelName(name) ||
+ ( !ConfigChannel.use_local_channels && name[0] == '&'))
{
sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
form_str(ERR_NOSUCHCHANNEL), name);