]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-op.c
Move "ClientHost" and "ClientUserNick" to end of [Global] section
[ngircd-alex.git] / src / ngircd / irc-op.c
index 587c4c606b987c199098e3fd6e2d1ab2b4fcf8ac..5e36b02bef478ce9ac2a0d96e411deaf2e11c4cc 100644 (file)
@@ -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.15 2005/04/27 07:39:18 alex 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.15 2005/04/27 07:39:18 alex Exp $";
 
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -35,90 +34,187 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.15 2005/04/27 07:39:18 alex 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);
 
-       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] );
+       while (*itemList) {
+               if (*itemList == ',') {
+                       *itemList = '\0';
+                       channelCount++;
+               }
+               itemList++;
+       }
 
-       Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from ));
-       return CONNECTED;
-} /* IRC_KICK */       
+       itemList = Req->argv[1];
+       while (*itemList) {
+               if (*itemList == ',') {
+                       *itemList = '\0';
+                       nickCount++;
+               }
+               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);
+
+       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
-IRC_INVITE( CLIENT *Client, REQUEST *Req )
+IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
        CHANNEL *chan;
        CLIENT *target, *from;
+       const char *colon_if_necessary;
        bool remember = false;
 
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Wrong number of parameters? */
-       if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       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] );
+       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);
 
-       chan = Channel_Search( Req->argv[1] );
+       /* 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]);
 
-       if( chan )
-       {
+       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] );
+               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' ))
-               {
+               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 ));
+                       if (!strchr(Channel_UserModes(chan, from), 'o'))
+                               return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
+                                               Client_ID(from), Channel_Name(chan));
                        remember = true;
                }
 
                /* 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] );
+               if (Channel_IsMemberOf(chan, target))
+                       return IRC_WriteStrClient(from, ERR_USERONCHANNEL_MSG,
+                                       Client_ID(from), Req->argv[0], Req->argv[1]);
 
                /* If the target user is banned on that channel: remember invite */
-               if( Lists_CheckBanned( target, chan )) remember = true;
+               if (Lists_Check(Channel_GetListBans(chan), target))
+                       remember = true;
 
-               if( remember )
-               {
-                       /* We must memember this invite */
-                       if( ! Lists_AddInvited( Client_Mask( target ), chan, true)) return CONNECTED;
+               if (remember) {
+                       /* We must remember this invite */
+                       if (!Channel_AddInvite(chan, Client_Mask(target), true))
+                               return CONNECTED;
                }
        }
 
-       Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
-       
+       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 )
-       {
+       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;
+               if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG,
+                       Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
+                       return DISCONNECTED;
+
+               if (strchr(Client_Modes(target), 'a') &&
+                       !IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from),
+                                       Client_ID(target), Client_Away(target)))
+                               return DISCONNECTED;
        }
-       
        return CONNECTED;
 } /* IRC_INVITE */