- bei INVITE wurde im Antwort-Status-Code das falsche Prefix verschickt.

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

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index e5e66d81a7cebf15518e6632ab3cd5374a7daf33..83f8aad42f081aa19ba5226daaea5a9fea2376ab 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.1 2002/05/27 11:22:07 alex Exp $
+ * $Id: irc-op.c,v 1.7 2002/07/25 11:36:16 alex Exp $
  *
  * irc-op.c: Befehle zur Channel-Verwaltung
  */
@@ -20,12 +20,14 @@
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"
 #include "irc-write.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
@@ -37,15 +39,26 @@
 GLOBAL BOOLEAN
 IRC_KICK( CLIENT *Client, REQUEST *Req )
 {
+       CLIENT *target, *from;
+       
        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 );
+       /* Falsche Anzahl Parameter? */
+       if(( Req->argc < 2) || ( Req->argc > 3 )) 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 );
+       
+       /* Ziel-User suchen */
+       target = Client_Search( Req->argv[1] );
+       if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[1] );
+
+       Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from ));
        return CONNECTED;
 } /* IRC_KICK */       
 
@@ -69,15 +82,62 @@ IRC_BAN( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_INVITE( CLIENT *Client, REQUEST *Req )
 {
+       CHANNEL *chan;
+       CLIENT *target, *from;
+       BOOLEAN remember = FALSE;
+
        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 );
-
+       /* 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;
+               }
+
+               /* 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] );
+
+       }
+
+       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( 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;
+       }
+       
        return CONNECTED;
 } /* IRC_INVITE */