Move "ClientHost" and "ClientUserNick" to end of [Global] section

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

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index bbedcf4caf9968a4ecfbc7a8291660741a73d02a..5e36b02bef478ce9ac2a0d96e411deaf2e11c4cc 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -7,14 +7,14 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Channel operator commands
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
+/**
+ * @file
+ * Channel operator commands
+ */
 
 #include "imp.h"
 #include <assert.h>
@@ -23,7 +23,6 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
 
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -35,28 +34,99 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
 #include "irc-op.h"
 
 
+static bool
+try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
+        const char *reason)
+{
+       CLIENT *target = Client_Search(nick);
+
+       if (!target)
+               return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick);
+
+       Channel_Kick(peer, target, from, channel, reason);
+       return true;
+}
+
+
 GLOBAL bool
-IRC_KICK( CLIENT *Client, REQUEST *Req )
+IRC_KICK(CLIENT *Client, REQUEST *Req)
 {
-       CLIENT *target, *from;
-       
+       CLIENT *from;
+       char *itemList = Req->argv[0];
+       const char* currentNick, *currentChannel, *reason;
+       unsigned int channelCount = 1;
+       unsigned int nickCount = 1;
+
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
-       if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       if ((Req->argc < 2) || (Req->argc > 3))
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                       Client_ID(Client), Req->command);
+
+       while (*itemList) {
+               if (*itemList == ',') {
+                       *itemList = '\0';
+                       channelCount++;
+               }
+               itemList++;
+       }
 
-       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] );
+       itemList = Req->argv[1];
+       while (*itemList) {
+               if (*itemList == ',') {
+                       *itemList = '\0';
+                       nickCount++;
+               }
+               itemList++;
+       }
 
-       Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from ));
-       return CONNECTED;
-} /* IRC_KICK */       
+       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);
+
+       reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from);
+       currentNick = Req->argv[1];
+       currentChannel = Req->argv[0];
+       if (channelCount == 1) {
+               while (nickCount > 0) {
+                       if (!try_kick(Client, from, currentNick,
+                                     currentChannel, reason))
+                               return false;
+
+                       while (*currentNick)
+                               currentNick++;
+
+                       currentNick++;
+                       nickCount--;
+               }
+       } else if (channelCount == nickCount) {
+               while (nickCount > 0) {
+                       if (!try_kick(Client, from, currentNick,
+                                     currentChannel, reason))
+                               return false;
+
+                       while (*currentNick)
+                               currentNick++;
+
+                       while (*currentChannel)
+                               currentChannel++;
+
+                       currentNick++;
+                       currentChannel++;
+                       nickCount--;
+               }
+       } else {
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                       Client_ID(Client), Req->command);
+       }
+       return true;
+} /* IRC_KICK */
 
 
 GLOBAL bool
@@ -64,6 +134,7 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
        CHANNEL *chan;
        CLIENT *target, *from;
+       const char *colon_if_necessary;
        bool remember = false;
 
        assert( Client != NULL );
@@ -120,13 +191,23 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
        LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
 
+
+       /*
+        * RFC 2812 says:
+        * 'There is no requirement that the channel [..] must exist or be a valid channel'
+        * The problem with this is that this allows the "channel" to contain spaces,
+        * in which case we must prefix its name with a colon to make it clear that
+        * it is only a single argument.
+        */
+       colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":"";
        /* Inform target client */
-       IRC_WriteStrClientPrefix(target, from, "INVITE %s %s", Req->argv[0], Req->argv[1]);
+       IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0],
+                                       colon_if_necessary, 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]))
+                       Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
                        return DISCONNECTED;
 
                if (strchr(Client_Modes(target), 'a') &&