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=23db579e725e1e54ef01faf4bfdd10616843ac76;hp=23fcc71cc14cfe8a352138a433d6a7e1e2a7f82b;hb=8ae2cdfce9f8ba75fe72d65603d4c05c87f6d9c2;hpb=3228f1b2677e6edd1b0cfe81ac31069914ecd61b

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 23fcc71c..23db579e 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -43,7 +43,8 @@ try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
 	CLIENT *target = Client_Search(nick);
 
 	if (!target)
-		return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick);
+		return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+					  Client_ID(from), nick);
 
 	Channel_Kick(peer, target, from, channel, reason);
 	return true;
@@ -70,7 +71,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	_IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3)
 	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	while (*itemList) {
@@ -122,7 +122,7 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
 			nickCount--;
 		}
 	} else {
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					Client_ID(Client), Req->command);
 	}
 	return true;
@@ -146,42 +146,47 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
 	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	/* Search user */
 	target = Client_Search(Req->argv[0]);
 	if (!target || (Client_Type(target) != CLIENT_USER))
-		return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG,
-				Client_ID(Client), Req->argv[0]);
+		return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->argv[0]);
 
 	chan = Channel_Search(Req->argv[1]);
 	if (chan) {
 		/* Channel exists. Is the user a valid member of the channel? */
 		if (!Channel_IsMemberOf(chan, from))
-			return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]);
+			return IRC_WriteErrClient(from, ERR_NOTONCHANNEL_MSG,
+						  Client_ID(Client),
+						  Req->argv[1]);
 
 		/* Is the channel "invite-disallow"? */
-		if (strchr(Channel_Modes(chan), 'V'))
-			return IRC_WriteStrClient(from, ERR_NOINVITE_MSG,
-				Client_ID(from), Channel_Name(chan));
+		if (Channel_HasMode(chan, 'V'))
+			return IRC_WriteErrClient(from, ERR_NOINVITE_MSG,
+						  Client_ID(from),
+						  Channel_Name(chan));
 
 		/* Is the channel "invite-only"? */
-		if (strchr(Channel_Modes(chan), 'i')) {
+		if (Channel_HasMode(chan, 'i')) {
 			/* Yes. The user must be channel owner/admin/operator/halfop! */
-			if (!strchr(Channel_UserModes(chan, from), 'q') &&
-			    !strchr(Channel_UserModes(chan, from), 'a') &&
-			    !strchr(Channel_UserModes(chan, from), 'o') &&
-			    !strchr(Channel_UserModes(chan, from), 'h'))
-				return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
-						Client_ID(from), Channel_Name(chan));
+			if (!Channel_UserHasMode(chan, from, 'q') &&
+			    !Channel_UserHasMode(chan, from, 'a') &&
+			    !Channel_UserHasMode(chan, from, 'o') &&
+			    !Channel_UserHasMode(chan, from, 'h'))
+				return IRC_WriteErrClient(from,
+							  ERR_CHANOPRIVSNEEDED_MSG,
+							  Client_ID(from),
+							  Channel_Name(chan));
 			remember = true;
 		}
 
 		/* Is the target user already member of the channel? */
 		if (Channel_IsMemberOf(chan, target))
-			return IRC_WriteStrClient(from, ERR_USERONCHANNEL_MSG,
-					Client_ID(from), Req->argv[0], Req->argv[1]);
+			return IRC_WriteErrClient(from, ERR_USERONCHANNEL_MSG,
+						  Client_ID(from),
+						  Req->argv[0], Req->argv[1]);
 
 		/* If the target user is banned on that channel: remember invite */
 		if (Lists_Check(Channel_GetListBans(chan), target))
@@ -215,7 +220,7 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 			Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
 			return DISCONNECTED;
 
-		if (strchr(Client_Modes(target), 'a') &&
+		if (Client_HasMode(target, 'a') &&
 			!IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from),
 					Client_ID(target), Client_Away(target)))
 				return DISCONNECTED;