Evaluate initial channel modes

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index e879dcdd7368f694c2a7aa44bcf1bb9e78a7e087..b317ada41efb0b1fd645f776272f869da96c65d7 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.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
@@ -24,8 +24,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <strings.h>
+#include <time.h>
 
-#include "defines.h"
 #include "conn-func.h"
 
 #include "channel.h"
@@ -33,10 +33,11 @@
 #include "irc-write.h"
 #include "conf.h"
 #include "hash.h"
-#include "lists.h"
 #include "log.h"
 #include "messages.h"
 #include "match.h"
+#include "parse.h"
+#include "irc-mode.h"
 
 #define REMOVE_PART 0
 #define REMOVE_QUIT 1
@@ -94,8 +95,10 @@ GLOBAL void
 Channel_InitPredefined( void )
 {
        CHANNEL *new_chan;
+       REQUEST Req;
        const struct Conf_Channel *conf_chan;
-       const char *c;
+       char *c;
+       char modes[COMMAND_LEN], name[CHANNEL_NAME_LEN];
        size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan));
 
        conf_chan = array_start(&Conf_Channels);
@@ -135,9 +138,22 @@ Channel_InitPredefined( void )
                if (conf_chan->topic[0])
                        Channel_SetTopic(new_chan, NULL, conf_chan->topic);
 
-               c = conf_chan->modes;
-               while (*c)
-                       Channel_ModeAdd(new_chan, *c++);
+               /* Evaluate modes string with a fake request */
+               if(conf_chan->modes[0]) {
+                       strlcpy(modes, conf_chan->modes, sizeof(modes));
+                       strlcpy(name, conf_chan->name, sizeof(name));
+                       Log(LOG_DEBUG, "Evaluate \"MODE %s %s\".", name, modes);
+                       Req.argc = 0;
+                       Req.argv[Req.argc++] = name;
+                       Req.prefix = Client_ID(Client_ThisServer());
+                       Req.command = "MODE";
+                       c = strtok(modes, " ");
+                       while (c && Req.argc<15) {
+                               Req.argv[Req.argc++] = c;
+                               c = strtok(0, " ");
+                       }
+                       IRC_MODE(Client_ThisServer(), &Req);
+               }
 
                Channel_SetKey(new_chan, conf_chan->key);
                Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
@@ -353,14 +369,19 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
                    !Channel_UserHasMode(chan, Target, 'q') &&
                    !Channel_UserHasMode(chan, Target, 'a'))
                        can_kick = true;
-                       
-               /* Half Op can't kick owner | admin | op */ 
+
+               /* Half Op can't kick owner | admin | op */
                else if (Channel_UserHasMode(chan, Peer, 'h') &&
                    !Channel_UserHasMode(chan, Target, 'q') &&
                    !Channel_UserHasMode(chan, Target, 'a') &&
                    !Channel_UserHasMode(chan, Target, 'o'))
                        can_kick = true;
 
+               /* IRC operators & IRCd with OperCanMode enabled
+                * can kick anyways regardless of privilege */
+               else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode)
+                   can_kick = true;
+
                if(!can_kick) {
                        IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
                                           Client_ID(Origin), Name);
@@ -1040,7 +1061,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
        switch( Type )
        {
                case REMOVE_QUIT:
-                       /* QUIT: other servers have already been notified, 
+                       /* QUIT: other servers have already been notified,
                         * see Client_Destroy(); so only inform other clients
                         * in same channel. */
                        assert( InformServer == false );
@@ -1094,29 +1115,29 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 
 
 GLOBAL bool
-Channel_AddBan(CHANNEL *c, const char *mask )
+Channel_AddBan(CHANNEL *c, const char *mask, const char *who )
 {
        struct list_head *h = Channel_GetListBans(c);
        LogDebug("Adding \"%s\" to \"%s\" ban list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, false, NULL);
+       return Lists_Add(h, mask, time(NULL), who, false);
 }
 
 
 GLOBAL bool
-Channel_AddExcept(CHANNEL *c, const char *mask )
+Channel_AddExcept(CHANNEL *c, const char *mask, const char *who )
 {
        struct list_head *h = Channel_GetListExcepts(c);
        LogDebug("Adding \"%s\" to \"%s\" exception list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, false, NULL);
+       return Lists_Add(h, mask, time(NULL), who, false);
 }
 
 
 GLOBAL bool
-Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
+Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce, const char *who )
 {
        struct list_head *h = Channel_GetListInvites(c);
        LogDebug("Adding \"%s\" to \"%s\" invite list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, onlyonce, NULL);
+       return Lists_Add(h, mask, time(NULL), who, onlyonce);
 }
 
 
@@ -1133,7 +1154,9 @@ ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel,
        while (e) {
                if (!IRC_WriteStrClient(Client, msg, Client_ID(Client),
                                        Channel_Name(Channel),
-                                       Lists_GetMask(e)))
+                                       Lists_GetMask(e),
+                                       Lists_GetReason(e),
+                                       Lists_GetValidity(e)))
                        return DISCONNECTED;
                e = Lists_GetNext(e);
        }