X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/143b6cc1e4a8faa8181301bf43ddafecab3237cc..24335dd6a3a37b52b92911144ddd3b5a11f77280:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index fc0896f..f22450d 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -477,7 +477,8 @@ msg_channel(int p_or_n, const char *command,
 	}
 	else if(chptr->mode.mode & MODE_OPMODERATE &&
 			chptr->mode.mode & MODE_MODERATED &&
-			IsMember(source_p, chptr))
+			(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
+			 IsMember(source_p, chptr)))
 	{
 		/* only do +z for +m channels for now, as bans/quiets
 		 * aren't tested for remote clients -- jilles */
@@ -916,7 +917,6 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 	struct Client *target_p;
 	char *server;
 	char *s;
-	int count;
 
 	/* user[%host]@server addressed?
 	 * NOTE: users can send to user@server, but not user%host@server
@@ -931,8 +931,6 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 			return;
 		}
 
-		count = 0;
-
 		if(!IsOper(source_p))
 		{
 			if(strchr(nick, '%') || (strncmp(nick, "opers", 5) == 0))