Initial support for 'noisy' oper-override of channel modes, using omode-type code. Supports simple modes at present.

include/channel.h

@@ -114,6 +114,7 @@ struct ChModeChange
 	int caps;
 	int nocaps;
 	int mems;
+	int override;
 	struct Client *client;
 };
 

src/chmode.c

@@ -498,7 +498,14 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
 	   int alevel, int parc, int *parn,
 	   const char **parv, int *errors, int dir, char c, long mode_type)
 {
+
+	int override = 0;
+	
 	if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+	{
+		if (IsOverride(source_p))
+			override = 1;
+		else
 		{
 			if(!(*errors & SM_ERR_NOOPS))
 				sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
@@ -506,6 +513,7 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
 			*errors |= SM_ERR_NOOPS;
 			return;
 		}
+	}
 
 	if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
 		return;
@@ -526,6 +534,7 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
 		mode_changes[mode_count].nocaps = 0;
 		mode_changes[mode_count].id = NULL;
 		mode_changes[mode_count].mems = ALL_MEMBERS;
+		mode_changes[mode_count].override = override;
 		mode_changes[mode_count++].arg = NULL;
 	}
 	else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
@@ -538,6 +547,7 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
 		mode_changes[mode_count].nocaps = 0;
 		mode_changes[mode_count].mems = ALL_MEMBERS;
 		mode_changes[mode_count].id = NULL;
+		mode_changes[mode_count].override = override;
 		mode_changes[mode_count++].arg = NULL;
 	}
 }
@@ -1813,12 +1823,13 @@ void
 set_channel_mode(struct Client *client_p, struct Client *source_p,
 		 struct Channel *chptr, struct membership *msptr, int parc, const char *parv[])
 {
+	static char cmdbuf[BUFSIZE];
 	static char modebuf[BUFSIZE];
 	static char parabuf[BUFSIZE];
 	char *mbuf;
 	char *pbuf;
 	int cur_len, mlen, paralen, paracount, arglen, len;
-	int i, j, flags;
+	int i, j, flags, override;
 	int dir = MODE_ADD;
 	int parn = 1;
 	int errors = 0;
@@ -1867,12 +1878,23 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 		return;
 
 	if(IsServer(source_p))
-		mlen = rb_sprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
+		rb_sprintf(cmdbuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
 	else
-		mlen = rb_sprintf(modebuf, ":%s!%s@%s MODE %s ",
+		rb_sprintf(cmdbuf, ":%s!%s@%s MODE %s ",
 				  source_p->name, source_p->username,
 				  source_p->host, chptr->chname);
 
+	for (override = 0; override < (IsOverride(source_p) ? 2 : 1); ++override)
+	{
+		int was_on_chan = 0;
+		if(override)
+		{
+			if(msptr)
+				was_on_chan = 1;
+			else
+				add_user_to_channel(chptr, source_p, 0);
+		}
+
 		for(j = 0, flags = ALL_MEMBERS; j < 2; j++, flags = ONLY_CHANOPS)
 		{
 			cur_len = mlen;
@@ -1885,6 +1907,8 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 			for(i = 0; i < mode_count; i++)
 			{
 				if(mode_changes[i].letter == 0 || mode_changes[i].mems != flags)
+
+				if(mode_changes[i].override != override)
 					continue;
 
 				if(mode_changes[i].arg != NULL)
@@ -1907,8 +1931,15 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 					*mbuf = '\0';
 
 					if(cur_len > mlen)
-					sendto_channel_local(flags, chptr, "%s %s", modebuf,
+					{
-							     parabuf);
+						sendto_channel_local(flags, chptr, "%s%s %s",
+								cmdbuf, modebuf, parabuf);
+						if(override)
+							sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+									"%s is overriding modes on %s: %s %s",
+									get_oper_name(source_p), chptr->chname,
+									modebuf, parabuf);
+					}
 					else
 						continue;
 
@@ -1939,15 +1970,11 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 				}
 			}
 
-		if(paralen && parabuf[paralen - 1] == ' ')
+			if(override && !was_on_chan)
-			parabuf[paralen - 1] = '\0';
+				remove_user_from_channel(find_channel_membership(chptr, source_p));
-
-		*mbuf = '\0';
-		if(cur_len > mlen)
-			sendto_channel_local(flags, chptr, "%s %s", modebuf, parabuf);
 	}
-
 	/* only propagate modes originating locally, or if we're hubbing */
 	if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1)
 		send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count);
 	}
+}