Mac OS X: split up make targets

[ngircd-alex.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index edbbc38bee3412d0c336833f34393bebab5323c8..6e8851b64113b44c4b5dd7e47faf370dba0f6675 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -1,22 +1,23 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2009 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2011 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 management
  */
 
-
 #define __channel_c__
 
-
 #include "portab.h"
 
+/**
+ * @file
+ * Channel management
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -989,6 +990,7 @@ GLOBAL bool
 Channel_AddBan(CHANNEL *c, const char *mask )
 {
        struct list_head *h = Channel_GetListBans(c);
+       LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban");
        return Lists_Add(h, mask, false);
 }
 
@@ -997,6 +999,7 @@ GLOBAL bool
 Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
 {
        struct list_head *h = Channel_GetListInvites(c);
+       LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite");
        return Lists_Add(h, mask, onlyonce);
 }
 
@@ -1079,10 +1082,10 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
 
        if (!strchr(Chan->modes, 'k'))
                return true;
-       if (strcmp(Chan->key, Key) == 0)
-               return true;
        if (*Key == '\0')
                return false;
+       if (strcmp(Chan->key, Key) == 0)
+               return true;
 
        file_name = array_start(&Chan->keyfile);
        if (!file_name)
@@ -1117,6 +1120,64 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
 } /* Channel_CheckKey */
 
 
+/**
+ * Check wether a client is allowed to administer a channel or not.
+ *
+ * @param Chan         The channel to test.
+ * @param Client       The client from which the command has been received.
+ * @param Origin       The originator of the command (or NULL).
+ * @param OnChannel    Set to true if the originator is member of the channel.
+ * @param AdminOk      Set to true if the client is allowed to do
+ *                     administrative tasks on this channel.
+ * @param UseServerMode        Set to true if ngIRCd should emulate "server mode",
+ *                     that is send commands as if originating from a server
+ *                     and not the originator of the command.
+ */
+GLOBAL void
+Channel_CheckAdminRights(CHANNEL *Chan, CLIENT *Client, CLIENT *Origin,
+                        bool *OnChannel, bool *AdminOk, bool *UseServerMode)
+{
+       assert (Chan != NULL);
+       assert (Client != NULL);
+       assert (OnChannel != NULL);
+       assert (AdminOk != NULL);
+       assert (UseServerMode != NULL);
+
+       /* Use the client as origin, if no origin has been given (no prefix?) */
+       if (!Origin)
+               Origin = Client;
+
+       *OnChannel = false;
+       *AdminOk = false;
+       *UseServerMode = false;
+
+       if (Client_Type(Client) != CLIENT_USER
+           && Client_Type(Client) != CLIENT_SERVER
+           && Client_Type(Client) != CLIENT_SERVICE)
+               return;
+
+       /* Allow channel administration if the client is a server or service */
+       if (Client_Type(Client) != CLIENT_USER) {
+               *AdminOk = true;
+               return;
+       }
+
+       *OnChannel = Channel_IsMemberOf(Chan, Origin);
+
+       if (*OnChannel && strchr(Channel_UserModes(Chan, Origin), 'o')) {
+               /* User is a channel operator */
+               *AdminOk = true;
+       } else if (Conf_OperCanMode) {
+               /* IRC operators are allowed to administer channels as well */
+               if (Client_OperByMe(Origin)) {
+                       *AdminOk = true;
+                       if (Conf_OperServerMode)
+                               *UseServerMode = true;
+               }
+       }
+} /* Channel_CheckAdminRights */
+
+
 static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {