Added m_cycle and added it to all the appropriate locations.

[irc/rqf/shadowircd.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index 88f9d5186fc5e2cfc1d621b1447cf2fb67832bad..23491f7582443ec4276283bce1baf427407497db 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -42,7 +42,7 @@
 #include "s_newconf.h"
 #include "logger.h"
 #include "chmode.h"
-#include "irc_dictionary.h";
+#include "irc_dictionary.h"
 
 /* bitmasks for error returns, so we send once per call */
 #define SM_ERR_NOTS             0x00000001     /* No TS on channel */
@@ -91,7 +91,7 @@ construct_noparam_modes(void)
                        !(chmode_table[i].set_func == chm_throttle) &&
                         !(chmode_table[i].set_func == chm_key) &&
                         !(chmode_table[i].set_func == chm_limit) &&
-                       !(chmode_table[i].set_func == chm_owner) &&
+                       !(chmode_table[i].set_func == chm_admin) &&
                         !(chmode_table[i].set_func == chm_op) &&
                        !(chmode_table[i].set_func == chm_halfop) &&
                         !(chmode_table[i].set_func == chm_voice))
@@ -179,8 +179,8 @@ find_cflag_slot(void)
 static int
 get_channel_access(struct Client *source_p, struct membership *msptr)
 {
-       if(!MyClient(source_p) || is_owner(msptr))
-               return CHFL_OWNER;
+       if(!MyClient(source_p) || is_admin(msptr))
+               return CHFL_ADMIN;
        else if(is_chanop(msptr))
                return CHFL_CHANOP;
        else if(is_halfop(msptr))
@@ -505,7 +505,7 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
        struct Metadata *md;
        struct DictionaryIter iter;
        
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if (IsOverride(source_p))
                        override = 1;
@@ -543,15 +543,17 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
        }
        else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
        {
-               /* cleanup KICKNOREJOIN metadata on -J */
+               /* cleanup metadata when the related mode is removed */
                if(c == 'J')
                {
                        DICTIONARY_FOREACH(md, &iter, chptr->metadata)
                        {
-                               if(!strcmp(md->name, "KICKNOREJOIN"))  
+                               if(!strcmp(md->value, "KICKNOREJOIN"))  
                                        channel_metadata_delete(chptr, md->name, 0);
                        }
                }
+               if(c == 'K')
+                       channel_metadata_delete(chptr, "NOREPEAT", 0);
 
                chptr->mode.mode &= ~mode_type;
 
@@ -792,15 +794,17 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                *errors |= errorval;
 
                /* non-ops cant see +eI lists.. */
-               if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
+               if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
                                mode_type != CHFL_QUIET)
                {
                        if(IsOverride(source_p))
                        {
-                               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                               sendto_wallops_flags(UMODE_WALLOP, &me,
                                                "%s is overriding modes on %s: (%s list)",
-                                               get_oper_name(source_p), chptr->chname,
-                                               mode_type == CHFL_INVEX ? "invex" : "exempt");
+                                               get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+                               sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+                                               ":%s WALLOPS :%s is overriding modes on %s: (%s list)",
+                                               me.name, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
                        }
                        else
                        {
@@ -827,7 +831,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -915,16 +919,16 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
 }
 
 void
-chm_owner(struct Client *source_p, struct Channel *chptr,
+chm_admin(struct Client *source_p, struct Channel *chptr,
        int alevel, int parc, int *parn,
        const char **parv, int *errors, int dir, char c, long mode_type)
 {
        struct membership *mstptr;
-       const char *ownernick;
+       const char *adminnick;
        struct Client *targ_p;
        int override = 0;
 
-       if(!ConfigChannel.use_owner)
+       if(!ConfigChannel.use_admin)
        {
                if(*errors & SM_ERR_UNKNOWN)
                        return;
@@ -933,7 +937,7 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(alevel != CHFL_OWNER)
+       if(alevel != CHFL_ADMIN)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -941,8 +945,7 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
                {
 
                        if(!(*errors & SM_ERR_NOOPS))
-                               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                                               me.name, source_p->name, chptr->chname);
+                               sendto_one(source_p, ":%s 482 %s %s :You're not a channel administrator", me.name, source_p->name, chptr->chname);
                        *errors |= SM_ERR_NOOPS;
                        return;
                }
@@ -951,17 +954,17 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
        if((dir == MODE_QUERY) || (parc <= *parn))
                return;
 
-       ownernick = parv[(*parn)];
+       adminnick = parv[(*parn)];
        (*parn)++;
 
        /* empty nick */
-       if(EmptyString(ownernick))
+       if(EmptyString(adminnick))
        {
                sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
                return;
        }
 
-       if((targ_p = find_chasing(source_p, ownernick, NULL)) == NULL)
+       if((targ_p = find_chasing(source_p, adminnick, NULL)) == NULL)
        {
                return;
        }
@@ -972,7 +975,7 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
        {
                if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
                        sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
-                                          form_str(ERR_USERNOTINCHANNEL), ownernick, chptr->chname);
+                                          form_str(ERR_USERNOTINCHANNEL), adminnick, chptr->chname);
                *errors |= SM_ERR_NOTONCHANNEL;
                return;
        }
@@ -1002,7 +1005,7 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].override = override;
                mode_changes[mode_count++].client = targ_p;
 
