X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=d8d70c5f15ce13bed40ca3f465e55a77955fa5d0;hb=592565aef58544813d9a8acda683398e1e566195;hp=d4a71f00f1bba1186780531441c76dbef4b3a62e;hpb=27a70171f1886381596efdf5d8d87b17d83f3561;p=ngircd-alex.git

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index d4a71f00..d8d70c5f 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-op.c,v 1.4 2002/06/09 13:17:29 alex Exp $
+ * $Id: irc-op.c,v 1.8 2002/09/08 00:52:39 alex Exp $
  *
  * irc-op.c: Befehle zur Channel-Verwaltung
  */
@@ -63,22 +63,6 @@ IRC_KICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_KICK */	
 
 
-GLOBAL BOOLEAN
-IRC_BAN( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	/* Valider Client? */
-	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
-	/* Keine Parameter? */
-	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	return CONNECTED;
-} /* IRC_BAN */	
-
-
 GLOBAL BOOLEAN
 IRC_INVITE( CLIENT *Client, REQUEST *Req )
 {
@@ -101,7 +85,7 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
 	
 	/* User suchen */
 	target = Client_Search( Req->argv[0] );
-	if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), 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] );
 
@@ -120,17 +104,24 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
 
 		/* 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] );
-
 	}
 
+	/* Wenn der User gebanned ist, so muss das Invite auch gespeichert werden */
+	if( Lists_CheckBanned( target, chan )) 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( Client_Mask( target ), chan, TRUE )) return CONNECTED;
+	}
+	
+	/* an Ziel-Client forwarden ... */
 	IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );
-	if( remember ) Lists_AddInvited( Client_Mask( target ), chan, TRUE );
 
 	if( Client_Conn( target ) > NONE )
 	{
-		/* lokaler Zeil-Client, Status-Code melden */
-		if( ! IRC_WriteStrClientPrefix( from, from, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED;
+		/* 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;
 	}
 	
 	return CONNECTED;