X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0b7d7dd9604ffe6593da3035f3357e7c3aa2fbe8..cb097b8840594b6a77aab21d0b4c20f036a7d012:/src/channel.c

diff --git a/src/channel.c b/src/channel.c
index c3e8cd9..4dd6b82 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -175,11 +175,18 @@ find_channel_membership(struct Channel *chptr, struct Client *client_p)
 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)
@@ -187,6 +194,13 @@ find_channel_status(struct membership *msptr, int combine)
 		*p++ = '@';
 	}
 
+	if(is_halfop(msptr))
+	{
+		if(!combine)
+			return "%";
+		*p++ = '%';
+	}
+
 	if(is_voiced(msptr))
 		*p++ = '+';
 
@@ -194,6 +208,44 @@ find_channel_status(struct membership *msptr, int combine)
 	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
@@ -203,8 +255,7 @@ find_channel_status(struct membership *msptr, int combine)
 int
 is_any_op(struct membership *msptr)
 {
-	/* Checks for +ah will go here when +ah are implemented */
-	if(is_chanop(msptr))
+	if(is_chanop(msptr) || is_halfop(msptr) || is_owner(msptr))
 		return 1;
 	else
 		return 0;
@@ -219,8 +270,7 @@ is_any_op(struct membership *msptr)
 int
 is_chanop_voiced(struct membership *msptr)
 {
-	/* Checks for +ah will go here when +ah are implemented */
-	if(is_chanop(msptr) || is_voiced(msptr))
+	if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(msptr))
 		return 1;
 	else
 		return 0;
@@ -235,11 +285,14 @@ is_chanop_voiced(struct membership *msptr)
 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
+	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()
@@ -976,9 +1029,7 @@ find_nonickchange_channel(struct Client *client_p)
 	{
 		msptr = ptr->data;
 		chptr = msptr->chptr;
-		if (is_any_op(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;
@@ -1201,8 +1252,12 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
 	*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)
 	{
@@ -1615,7 +1670,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
 		}
 
 		/* 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);