diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/cs_access.c | 8 | ||||
| -rw-r--r-- | src/core/cs_xop.c | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 1b5fe8d1d..ab83055d3 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -71,8 +71,9 @@ void myChanServHelp(User * u) } -static int access_del(User * u, ChanAccess * access, int *perm, int uacc) +static int access_del(User * u, ChannelInfo *ci, ChanAccess * access, int *perm, int uacc) { + char *nick = access->nc->display; if (!access->in_use) return 0; if (!is_services_admin(u) && uacc <= access->level) { @@ -81,6 +82,7 @@ static int access_del(User * u, ChanAccess * access, int *perm, int uacc) } access->nc = NULL; access->in_use = 0; + send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, nick); return 1; } @@ -93,7 +95,7 @@ static int access_del_callback(User * u, int num, va_list args) if (num < 1 || num > ci->accesscount) return 0; *last = num; - return access_del(u, &ci->access[num - 1], perm, uacc); + return access_del(u, ci, &ci->access[num - 1], perm, uacc); } @@ -405,6 +407,8 @@ int do_access(User * u) free(ci->access); ci->access = NULL; ci->accesscount = 0; + + send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick); notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name); alog("%s: %s!%s@%s (level %d) cleared access list on %s", diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 2efcf9d0a..339501c33 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -180,9 +180,9 @@ int xop_del(User * u, ChannelInfo * ci, ChanAccess * access, int *perm, int uacc (*perm)++; return 0; } - send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, access->nc->display); access->nc = NULL; access->in_use = 0; + send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, access->nc->display); return 1; } @@ -404,12 +404,12 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs) deleted = 0; notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else { - send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, - na->nick); notice_lang(s_ChanServ, u, xmsgs[8], access->nc->display, ci->name); access->nc = NULL; access->in_use = 0; + send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, + na->nick); deleted = 1; } } @@ -498,6 +498,8 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs) } } + send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick); + notice_lang(s_ChanServ, u, xmsgs[13], ci->name); } else { syntax_error(s_ChanServ, u, xname, xmsgs[0]); |