irc-cap.c: use irc-macros.h

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

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index f1ebc79236c5da35155c7a7b426596535969e57c..0297015a8758e9075b608a95e17502fe6e391540 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,19 +1,21 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 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
  * 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"
 
+/**
+ * @file
+ * Channel operator commands
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
@@ -21,7 +23,6 @@
 
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -32,20 +33,30 @@
 #include "exp.h"
 #include "irc-op.h"
 
+/* Local functions */
 
 static bool
-try_kick(CLIENT* from, const char *nick, const char *channel, const char *reason)
+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(target, from, channel, reason);
+       Channel_Kick(peer, target, from, channel, reason);
        return true;
 }
 
+/* Global functions */
 
+/**
+ * Handler for the IRC command "KICK".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_KICK(CLIENT *Client, REQUEST *Req)
 {
@@ -93,7 +104,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
        currentChannel = Req->argv[0];
        if (channelCount == 1) {
                while (nickCount > 0) {
-                       if (!try_kick(from, currentNick, currentChannel, reason))
+                       if (!try_kick(Client, from, currentNick,
+                                     currentChannel, reason))
                                return false;
 
                        while (*currentNick)
@@ -104,7 +116,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
                }
        } else if (channelCount == nickCount) {
                while (nickCount > 0) {
-                       if (!try_kick(from, currentNick, currentChannel, reason))
+                       if (!try_kick(Client, from, currentNick,
+                                     currentChannel, reason))
                                return false;
 
                        while (*currentNick)
@@ -124,7 +137,13 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
        return true;
 } /* IRC_KICK */
 
-
+/**
+ * Handler for the IRC command "INVITE".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
@@ -160,10 +179,18 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                if (!Channel_IsMemberOf(chan, from))
                        return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]);
 
+               /* Is the channel "invite-disallow"? */
+               if (strchr(Channel_Modes(chan), 'V'))
+                       return IRC_WriteStrClient(from, ERR_NOINVITE_MSG,
+                               Client_ID(from), Channel_Name(chan));
+
                /* Is the channel "invite-only"? */
                if (strchr(Channel_Modes(chan), 'i')) {
-                       /* Yes. The user must be channel operator! */
-                       if (!strchr(Channel_UserModes(chan, from), 'o'))
+                       /* Yes. The user must be channel owner/admin/operator/halfop! */
+                       if (!strchr(Channel_UserModes(chan, from), 'q') &&
+                           !strchr(Channel_UserModes(chan, from), 'a') &&
+                           !strchr(Channel_UserModes(chan, from), 'o') &&
+                           !strchr(Channel_UserModes(chan, from), 'h'))
                                return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(from), Channel_Name(chan));
                        remember = true;
@@ -185,8 +212,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                }
        }
 
-       LogDebug("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:
@@ -214,5 +241,4 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
        return CONNECTED;
 } /* IRC_INVITE */
 
-
 /* -eof- */