Branch Merge

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

diff --git a/src/chmode.c b/src/chmode.c
index ecff7d9d770736b9100455b2bedcbc4c0855c09d..c2fd63cef00f212dee79036af704504afbc97638 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -74,12 +74,11 @@ int chmode_flags[256];
 
 /* OPTIMIZE ME! -- dwr */
 void
-construct_noparam_modes(void)
+construct_cflags_strings(void)
 {
        int i;
         char *ptr = cflagsbuf;
        char *ptr2 = cflagsmyinfo;
-        static int prev_chmode_flags[256];
         
         *ptr = '\0';
        *ptr2 = '\0';
@@ -91,7 +90,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))
@@ -103,22 +102,6 @@ construct_noparam_modes(void)
                        chmode_flags[i] = 0;
                }
                 
-               if (prev_chmode_flags[i] != 0 && prev_chmode_flags[i] != chmode_flags[i])
-               {
-                       if (chmode_flags[i] == 0)
-                       {
-                                chmode_table[i].set_func = chm_orphaned;
-                               sendto_realops_snomask(SNO_DEBUG, L_ALL, "Cmode +%c is now orphaned", i);
-                       }
-                       else
-                       {
-                               sendto_realops_snomask(SNO_DEBUG, L_ALL, "Orphaned cmode +%c is picked up by module", i);
-                       }
-                       chmode_flags[i] = prev_chmode_flags[i];
-               }
-               else
-                       prev_chmode_flags[i] = chmode_flags[i];
-                
                switch (chmode_flags[i])
                {
                    case MODE_EXLIMIT:
@@ -162,7 +145,7 @@ construct_noparam_modes(void)
  *                0 if no cflags are available
  * side effects - NONE
  */
-unsigned int
+static unsigned int
 find_cflag_slot(void)
 {
        unsigned int all_cflags = 0, my_cflag = 0, i;
@@ -176,11 +159,39 @@ find_cflag_slot(void)
        return my_cflag;
 }
 
+unsigned int
+cflag_add(char c_, ChannelModeFunc function)
+{
+       int c = (unsigned char)c_;
+
+       if (chmode_table[c].set_func != chm_nosuch &&
+                       chmode_table[c].set_func != chm_orphaned)
+               return 0;
+
+       if (chmode_table[c].set_func == chm_nosuch)
+               chmode_table[c].mode_type = find_cflag_slot();
+       if (chmode_table[c].mode_type == 0)
+               return 0;
+       chmode_table[c].set_func = function;
+       construct_cflags_strings();
+       return chmode_table[c].mode_type;
+}
+
+void
+cflag_orphan(char c_)
+{
+       int c = (unsigned char)c_;
+
+       s_assert(chmode_flags[c] != 0);
+       chmode_table[c].set_func = chm_orphaned;
+       construct_cflags_strings();
+}
+
 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 +516,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;
@@ -548,7 +559,7 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
                {
                        DICTIONARY_FOREACH(md, &iter, chptr->metadata)
                        {
-                               if(!strcmp(md->name, "KICKNOREJOIN"))  
+                               if(!strcmp(md->value, "KICKNOREJOIN"))  
                                        channel_metadata_delete(chptr, md->name, 0);
                        }
                }
@@ -660,6 +671,8 @@ chm_staff(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)
 {
+       int override = 0;
+
        if(!IsOper(source_p) && !IsServer(source_p))
        {
                if(!(*errors & SM_ERR_NOPRIVS))
@@ -676,6 +689,20 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
+       if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
+       {
+               if (IsOverride(source_p))
+                       override = 1;
+               else
+               {
+                       if(!(*errors & SM_ERR_NOOPS))
+                               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                                               me.name, source_p->name, chptr->chname);
+                       *errors |= SM_ERR_NOOPS;
+                       return;
+               }
+       }
+
        if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
                return;
 
@@ -690,7 +717,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].nocaps = 0;
                mode_changes[mode_count].id = NULL;
                mode_changes[mode_count].mems = ALL_MEMBERS;
-               mode_changes[mode_count].override = 0;
+               mode_changes[mode_count].override = override;
                mode_changes[mode_count++].arg = NULL;
        }
        else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
@@ -702,7 +729,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count].caps = 0;
                mode_changes[mode_count].nocaps = 0;
                mode_changes[mode_count].mems = ALL_MEMBERS;
-               mode_changes[mode_count].override = 0;
+               mode_changes[mode_count].override = override;
                mode_changes[mode_count].id = NULL;
                mode_changes[mode_count++].arg = NULL;
        }
@@ -775,8 +802,8 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
        case CHFL_QUIET:
                list = &chptr->quietlist;
                errorval = SM_ERR_RPL_Q;
-               rpl_list = RPL_BANLIST;
-               rpl_endlist = RPL_ENDOFBANLIST;
+               rpl_list = RPL_QUIETLIST;
+               rpl_endlist = RPL_ENDOFQUIETLIST;
                mems = ALL_MEMBERS;
                caps = 0;
                break;
@@ -794,15 +821,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
                        {
@@ -822,14 +851,11 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                                   me.name, source_p->name, chptr->chname,
                                   banptr->banstr, banptr->who, banptr->when);
                }
-               if (mode_type == CHFL_QUIET)
-                       sendto_one(source_p, ":%s %d %s %s :End of Channel Quiet List", me.name, rpl_endlist, source_p->name, chptr->chname);
-               else
-                       sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
+               sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
                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;
@@ -917,16 +943,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;
@@ -935,7 +961,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;
@@ -943,8 +969,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;
                }
@@ -953,17 +978,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;
        }
@@ -974,7 +999,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;
        }
@@ -1004,7 +1029,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
        {
@@ -1025,7 +1050,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;
        }
 }
 
@@ -1039,7 +1064,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;
@@ -1152,7 +1177,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;
@@ -1256,7 +1281,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;
@@ -1343,7 +1368,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;
@@ -1410,7 +1435,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;
@@ -1502,7 +1527,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;
@@ -1607,7 +1632,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;
@@ -1693,7 +1718,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;
@@ -1833,7 +1858,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 */
@@ -2139,10 +2164,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;
@@ -2182,10 +2211,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)