extensions/helpops: implement DEHELPER command

[solanum.git] / ircd / chmode.c

diff --git a/ircd/chmode.c b/ircd/chmode.c
index dc7a3c98af5497cfce4d45b8e6eb645920a983e4..127494ee5bb25bf1e44eae3f2811d3cdced7753d 100644 (file)
--- a/ircd/chmode.c
+++ b/ircd/chmode.c
@@ -180,21 +180,18 @@ cflag_orphan(char c_)
 }
 
 int
-get_channel_access(struct Client *source_p, struct membership *msptr, int dir, const char *modestr)
+get_channel_access(struct Client *source_p, struct Channel *chptr, struct membership *msptr, int dir, const char *modestr)
 {
        hook_data_channel_approval moduledata;
 
        if(!MyClient(source_p))
                return CHFL_CHANOP;
 
-       if (msptr == NULL)
-               return CHFL_PEON;
-
        moduledata.client = source_p;
-       moduledata.chptr = msptr->chptr;
+       moduledata.chptr = chptr;
        moduledata.msptr = msptr;
        moduledata.target = NULL;
-       moduledata.approved = is_chanop(msptr) ? CHFL_CHANOP : CHFL_PEON;
+       moduledata.approved = (msptr != NULL && is_chanop(msptr)) ? CHFL_CHANOP : CHFL_PEON;
        moduledata.dir = dir;
        moduledata.modestr = modestr;
 
@@ -521,7 +518,7 @@ check_forward(struct Client *source_p, struct Channel *chptr,
        if(MyClient(source_p) && !(targptr->mode.mode & MODE_FREETARGET))
        {
                if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
-                       get_channel_access(source_p, msptr, MODE_QUERY, NULL) != CHFL_CHANOP)
+                       get_channel_access(source_p, targptr, msptr, MODE_QUERY, NULL) != CHFL_CHANOP)
                {
                        sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                                   me.name, source_p->name, targptr->chname);
@@ -692,11 +689,8 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
 
                mode_changes[mode_count].letter = c;
                mode_changes[mode_count].dir = MODE_ADD;
-               mode_changes[mode_count].caps = 0;
-               mode_changes[mode_count].nocaps = 0;
                mode_changes[mode_count].id = NULL;
                mode_changes[mode_count].mems = ONLY_OPERS;
-               mode_changes[mode_count].override = 0;
                mode_changes[mode_count++].arg = NULL;
        }
        else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
@@ -705,11 +699,8 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
 
                mode_changes[mode_count].letter = c;
                mode_changes[mode_count].dir = MODE_DEL;
-               mode_changes[mode_count].caps = 0;
-               mode_changes[mode_count].nocaps = 0;
                mode_changes[mode_count].mems = ONLY_OPERS;
                mode_changes[mode_count].id = NULL;
-               mode_changes[mode_count].override = 0;
                mode_changes[mode_count++].arg = NULL;
        }
 }
@@ -1711,7 +1702,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
        else
                fakesource_p = source_p;
 
-       alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
+       alevel = get_channel_access(source_p, chptr, msptr, dir, reconstruct_parv(parc, parv));
 
        for(; (c = *ml) != 0; ml++)
        {
@@ -1721,7 +1712,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                        dir = MODE_ADD;
                        if (!reauthorized)
                        {
-                               alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
+                               alevel = get_channel_access(source_p, chptr, msptr, dir, reconstruct_parv(parc, parv));
                                reauthorized = 1;
                        }
                        break;
@@ -1729,7 +1720,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                        dir = MODE_DEL;
                        if (!reauthorized)
                        {
-                               alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
+                               alevel = get_channel_access(source_p, chptr, msptr, dir, reconstruct_parv(parc, parv));
                                reauthorized = 1;
                        }
                        break;