-               mstptr->flags |= CHFL_OWNER;
+               mstptr->flags |= CHFL_ADMIN;
        }
        else
        {
@@ -1023,7 +1026,7 @@ chm_owner(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].override = override;
                mode_changes[mode_count++].client = targ_p;
 
-               mstptr->flags &= ~CHFL_OWNER;
+               mstptr->flags &= ~CHFL_ADMIN;
        }
 }
 
@@ -1037,7 +1040,7 @@ chm_op(struct Client *source_p, struct Channel *chptr,
        struct Client *targ_p;
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1150,7 +1153,7 @@ chm_halfop(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1254,7 +1257,7 @@ chm_voice(struct Client *source_p, struct Channel *chptr,
        struct Client *targ_p;
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1341,7 +1344,7 @@ chm_limit(struct Client *source_p, struct Channel *chptr,
        int limit;
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1408,7 +1411,7 @@ chm_throttle(struct Client *source_p, struct Channel *chptr,
        int joins = 0, timeslice = 0;
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1500,7 +1503,7 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
        }
 
 #ifndef FORWARD_OPERONLY
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1605,7 +1608,7 @@ chm_key(struct Client *source_p, struct Channel *chptr,
        char *key;
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1691,7 +1694,7 @@ chm_regonly(struct Client *source_p, struct Channel *chptr,
 {
        int override = 0;
 
-       if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
        {
                if(IsOverride(source_p))
                        override = 1;
@@ -1831,7 +1834,7 @@ struct ChannelMode chmode_table[256] =
   {chm_nosuch, 0 },
   {chm_nosuch, 0 },
   {chm_nosuch, 0 },
-  {chm_owner,  0 },                    /* a */
+  {chm_admin,  0 },                    /* a */
   {chm_ban,    CHFL_BAN },             /* b */
   {chm_simple, MODE_NOCOLOR },         /* c */
   {chm_nosuch, 0 },                    /* d */
@@ -2137,10 +2140,14 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                                                sendto_channel_local(flags, chptr, "%s%s %s",
                                                                     cmdbuf, modebuf, parabuf);
                                                if(override)
-                                                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                               {
+                                                       sendto_wallops_flags(UMODE_WALLOP, &me,
                                                                        "%s is overriding modes on %s: %s %s",
-                                                                       get_oper_name(source_p), chptr->chname,
-                                                                       modebuf, parabuf);
+                                                                       get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+                                                       sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+                                                                       ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+                                                                       me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+                                               }
                                        }
                                        else
                                                continue;
@@ -2180,10 +2187,14 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                        {
                                sendto_channel_local(flags, chptr, "%s%s %s", cmdbuf, modebuf, parabuf);
                                if(override)
-                                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                               {
+                                       sendto_wallops_flags(UMODE_WALLOP, &me,
                                                        "%s is overriding modes on %s: %s %s",
-                                                       get_oper_name(source_p), chptr->chname,
-                                                       modebuf, parabuf);
+                                                       get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+                                       sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+                                                       ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+                                                       me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+                               }
                        }
                }
                if(override)