- Dokumentation aktualisiert.

[ngircd-alex.git] / src / ngircd / irc-op.c

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 83f8aad42f081aa19ba5226daaea5a9fea2376ab..cd2b823574df79d73bdf3fc226919017016687d7 100644 (file)
--- 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.7 2002/07/25 11:36:16 alex Exp $
+ * $Id: irc-op.c,v 1.9 2002/09/08 17:06:54 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 )
 {
@@ -120,13 +104,15 @@ 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;
+               if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED;
        }
        
        /* an Ziel-Client forwarden ... */