mirror of
https://github.com/anope/anope.git
synced 2026-07-10 12:23:14 +02:00
Fix bug #1114. Fixed a bug in cs_clear caused by do_cmode() modifying params passed to it.
Also fixed some warnings in cs_xop. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2671 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+2
-2
@@ -186,7 +186,6 @@ int do_clear(User * u)
|
||||
struct c_userlist *cu, *next;
|
||||
|
||||
if (ircd->svsmode_ucmode) {
|
||||
av[0] = chan;
|
||||
anope_cmd_svsmode_chan(av[0], "-o", NULL);
|
||||
if (ircd->owner) {
|
||||
anope_cmd_svsmode_chan(av[0], ircd->ownerunset, NULL);
|
||||
@@ -207,6 +206,7 @@ int do_clear(User * u)
|
||||
snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
|
||||
ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
|
||||
|
||||
av[0] = chan;
|
||||
if (ircdcap->tsmode) {
|
||||
snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
|
||||
av[1] = buf;
|
||||
@@ -226,7 +226,6 @@ int do_clear(User * u)
|
||||
do_cmode(s_ChanServ, ac, av);
|
||||
}
|
||||
} else {
|
||||
av[0] = chan;
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
isop = chan_has_user_status(c, cu->user, CUS_OP);
|
||||
@@ -243,6 +242,7 @@ int do_clear(User * u)
|
||||
snprintf(tmp2, BUFSIZE, "%s %s %s", (isop ? GET_USER(cu->user) : ""),
|
||||
(isadmin ? GET_USER(cu->user) : ""), (isown ? GET_USER(cu->user) : ""));
|
||||
|
||||
av[0] = chan;
|
||||
if (ircdcap->tsmode) {
|
||||
snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
|
||||
av[1] = buf;
|
||||
|
||||
+3
-5
@@ -174,9 +174,10 @@ int do_vop(User * u)
|
||||
|
||||
int xop_del(User * u, ChannelInfo * ci, ChanAccess * access, int *perm, int uacc, int xlev)
|
||||
{
|
||||
char *nick;
|
||||
if (!access->in_use || !access->nc || access->level != xlev)
|
||||
return 0;
|
||||
char *nick = access->nc->display;
|
||||
nick = access->nc->display;
|
||||
if (!is_services_admin(u) && uacc <= access->level) {
|
||||
(*perm)++;
|
||||
return 0;
|
||||
@@ -339,7 +340,7 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
|
||||
}
|
||||
|
||||
} else if (stricmp(cmd, "DEL") == 0) {
|
||||
int deleted, a, b;
|
||||
int deleted;
|
||||
if (readonly) {
|
||||
notice_lang(s_ChanServ, u, xmsgs[1]);
|
||||
return MOD_CONT;
|
||||
@@ -439,9 +440,6 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
|
||||
if (!sent_header)
|
||||
notice_lang(s_ChanServ, u, xmsgs[7], chan);
|
||||
} else if (stricmp(cmd, "CLEAR") == 0) {
|
||||
uint16 j = 0;
|
||||
int a, b;
|
||||
|
||||
if (readonly) {
|
||||
notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
|
||||
return MOD_CONT;
|
||||
|
||||
Reference in New Issue
Block a user