X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=437e8c434547faa797e4685f2e352658240b50fb;hp=23db579e725e1e54ef01faf4bfdd10616843ac76;hb=b130b35f48d19450240748425e12d21f2c38350f;hpb=08f9d31d60220e8a389a2d24f42625be7749f090

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 23db579e..437e8c43 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -16,12 +16,9 @@
  * Channel operator commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-macros.h"
@@ -31,9 +28,6 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
-#include "irc-op.h"
-
 /* Local functions */
 
 static bool
@@ -170,7 +164,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
 		/* Is the channel "invite-only"? */
 		if (Channel_HasMode(chan, 'i')) {
-			/* Yes. The user must be channel owner/admin/operator/halfop! */
+			/* Yes. The user issuing the INVITE command must be
+			 * channel owner/admin/operator/halfop! */
 			if (!Channel_UserHasMode(chan, from, 'q') &&
 			    !Channel_UserHasMode(chan, from, 'a') &&
 			    !Channel_UserHasMode(chan, from, 'o') &&
@@ -194,7 +189,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
 		if (remember) {
 			/* We must remember this invite */
-			if (!Channel_AddInvite(chan, Client_Mask(target), true))
+			if (!Channel_AddInvite(chan, Client_MaskCloaked(target),
+						true))
 				return CONNECTED;
 		}
 	}
@@ -203,21 +199,22 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 		 Req->argv[0], Req->argv[1]);
 
 	/*
-	 * RFC 2812 says:
-	 * 'There is no requirement that the channel [..] must exist or be a valid channel'
-	 * The problem with this is that this allows the "channel" to contain spaces,
-	 * in which case we must prefix its name with a colon to make it clear that
-	 * it is only a single argument.
+	 * RFC 2812 states:
+	 * 'There is no requirement that the channel [..] must exist or be a
+	 * valid channel'. The problem with this is that this allows the
+	 * "channel" to contain spaces, in which case we must prefix its name
+	 * with a colon to make it clear that it is only a single argument.
 	 */
 	colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":"";
 	/* Inform target client */
 	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0],
-					colon_if_necessary, Req->argv[1]);
+				  colon_if_necessary, Req->argv[1]);
 
 	if (Client_Conn(target) > NONE) {
 		/* The target user is local, so we have to send the status code */
 		if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG,
-			Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
+					       Client_ID(from), Req->argv[0],
+					       colon_if_necessary, Req->argv[1]))
 			return DISCONNECTED;
 
 		if (Client_HasMode(target, 'a') &&