Update copyright notices of recently changed files

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

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 0d471512f6e024581e530344c108751bdbe96332..82a78ebf7d712675497a3f5314514aa420620b6f 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,12 +16,9 @@
  * Channel operator commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-macros.h"
@@ -31,9 +28,6 @@
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
-#include "irc-op.h"
-
 /* Local functions */
 
 static bool
@@ -43,7 +37,8 @@ try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
        CLIENT *target = Client_Search(nick);
 
        if (!target)
-               return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick);
+               return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+                                         Client_ID(from), nick);
 
        Channel_Kick(peer, target, from, channel, reason);
        return true;
@@ -70,7 +65,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        while (*itemList) {
@@ -122,7 +116,7 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
                        nickCount--;
                }
        } else {
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+               return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Client), Req->command);
        }
        return true;
@@ -146,42 +140,48 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        /* 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]);
+               return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+                                         Client_ID(Client), Req->argv[0]);
 
        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]);
+                       return IRC_WriteErrClient(from, ERR_NOTONCHANNEL_MSG,
+                                                 Client_ID(Client),
+                                                 Req->argv[1]);
 
                /* Is the channel "invite-disallow"? */
                if (Channel_HasMode(chan, 'V'))
-                       return IRC_WriteStrClient(from, ERR_NOINVITE_MSG,
-                               Client_ID(from), Channel_Name(chan));
+                       return IRC_WriteErrClient(from, ERR_NOINVITE_MSG,
+                                                 Client_ID(from),
+                                                 Channel_Name(chan));
 
                /* Is the channel "invite-only"? */
                if (Channel_HasMode(chan, 'i')) {
-                       /* Yes. The user must be channel owner/admin/operator/halfop! */
+                       /* Yes. The user issuing the INVITE command must be
+                        * channel owner/admin/operator/halfop! */
                        if (!Channel_UserHasMode(chan, from, 'q') &&
                            !Channel_UserHasMode(chan, from, 'a') &&
                            !Channel_UserHasMode(chan, from, 'o') &&
                            !Channel_UserHasMode(chan, from, 'h'))
-                               return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
-                                               Client_ID(from), Channel_Name(chan));
+                               return IRC_WriteErrClient(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]);
+                       return IRC_WriteErrClient(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_Check(Channel_GetListBans(chan), target))
@@ -189,7 +189,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
                if (remember) {
                        /* We must remember this invite */
-                       if (!Channel_AddInvite(chan, Client_Mask(target), true))
+                       if (!Channel_AddInvite(chan, Client_MaskCloaked(target),
+                                               true))
                                return CONNECTED;
                }
        }
@@ -198,21 +199,22 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                 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.
+        * RFC 2812 states:
+        * '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%s", Req->argv[0],
-                                       colon_if_necessary, Req->argv[1]);
+                                 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], colon_if_necessary, Req->argv[1]))
+                                              Client_ID(from), Req->argv[0],
+                                              colon_if_necessary, Req->argv[1]))
                        return DISCONNECTED;
 
                if (Client_HasMode(target, 'a') &&