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=94b11bebdc3bbb7f3c3bea5711878681cbd1da21;hp=bdb6d83056039370ed8c82eb68bbeef95294e221;hb=452fb28394361c38d32e268a0aa1a8edbccfa72c;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index bdb6d830..94b11beb 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,17 +14,17 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-op.c,v 1.11 2002/12/12 12:24:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
+#include "defines.h"
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
-#include "defines.h"
 #include "irc-write.h"
 #include "lists.h"
 #include "log.h"
@@ -35,7 +35,7 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.11 2002/12/12 12:24:18 alex Exp $";
 #include "irc-op.h"
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_KICK( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
@@ -59,64 +59,75 @@ IRC_KICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_KICK */	
 
 
-GLOBAL BOOLEAN
-IRC_INVITE( CLIENT *Client, REQUEST *Req )
+GLOBAL bool
+IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
 	CHANNEL *chan;
 	CLIENT *target, *from;
-	BOOLEAN remember = FALSE;
+	bool remember = false;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
-	
-	/* User suchen */
-	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] );
-
-	chan = Channel_Search( Req->argv[1] );
-
-	if( chan )
-	{
-		/* Der Channel existiert bereits; ist der User Mitglied? */
-		if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] );
-
-		/* Ist der Channel "invite-only"? */
-		if( strchr( Channel_Modes( chan ), 'i' ))
-		{
-			/* Ja. Der User muss Channel-Operator sein! */
-			if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
-			remember = TRUE;
+	if (Req->argc != 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					Client_ID(Client), Req->command);
+
+	if (Client_Type(Client) == CLIENT_SERVER)
+		from = Client_Search(Req->prefix);
+	else
+		from = Client;
+	if (!from)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					Client_ID(Client), Req->prefix);
+
+	/* 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]);
+
+	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]);
+
+		/* Is the channel "invite-only"? */
+		if (strchr(Channel_Modes(chan), 'i')) {
+			/* Yes. The user must be channel operator! */
+			if (!strchr(Channel_UserModes(chan, from), 'o'))
+				return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
+						Client_ID(from), Channel_Name(chan));
+			remember = true;
 		}
 
-		/* Ist der Ziel-User bereits Mitglied? */
-		if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] );
-	}
+		/* 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]);
 
-	/* Wenn der User gebanned ist, so muss das Invite auch gespeichert werden */
-	if( Lists_CheckBanned( target, chan )) remember = TRUE;
+		/* If the target user is banned on that channel: remember invite */
+		if (Lists_Check(Channel_GetListBans(chan), target))
+			remember = true;
 
-	Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
-	if( remember )
-	{
-		if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED;
+		if (remember) {
+			/* We must remember this invite */
+			if (!Channel_AddInvite(chan, Client_Mask(target), true))
+				return CONNECTED;
+		}
 	}
-	
-	/* an Ziel-Client forwarden ... */
-	IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );
 
-	if( Client_Conn( target ) > NONE )
-	{
-		/* lokaler Ziel-Client, Status-Code melden */
-		if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED;
+	LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
+
+	/* Inform target client */
+	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s", Req->argv[0], 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], Req->argv[1]))
+			return DISCONNECTED;
 	}
-	
 	return CONNECTED;
 } /* IRC_INVITE */