pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 17:16:38 +02:00
Code Activity

Guest nicks, MODE.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1301 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-10-02 08:29:56 +00:00
parent c8d4ff56a1
commit 5d695b7bf6
45 changed files with 162 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+2 -2
View File
@@ -1127,14 +1127,14 @@ E void anope_cmd_global(const char *source, const char *fmt, ...);
E void anope_cmd_invite(const char *source, const char *chan, const char *nick); /* INVITE */
E void anope_cmd_join(const char *user, const char *channel, time_t chantime); /* JOIN */
E void anope_cmd_kick(const char *source, const char *chan, const char *user, const char *fmt, ...); /* KICK */
E void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...); /* MODE */
E void anope_SendMode(const char *source, const char *dest, const char *fmt, ...); /* MODE */
E void anope_cmd_tmode(const char *source, const char *dest, const char *fmt, ...); /* TMODE */
E void anope_cmd_unban(const char *name, const char *nick); /* MODE -b */
E void anope_cmd_bot_chan_mode(const char *nick, const char *chan); /* MODE BotServ */
E void anope_cmd_netinfo(int ac, const char **av); /* NETINFO */
E void anope_cmd_chg_nick(const char *oldnick, const char *newnick); /* NICK */
E void anope_cmd_bot_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
E void anope_cmd_guest_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
E void anope_SendGuestNick(const char *nick, const char *user,const char *host,const char *real,const char *modes); /* NICK */
E void anope_cmd_message(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */
E void anope_cmd_notice_ops(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */
E void anope_cmd_notice(const char *source, const char *dest, const char *msg); /* NOTICE */
include/services.h
+2 -2
View File
@@ -1238,8 +1238,8 @@ class IRCDProto {
virtual void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
virtual void SendSVSKill(const char *, const char *, const char *) = 0;
virtual void SendSVSMode(User *, int, const char **) = 0;
virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
virtual void cmd_mode(const char *, const char *, const char *) = 0;
virtual void SendGuestNick(const char *, const char *, const char *, const char *, const char *) { }
virtual void SendMode(const char *, const char *, const char *) = 0;
virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0;
virtual void cmd_kick(const char *, const char *, const char *, const char *) = 0;
virtual void cmd_notice_ops(const char *, const char *, const char *) = 0;
src/actions.c
+1 -1
View File
@@ -182,7 +182,7 @@ void common_unban(ChannelInfo * ci, char *nick)
next = ban->next;
if (entry_match(ban, u->nick, u->username, u->host, ip) ||
entry_match(ban, u->nick, u->username, u->vhost, ip)) {
anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
anope_SendMode(whosends(ci), ci->name, "-b %s", ban->mask);
if (ircdcap->tsmode)
av[3] = ban->mask;
else
src/botserv.c
+5 -5
View File
@@ -731,7 +731,7 @@ void bot_join(ChannelInfo * ci)
next = ban->next;
if (entry_match
(ban, ci->bi->nick, ci->bi->user, ci->bi->host, 0)) {
anope_cmd_mode(whosends(ci), ci->name, "-b %s",
anope_SendMode(whosends(ci), ci->name, "-b %s",
ban->mask);
if (ircdcap->tsmode)
av[3] = ban->mask;
@@ -792,7 +792,7 @@ static void check_ban(ChannelInfo * ci, User * u, int ttbtype)
ac = 3;
}
anope_cmd_mode(ci->bi->nick, ci->name, "+b %s", mask);
anope_SendMode(ci->bi->nick, ci->name, "+b %s", mask);
do_cmode(ci->bi->nick, ac, av);
send_event(EVENT_BOT_BAN, 3, u->nick, ci->name, mask);
}
@@ -880,7 +880,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
ac = 3;
}
anope_cmd_mode(ci->bi->nick, ci->name, "+b %s", mask);
anope_SendMode(ci->bi->nick, ci->name, "+b %s", mask);
do_cmode(ci->bi->nick, ac, av);
kav[0] = ci->name;
@@ -993,13 +993,13 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode,
av[2] = mode;
av[3] = nick;
ac = 4;
anope_cmd_mode(ci->bi->nick, av[0], "%s %s", av[2], av[3]);
anope_SendMode(ci->bi->nick, av[0], "%s %s", av[2], av[3]);
} else {
av[0] = ci->name;
av[1] = mode;
av[2] = nick;
ac = 3;
anope_cmd_mode(ci->bi->nick, av[0], "%s %s", av[1], av[2]);
anope_SendMode(ci->bi->nick, av[0], "%s %s", av[1], av[2]);
}
do_cmode(ci->bi->nick, ac, av);
src/channels.c
+5 -5
View File
@@ -190,7 +190,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av,
}
/* Set the resulting mode buffer */
anope_cmd_mode(whosends(chan->ci), chan->name, merge_args(ac, av));
anope_SendMode(whosends(chan->ci), chan->name, merge_args(ac, av));
return;
}
@@ -225,7 +225,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av,
if ((cum->flags & CUF_PROTECT_BOTSERV) && !add) {
if ((bi = findbot(*av))) {
if (!botmode || botmode != mode) {
anope_cmd_mode(bi->nick, chan->name, "+%c %s",
anope_SendMode(bi->nick, chan->name, "+%c %s",
mode, bi->nick);
botmode = mode;
continue;
@@ -1285,7 +1285,7 @@ void add_ban(Channel * chan, const char *mask)
BotInfo *bi = chan->ci->bi;
if (entry_match(ban, bi->nick, bi->user, bi->host, 0)) {
anope_cmd_mode(bi->nick, chan->name, "-b %s", mask);
anope_SendMode(bi->nick, chan->name, "-b %s", mask);
entry_delete(chan->bans, ban);
return;
}
@@ -1508,7 +1508,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
if (!add_modes && !rem_modes)
return;
anope_cmd_mode(whosends(ci), c->name, "%s%s", modebuf, userbuf);
anope_SendMode(whosends(ci), c->name, "%s%s", modebuf, userbuf);
if (add_modes > 0)
chan_set_user_status(c, user, add_modes);
if (rem_modes > 0)
@@ -1883,7 +1883,7 @@ void do_mass_mode(char *modes)
free(myModes);
return;
} else {
anope_cmd_mode(s_OperServ, c->name, "%s", modes);
anope_SendMode(s_OperServ, c->name, "%s", modes);
chan_set_modes(s_OperServ, c, ac, av, 1);
}
}
src/chanserv.c
+26 -26
View File
@@ -896,7 +896,7 @@ void check_modes(Channel * c)
if (ircd->regmode) {
if (c->mode & ircd->regmode) {
c->mode &= ~ircd->regmode;
anope_cmd_mode(whosends(ci), c->name, "-r");
anope_SendMode(whosends(ci), c->name, "-r");
}
}
return;
@@ -1005,7 +1005,7 @@ void check_modes(Channel * c)
*end = 0;
*end2 = 0;
anope_cmd_mode(whosends(ci), c->name, "%s%s", modebuf,
anope_SendMode(whosends(ci), c->name, "%s%s", modebuf,
(end2 == argbuf ? "" : argbuf));
}
@@ -1026,13 +1026,13 @@ int check_valid_admin(User * user, Channel * chan, int servermode)
if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT)) {
notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ);
anope_cmd_mode(whosends(chan->ci), chan->name, "%s %s",
anope_SendMode(whosends(chan->ci), chan->name, "%s %s",
ircd->adminunset, user->nick);
return 0;
}
if (check_access(user, chan->ci, CA_AUTODEOP)) {
anope_cmd_mode(whosends(chan->ci), chan->name, "%s %s",
anope_SendMode(whosends(chan->ci), chan->name, "%s %s",
ircd->adminunset, user->nick);
return 0;
}
@@ -1062,14 +1062,14 @@ int check_valid_op(User * user, Channel * chan, int servermode)
if (ircd->owner && ircd->protect) {
if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
tmp = stripModePrefix(ircd->ownerunset);
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"%so%s %s %s %s", ircd->adminunset,
tmp, user->nick,
user->nick, user->nick);
free(tmp);
} else {
tmp = stripModePrefix(ircd->ownerunset);
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"%sho%s %s %s %s %s",
ircd->adminunset, tmp,
user->nick, user->nick, user->nick,
@@ -1078,25 +1078,25 @@ int check_valid_op(User * user, Channel * chan, int servermode)
}
} else if (!ircd->owner && ircd->protect) {
if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"%so %s %s", ircd->adminunset,
user->nick, user->nick);
} else {
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"%soh %s %s %s", ircd->adminunset,
user->nick, user->nick, user->nick);
}
} else {
if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
user->nick);
} else {
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"-ho %s %s", user->nick, user->nick);
}
}
} else {
anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
user->nick);
}
return 0;
@@ -1106,17 +1106,17 @@ int check_valid_op(User * user, Channel * chan, int servermode)
if (ircd->halfop) {
if (ircd->owner && ircd->protect) {
tmp = stripModePrefix(ircd->ownerunset);
anope_cmd_mode(whosends(chan->ci), chan->name,
anope_SendMode(whosends(chan->ci), chan->name,
"%sho%s %s %s %s %s", ircd->adminunset,
tmp, user->nick, user->nick,
user->nick, user->nick);
free(tmp);
} else {
anope_cmd_mode(whosends(chan->ci), chan->name, "-ho %s %s",
anope_SendMode(whosends(chan->ci), chan->name, "-ho %s %s",
user->nick, user->nick);
}
} else {
anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
user->nick);
}
return 0;
@@ -1142,7 +1142,7 @@ int check_should_op(User * user, char *chan)
return 0;
if (check_access(user, ci, CA_AUTOOP)) {
anope_cmd_mode(whosends(ci), chan, "+o %s", user->nick);
anope_SendMode(whosends(ci), chan, "+o %s", user->nick);
return 1;
}
@@ -1165,7 +1165,7 @@ int check_should_voice(User * user, char *chan)
return 0;
if (check_access(user, ci, CA_AUTOVOICE)) {
anope_cmd_mode(whosends(ci), chan, "+v %s", user->nick);
anope_SendMode(whosends(ci), chan, "+v %s", user->nick);
return 1;
}
@@ -1182,7 +1182,7 @@ int check_should_halfop(User * user, char *chan)
return 0;
if (check_access(user, ci, CA_AUTOHALFOP)) {
anope_cmd_mode(whosends(ci), chan, "+h %s", user->nick);
anope_SendMode(whosends(ci), chan, "+h %s", user->nick);
return 1;
}
@@ -1202,7 +1202,7 @@ int check_should_owner(User * user, char *chan)
if (((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
|| (!(ci->flags & CI_SECUREFOUNDER) && is_founder(user, ci))) {
tmp = stripModePrefix(ircd->ownerset);
anope_cmd_mode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
anope_SendMode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
user->nick);
free(tmp);
return 1;
@@ -1223,7 +1223,7 @@ int check_should_protect(User * user, char *chan)
if (check_access(user, ci, CA_AUTOPROTECT)) {
tmp = stripModePrefix(ircd->adminset);
anope_cmd_mode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
anope_SendMode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
user->nick);
free(tmp);
return 1;
@@ -1356,7 +1356,7 @@ int check_kick(User * user, const char *chan, time_t chants)
/* Lets hide the channel from /list just incase someone does /list
* while we are here. - katsklaw
*/
anope_cmd_mode(s_ChanServ, chan, "+ntsi");
anope_SendMode(s_ChanServ, chan, "+ntsi");
t = add_timeout(CSInhabit, timeout_leave, 0);
t->data = sstrdup(chan);
ci->flags |= CI_INHABIT;
@@ -1380,7 +1380,7 @@ int check_kick(User * user, const char *chan, time_t chants)
do_cmode(whosends(ci), ac, av);
}
anope_cmd_mode(whosends(ci), chan, "+b %s", mask);
anope_SendMode(whosends(ci), chan, "+b %s", mask);
anope_cmd_kick(whosends(ci), chan, user->nick, "%s", reason);
return 1;
@@ -1449,7 +1449,7 @@ void restore_topic(const char *chan)
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
anope_cmd_join(s_ChanServ, chan, c->creation_time);
anope_cmd_mode(NULL, chan, "+o %s", s_ChanServ);
anope_SendMode(NULL, chan, "+o %s", s_ChanServ);
}
}
anope_cmd_topic(whosends(ci), c->name, c->topic_setter,
@@ -1511,7 +1511,7 @@ int check_topiclock(Channel * c, time_t topic_time)
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
anope_cmd_join(s_ChanServ, c->name, c->creation_time);
anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
}
}
@@ -1589,7 +1589,7 @@ void cs_remove_nick(const NickCore * nc)
/* Maybe move this to delchan() ? */
if ((ci->c) && (ci->c->mode & ircd->regmode)) {
ci->c->mode &= ~ircd->regmode;
anope_cmd_mode(whosends(ci), ci->name, "-r");
anope_SendMode(whosends(ci), ci->name, "-r");
}
}
@@ -2343,7 +2343,7 @@ void stick_mask(ChannelInfo * ci, AutoKick * akick)
/* Falling there means set the ban */
av[0] = "+b";
av[1] = akick->u.mask;
anope_cmd_mode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
anope_SendMode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
chan_set_modes(s_ChanServ, ci->c, 2, av, 1);
}
@@ -2366,7 +2366,7 @@ void stick_all(ChannelInfo * ci)
av[0] = "+b";
av[1] = akick->u.mask;
anope_cmd_mode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
anope_SendMode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
chan_set_modes(s_ChanServ, ci->c, 2, av, 1);
}
}
src/core/cs_ban.c
+2 -2
View File
@@ -118,7 +118,7 @@ int do_ban(User * u)
av[0] = "+b";
get_idealban(ci, u, mask, sizeof(mask));
av[1] = mask;
anope_cmd_mode(whosends(ci), uc->chan->name, "+b %s",
anope_SendMode(whosends(ci), uc->chan->name, "+b %s",
av[1]);
chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
@@ -175,7 +175,7 @@ int do_ban(User * u)
av[0] = "+b";
get_idealban(ci, u2, mask, sizeof(mask));
av[1] = mask;
anope_cmd_mode(whosends(ci), c->name, "+b %s", av[1]);
anope_SendMode(whosends(ci), c->name, "+b %s", av[1]);
chan_set_modes(s_ChanServ, c, 2, av, 1);
/* We still allow host banning while not allowing to kick */
src/core/cs_clear.c
+13 -13
View File
@@ -91,7 +91,7 @@ int do_clear(User * u)
next = ban->next;
av[0] = "-b";
av[1] = ban->mask;
anope_cmd_mode(whosends(ci), chan, "-b %s", ban->mask);
anope_SendMode(whosends(ci), chan, "-b %s", ban->mask);
chan_set_modes(whosends(ci), c, 2, av, 0);
}
}
@@ -106,7 +106,7 @@ int do_clear(User * u)
next = except->next;
av[0] = "-e";
av[1] = except->mask;
anope_cmd_mode(whosends(ci), chan, "-e %s", except->mask);
anope_SendMode(whosends(ci), chan, "-e %s", except->mask);
chan_set_modes(whosends(ci), c, 2, av, 0);
}
}
@@ -121,7 +121,7 @@ int do_clear(User * u)
next = invite->next;
av[0] = "-I";
av[1] = invite->mask;
anope_cmd_mode(whosends(ci), chan, "-I %s", invite->mask);
anope_SendMode(whosends(ci), chan, "-I %s", invite->mask);
chan_set_modes(whosends(ci), c, 2, av, 0);
}
}
@@ -132,7 +132,7 @@ int do_clear(User * u)
if (c->mode) {
/* Clear modes the bulk of the modes */
anope_cmd_mode(whosends(ci), c->name, "%s",
anope_SendMode(whosends(ci), c->name, "%s",
ircd->modestoremove);
argv[0] = ircd->modestoremove;
chan_set_modes(whosends(ci), c, 1, argv, 0);
@@ -140,13 +140,13 @@ int do_clear(User * u)
/* to prevent the internals from complaining send -k, -L, -f by themselves if we need
to send them - TSL */
if (c->key) {
anope_cmd_mode(whosends(ci), c->name, "-k %s", c->key);
anope_SendMode(whosends(ci), c->name, "-k %s", c->key);
argv[0] = "-k";
argv[1] = c->key;
chan_set_modes(whosends(ci), c, 2, argv, 0);
}
if (ircd->Lmode && c->redirect) {
anope_cmd_mode(whosends(ci), c->name, "-L %s",
anope_SendMode(whosends(ci), c->name, "-L %s",
c->redirect);
argv[0] = "-L";
argv[1] = c->redirect;
@@ -154,7 +154,7 @@ int do_clear(User * u)
}
if (ircd->fmode && c->flood) {
if (flood_mode_char_remove) {
anope_cmd_mode(whosends(ci), c->name, "%s %s",
anope_SendMode(whosends(ci), c->name, "%s %s",
flood_mode_char_remove, c->flood);
argv[0] = flood_mode_char_remove;
argv[1] = c->flood;
@@ -242,7 +242,7 @@ int do_clear(User * u)
av[i+3] = cu->user->nick;
ac = 3 + i;
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2], tmp2);
anope_SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2);
} else {
av[1] = tmp;
/* We have to give as much nicks as modes.. - Viper */
@@ -250,7 +250,7 @@ int do_clear(User * u)
av[i+2] = cu->user->nick;
ac = 2 + i;
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1], tmp2);
anope_SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2);
}
do_cmode(s_ChanServ, ac, av);
@@ -292,10 +292,10 @@ int do_clear(User * u)
break;
} else {
if (ircdcap->tsmode)
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2],
anope_SendMode(whosends(ci), av[0], "%s %s", av[2],
av[3]);
else
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1],
anope_SendMode(whosends(ci), av[0], "%s %s", av[1],
av[2]);
}
do_cmode(s_ChanServ, ac, av);
@@ -336,10 +336,10 @@ int do_clear(User * u)
break;
} else {
if (ircdcap->tsmode) {
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2],
anope_SendMode(whosends(ci), av[0], "%s %s", av[2],
av[3]);
} else {
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1],
anope_SendMode(whosends(ci), av[0], "%s %s", av[1],
av[2]);
}
}
src/core/cs_drop.c
+1 -1
View File
@@ -99,7 +99,7 @@ int do_drop(User * u)
if (ci->c) {
if (ircd->regmode) {
ci->c->mode &= ~ircd->regmode;
anope_cmd_mode(whosends(ci), ci->name, "-r");
anope_SendMode(whosends(ci), ci->name, "-r");
}
}
src/core/cs_modes.c
+6 -6
View File
@@ -227,7 +227,7 @@ int do_owner(User * u)
for (uc = u->chans; uc; uc = uc->next) {
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& is_founder(u, ci)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
av[0], u->nick);
chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
}
@@ -247,7 +247,7 @@ int do_owner(User * u)
} else if (!is_founder(u, ci)) {
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerset,
anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset,
u->nick);
av[0] = ircd->ownerset;
@@ -281,7 +281,7 @@ int do_deowner(User * u)
for (uc = u->chans; uc; uc = uc->next) {
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& is_founder(u, ci)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
av[0], u->nick);
chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
}
@@ -301,7 +301,7 @@ int do_deowner(User * u)
} else if (!is_founder(u, ci)) {
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
u->nick);
av[0] = ircd->ownerunset;
@@ -336,7 +336,7 @@ int do_util(User * u, CSModeUtil * util)
for (uc = u->chans; uc; uc = uc->next) {
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& check_access(u, ci, util->levelself)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
util->mode, u->nick);
chan_set_modes(s_ChanServ, uc->chan, 2, av, 2);
@@ -373,7 +373,7 @@ int do_util(User * u, CSModeUtil * util)
} else if (*util->mode == '-' && is_protected(u2) && !is_same) {
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", util->mode,
anope_SendMode(whosends(ci), c->name, "%s %s", util->mode,
u2->nick);
av[0] = util->mode;
src/core/cs_register.c
+2 -2
View File
@@ -179,11 +179,11 @@ int do_register(User * u)
check_modes(c);
/* On most ircds you do not receive the admin/owner mode till its registered */
if (ircd->admin) {
anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->adminset,
anope_SendMode(s_ChanServ, chan, "%s %s", ircd->adminset,
u->nick);
}
if (ircd->owner && ircd->ownerset) {
anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->ownerset,
anope_SendMode(s_ChanServ, chan, "%s %s", ircd->ownerset,
u->nick);
}
send_event(EVENT_CHAN_REGISTERED, 1, chan);
src/core/cs_topic.c
+1 -1
View File
@@ -104,7 +104,7 @@ int do_cs_topic(User * u)
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
anope_cmd_join(s_ChanServ, c->name, c->creation_time);
anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
}
}
anope_cmd_topic(whosends(ci), c->name, u->nick, topic ? topic : "",
src/core/os_clearmodes.c
+12 -12
View File
@@ -122,7 +122,7 @@ int do_clearmodes(User * u)
continue;
argv[0] = "-o";
argv[1] = cu->user->nick;
anope_cmd_mode(s_OperServ, c->name, "-o %s",
anope_SendMode(s_OperServ, c->name, "-o %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
@@ -147,7 +147,7 @@ int do_clearmodes(User * u)
continue;
argv[0] = "-v";
argv[1] = cu->user->nick;
anope_cmd_mode(s_OperServ, c->name, "-v %s",
anope_SendMode(s_OperServ, c->name, "-v %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
@@ -172,7 +172,7 @@ int do_clearmodes(User * u)
continue;
argv[0] = "-h";
argv[1] = cu->user->nick;
anope_cmd_mode(s_OperServ, c->name, "-h %s",
anope_SendMode(s_OperServ, c->name, "-h %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
@@ -196,7 +196,7 @@ int do_clearmodes(User * u)
continue;
argv[0] = ircd->ownerunset;
argv[1] = cu->user->nick;
anope_cmd_mode(s_OperServ, c->name, "%s %s",
anope_SendMode(s_OperServ, c->name, "%s %s",
ircd->ownerunset, cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
@@ -221,7 +221,7 @@ int do_clearmodes(User * u)
continue;
argv[0] = ircd->adminunset;
argv[1] = cu->user->nick;
anope_cmd_mode(s_OperServ, c->name, "%s %s",
anope_SendMode(s_OperServ, c->name, "%s %s",
ircd->adminunset, cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
@@ -232,27 +232,27 @@ int do_clearmodes(User * u)
if (c->mode) {
/* Clear modes the bulk of the modes */
anope_cmd_mode(s_OperServ, c->name, "%s", ircd->modestoremove);
anope_SendMode(s_OperServ, c->name, "%s", ircd->modestoremove);
argv[0] = ircd->modestoremove;
chan_set_modes(s_OperServ, c, 1, argv, 0);
/* to prevent the internals from complaining send -k, -L, -f by themselves if we need
to send them - TSL */
if (c->key) {
anope_cmd_mode(s_OperServ, c->name, "-k %s", c->key);
anope_SendMode(s_OperServ, c->name, "-k %s", c->key);
argv[0] = "-k";
argv[1] = c->key;
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
if (ircd->Lmode && c->redirect) {
anope_cmd_mode(s_OperServ, c->name, "-L %s", c->redirect);
anope_SendMode(s_OperServ, c->name, "-L %s", c->redirect);
argv[0] = "-L";
argv[1] = c->redirect;
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
if (ircd->fmode && c->flood) {
if (flood_mode_char_remove) {
anope_cmd_mode(s_OperServ, c->name, "%s %s",
anope_SendMode(s_OperServ, c->name, "%s %s",
flood_mode_char_remove, c->flood);
argv[0] = flood_mode_char_remove;
argv[1] = c->flood;
@@ -271,7 +271,7 @@ int do_clearmodes(User * u)
nexte = entry->next;
argv[0] = "-b";
argv[1] = entry->mask;
anope_cmd_mode(s_OperServ, c->name, "-b %s", entry->mask);
anope_SendMode(s_OperServ, c->name, "-b %s", entry->mask);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
}
@@ -282,7 +282,7 @@ int do_clearmodes(User * u)
nexte = entry->next;
argv[0] = "-e";
argv[1] = entry->mask;
anope_cmd_mode(s_OperServ, c->name, "-e %s", entry->mask);
anope_SendMode(s_OperServ, c->name, "-e %s", entry->mask);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
}
@@ -293,7 +293,7 @@ int do_clearmodes(User * u)
nexte = entry->next;
argv[0] = "-I";
argv[1] = entry->mask;
anope_cmd_mode(s_OperServ, c->name, "-I %s", entry->mask);
anope_SendMode(s_OperServ, c->name, "-I %s", entry->mask);
chan_set_modes(s_OperServ, c, 2, argv, 0);
}
}
src/core/os_mode.c
+1 -1
View File
@@ -88,7 +88,7 @@ int do_os_mode(User * u)
notice_lang(s_OperServ, u, PERMISSION_DENIED);
return MOD_CONT;
} else {
anope_cmd_mode(s_OperServ, chan, "%s", modes);
anope_SendMode(s_OperServ, chan, "%s", modes);
ac = split_buf(modes, &av, 1);
chan_set_modes(s_OperServ, c, ac, av, -1);
src/core/os_oline.c
+1 -1
View File
@@ -90,7 +90,7 @@ int do_operoline(User * u)
notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
} else if (u2 && flags[0] == '+') {
anope_cmd_svso(s_OperServ, nick, flags);
anope_cmd_mode(s_OperServ, nick, "+o");
anope_SendMode(s_OperServ, nick, "+o");
common_svsmode(u2, "+o", NULL);
notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP);
notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
src/core/os_umode.c
+1 -1
View File
@@ -101,7 +101,7 @@ int do_operumodes(User * u)
if (!(u2 = finduser(nick))) {
notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
} else {
anope_cmd_mode(s_OperServ, nick, "%s", modes);
anope_SendMode(s_OperServ, nick, "%s", modes);
common_svsmode(u2, modes, NULL);
src/ircd.c
+4 -4
View File
@@ -85,12 +85,12 @@ void anope_SendSVSMode(User *u, int ac, const char **av)
ircdproto->SendSVSMode(u, ac, av);
}
void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
void anope_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
ircdproto->cmd_guest_nick(nick, user, host, real, modes);
ircdproto->SendGuestNick(nick, user, host, real, modes);
}
void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...)
void anope_SendMode(const char *source, const char *dest, const char *fmt, ...)
{
va_list args;
char buf[BUFSIZE] = "";
@@ -99,7 +99,7 @@ void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...)
vsnprintf(buf, BUFSIZE - 1, fmt, args);
va_end(args);
}
ircdproto->cmd_mode(source, dest, buf);
ircdproto->SendMode(source, dest, buf);
}
void anope_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
src/modules/cs_appendtopic.c
+1 -1
View File
@@ -148,7 +148,7 @@ int my_cs_appendtopic(User * u)
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
anope_cmd_join(s_ChanServ, c->name, c->creation_time);
anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
}
}
anope_cmd_topic(whosends(ci), c->name, u->nick, topic, c->topic_time);
src/modules/cs_enforce.c
+2 -2
View File
@@ -120,7 +120,7 @@ void do_enforce_restricted(Channel * c)
if (check_access(u, c->ci, CA_NOJOIN)) {
get_idealban(ci, u, mask, sizeof(mask));
reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN);
anope_cmd_mode(whosends(ci), ci->name, "+b %s %lu", mask,
anope_SendMode(whosends(ci), ci->name, "+b %s %lu", mask,
time(NULL));
anope_cmd_kick(whosends(ci), ci->name, u->nick, "%s", reason);
av[0] = ci->name;
@@ -160,7 +160,7 @@ void do_enforce_cmode_R(Channel * c)
reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN);
if (((cbm = &cbmodes['R'])->flag == 0)
|| !(c->mode & cbm->flag))
anope_cmd_mode(whosends(ci), ci->name, "+b %s %lu", mask,
anope_SendMode(whosends(ci), ci->name, "+b %s %lu", mask,
time(NULL));
anope_cmd_kick(whosends(ci), ci->name, u->nick, "%s", reason);
av[0] = ci->name;
src/modules/cs_tban.c
+2 -2
View File
@@ -141,7 +141,7 @@ void addBan(Channel * c, time_t timeout, char *banmask)
av[0] = "+b";
av[1] = banmask;
anope_cmd_mode(whosends(c->ci), c->name, "+b %s", av[1]);
anope_SendMode(whosends(c->ci), c->name, "+b %s", av[1]);
chan_set_modes(s_ChanServ, c, 2, av, 1);
moduleAddCallback("tban", time(NULL) + timeout, delBan, 2, cb);
@@ -156,7 +156,7 @@ int delBan(int argc, char **argv)
av[1] = argv[1];
if ((c = findchan(argv[0])) && c->ci) {
anope_cmd_mode(whosends(c->ci), c->name, "-b %s", av[1]);
anope_SendMode(whosends(c->ci), c->name, "-b %s", av[1]);
chan_set_modes(s_ChanServ, c, 2, av, 1);
}
src/nickserv.c
+2 -2
View File
@@ -938,7 +938,7 @@ void cancel_user(User * u)
anope_cmd_svshold(na->nick);
} else {
if (ircd->svsnick) {
anope_cmd_guest_nick(u->nick, NSEnforcerUser,
anope_SendGuestNick(u->nick, NSEnforcerUser,
NSEnforcerHost,
"Services Enforcer", "+");
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
@@ -949,7 +949,7 @@ void cancel_user(User * u)
}
} else {
if (ircd->svsnick) {
anope_cmd_guest_nick(u->nick, NSEnforcerUser,
anope_SendGuestNick(u->nick, NSEnforcerUser,
NSEnforcerHost,
"Services Enforcer", "+");
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
src/protocol/bahamut.c
+3 -3
View File
@@ -452,7 +452,7 @@ CUMode myCumodes[128] = {
void BahamutIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
void BahamutIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) return;
if (ircdcap->tsmode && (uplink_capab & ircdcap->tsmode)) send_cmd(source, "MODE %s 0 %s", dest, buf);
@@ -488,7 +488,7 @@ void BahamutIRCdProto::SendSVSMode_chan(const char *name, const char *mode, cons
void BahamutIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* EVENT: SJOIN */
@@ -993,7 +993,7 @@ void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const ch
cmd_sqline(nick, "Reserved for services");
}
void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
void BahamutIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
}
src/protocol/bahamut.h
+2 -2
View File
@@ -66,8 +66,8 @@ class BahamutIRCdProto : public IRCDProto {
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *, const char *, const char *);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_kick(const char *, const char *, const char *, const char *);
void cmd_notice_ops(const char *, const char *, const char *);
src/protocol/charybdis.c
+2 -2
View File
@@ -1040,7 +1040,7 @@ void CharybdisProto::cmd_numeric(const char *source, int numeric, const char *de
send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
}
void CharybdisProto::cmd_mode(const char *source, const char *dest, const char *buf)
void CharybdisProto::SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) return;
if (source) {
@@ -1089,7 +1089,7 @@ void CharybdisProto::cmd_bot_chan_mode(const char *nick, const char *chan)
Uid *u = find_uid(nick);
charybdis_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
}
else anope_cmd_mode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
else anope_SendMode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
}
/* QUIT */
src/protocol/charybdis.h
+1 -1
View File
@@ -53,7 +53,7 @@ class CharybdisProto : public IRCDTS6Proto {
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void cmd_mode(const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_kick(const char *, const char *, const char *, const char *);
void cmd_notice_ops(const char *, const char *, const char *);
src/protocol/inspircd11.c
+3 -3
View File
@@ -565,12 +565,12 @@ void InspIRCdProto::cmd_numeric(const char *source, int numeric, const char *des
send_cmd(source, "PUSH %s ::%s %03d %s %s", dest, source, numeric, dest, buf);
}
void InspIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
void InspIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
}
void InspIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
void InspIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) return;
Channel *c = findchan(dest);
@@ -736,7 +736,7 @@ void InspIRCdProto::cmd_notice_ops(const char *source, const char *dest, const c
void InspIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
anope_SendMode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
}
/* PROTOCTL */
src/protocol/inspircd11.h
+2 -2
View File
@@ -71,8 +71,8 @@ class InspIRCdProto : public IRCDProto {
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *, const char *, const char *);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_kick(const char *, const char *, const char *, const char *);
void cmd_notice_ops(const char *, const char *, const char *);
src/protocol/obsolete/hybrid.c
+5 -5
View File
@@ -1125,7 +1125,7 @@ void hybrid_cmd_211(const char *buf)
send_cmd(NULL, "211 %s", buf);
}
void hybrid_cmd_mode(const char *source, const char *dest, const char *buf)
void hybrid_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -1162,7 +1162,7 @@ void hybrid_cmd_notice_ops(const char *source, const char *dest, const char *buf
void hybrid_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* QUIT */
@@ -1273,7 +1273,7 @@ void hybrid_cmd_svsnick(const char *nick, const char *newnick, time_t when)
/* Not Supported by this IRCD */
}
void hybrid_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
void hybrid_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
{
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
@@ -1463,8 +1463,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(hybrid_cmd_375);
pmodule_cmd_376(hybrid_cmd_376);
pmodule_cmd_nick(hybrid_cmd_nick);
pmodule_cmd_guest_nick(hybrid_cmd_guest_nick);
pmodule_cmd_mode(hybrid_cmd_mode);
pmodule_SendGuestNick(hybrid_cmd_guest_nick);
pmodule_SendMode(hybrid_cmd_mode);
pmodule_cmd_bot_nick(hybrid_cmd_bot_nick);
pmodule_cmd_kick(hybrid_cmd_kick);
pmodule_cmd_notice_ops(hybrid_cmd_notice_ops);
src/protocol/obsolete/hybrid.h
+2 -2
View File
@@ -54,8 +54,8 @@ void hybrid_cmd_372_error(const char *source);
void hybrid_cmd_375(const char *source);
void hybrid_cmd_376(const char *source);
void hybrid_cmd_nick(const char *nick, const char *name, const char *modes);
void hybrid_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void hybrid_cmd_mode(const char *source, const char *dest, const char *buf);
void hybrid_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void hybrid_SendMode(const char *source, const char *dest, const char *buf);
void hybrid_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void hybrid_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void hybrid_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/plexus3.c
+5 -5
View File
@@ -1311,7 +1311,7 @@ plexus_cmd_211 (const char *buf)
}
void
plexus_cmd_mode (const char *source, const char *dest, const char *buf)
plexus_SendMode (const char *source, const char *dest, const char *buf)
{
if (!buf)
{
@@ -1358,7 +1358,7 @@ plexus_cmd_notice_ops (const char *source, const char *dest, const char *buf)
void
plexus_cmd_bot_chan_mode (const char *nick, const char *chan)
{
anope_cmd_mode (nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
anope_SendMode (nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
}
/* QUIT */
@@ -1511,7 +1511,7 @@ plexus_cmd_svsnick (const char *nick, const char *newnick, time_t when)
}
void
plexus_cmd_guest_nick (const char *nick, const char *user, const char *host, const char *real,
plexus_SendGuestNick (const char *nick, const char *user, const char *host, const char *real,
const char *modes)
{
send_cmd (ServerName, "NICK %s 1 %ld %s %s %s %s 0 %s :%s", nick,
@@ -1747,8 +1747,8 @@ moduleAddAnopeCmds ()
pmodule_cmd_375 (plexus_cmd_375);
pmodule_cmd_376 (plexus_cmd_376);
pmodule_cmd_nick (plexus_cmd_nick);
pmodule_cmd_guest_nick (plexus_cmd_guest_nick);
pmodule_cmd_mode (plexus_cmd_mode);
pmodule_SendGuestNick (plexus_cmd_guest_nick);
pmodule_SendMode (plexus_cmd_mode);
pmodule_cmd_bot_nick (plexus_cmd_bot_nick);
pmodule_cmd_kick (plexus_cmd_kick);
pmodule_cmd_notice_ops (plexus_cmd_notice_ops);
src/protocol/obsolete/plexus3.h
+2 -2
View File
@@ -50,8 +50,8 @@ void plexus_cmd_372_error(const char *source);
void plexus_cmd_375(const char *source);
void plexus_cmd_376(const char *source);
void plexus_cmd_nick(const char *nick, const char *name, const char *modes);
void plexus_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void plexus_cmd_mode(const char *source, const char *dest, const char *buf);
void plexus_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void plexus_SendMode(const char *source, const char *dest, const char *buf);
void plexus_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void plexus_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void plexus_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/ptlink.c
+5 -5
View File
@@ -387,7 +387,7 @@ CUMode myCumodes[128] = {
void ptlink_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(s_ChanServ, chan, "%s %s %s", ircd->botchanumode, nick,
anope_SendMode(s_ChanServ, chan, "%s %s %s", ircd->botchanumode, nick,
nick);
}
@@ -1178,7 +1178,7 @@ void ptlink_cmd_211(const char *buf)
send_cmd(NULL, "211 %s", buf);
}
void ptlink_cmd_mode(const char *source, const char *dest, const char *buf)
void ptlink_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -1474,7 +1474,7 @@ void ptlink_cmd_svsnick(const char *source, const char *guest, time_t when)
send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void ptlink_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
void ptlink_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
{
send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick,
@@ -1692,8 +1692,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(ptlink_cmd_375);
pmodule_cmd_376(ptlink_cmd_376);
pmodule_cmd_nick(ptlink_cmd_nick);
pmodule_cmd_guest_nick(ptlink_cmd_guest_nick);
pmodule_cmd_mode(ptlink_cmd_mode);
pmodule_SendGuestNick(ptlink_cmd_guest_nick);
pmodule_SendMode(ptlink_cmd_mode);
pmodule_cmd_bot_nick(ptlink_cmd_bot_nick);
pmodule_cmd_kick(ptlink_cmd_kick);
pmodule_cmd_notice_ops(ptlink_cmd_notice_ops);
src/protocol/obsolete/ptlink.h
+2 -2
View File
@@ -89,8 +89,8 @@ void ptlink_cmd_372_error(const char *source);
void ptlink_cmd_375(const char *source);
void ptlink_cmd_376(const char *source);
void ptlink_cmd_nick(const char *nick, const char *name, const char *modes);
void ptlink_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ptlink_cmd_mode(const char *source, const char *dest, const char *buf);
void ptlink_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ptlink_SendMode(const char *source, const char *dest, const char *buf);
void ptlink_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ptlink_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void ptlink_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/rageircd.c
+5 -5
View File
@@ -937,7 +937,7 @@ void rageircd_cmd_351(const char *source)
EncModule, version_build);
}
void rageircd_cmd_mode(const char *source, const char *dest, const char *buf)
void rageircd_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -1212,7 +1212,7 @@ void rageircd_SendSVSMode_chan(const char *name, const char *mode, const char *n
void rageircd_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
int anope_event_server(const char *source, int ac, const char **av)
@@ -1351,7 +1351,7 @@ void rageircd_cmd_svsnick(const char *source, const char *guest, time_t when)
send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void rageircd_cmd_guest_nick(const char *nick, const char *user, const char *host,
void rageircd_SendGuestNick(const char *nick, const char *user, const char *host,
const char *real, const char *modes)
{
send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick,
@@ -1572,8 +1572,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(rageircd_cmd_375);
pmodule_cmd_376(rageircd_cmd_376);
pmodule_cmd_nick(rageircd_cmd_nick);
pmodule_cmd_guest_nick(rageircd_cmd_guest_nick);
pmodule_cmd_mode(rageircd_cmd_mode);
pmodule_SendGuestNick(rageircd_cmd_guest_nick);
pmodule_SendMode(rageircd_cmd_mode);
pmodule_cmd_bot_nick(rageircd_cmd_bot_nick);
pmodule_cmd_kick(rageircd_cmd_kick);
pmodule_cmd_notice_ops(rageircd_cmd_notice_ops);
src/protocol/obsolete/rageircd.h
+2 -2
View File
@@ -52,8 +52,8 @@ void rageircd_cmd_372_error(const char *source);
void rageircd_cmd_375(const char *source);
void rageircd_cmd_376(const char *source);
void rageircd_cmd_nick(const char *nick, const char *name, const char *modes);
void rageircd_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void rageircd_cmd_mode(const char *source, const char *dest, const char *buf);
void rageircd_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void rageircd_SendMode(const char *source, const char *dest, const char *buf);
void rageircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void rageircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void rageircd_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/solidircd.c
+5 -5
View File
@@ -480,7 +480,7 @@ CUMode myCumodes[128] = {
{0}, {0}, {0}, {0}, {0}
};
void solidircd_cmd_mode(const char *source, const char *dest, const char *buf)
void solidircd_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -530,7 +530,7 @@ void solidircd_SendSVSMode_chan(const char *name, const char *mode, const char *
void solidircd_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* EVENT: SJOIN */
@@ -1356,7 +1356,7 @@ void solidircd_cmd_svsnick(const char *source, const char *guest, time_t when)
send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void solidircd_cmd_guest_nick(const char *nick, const char *user, const char *host,
void solidircd_SendGuestNick(const char *nick, const char *user, const char *host,
const char *real, const char *modes)
{
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
@@ -1605,8 +1605,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(solidircd_cmd_375);
pmodule_cmd_376(solidircd_cmd_376);
pmodule_cmd_nick(solidircd_cmd_nick);
pmodule_cmd_guest_nick(solidircd_cmd_guest_nick);
pmodule_cmd_mode(solidircd_cmd_mode);
pmodule_SendGuestNick(solidircd_cmd_guest_nick);
pmodule_SendMode(solidircd_cmd_mode);
pmodule_cmd_bot_nick(solidircd_cmd_bot_nick);
pmodule_cmd_kick(solidircd_cmd_kick);
pmodule_cmd_notice_ops(solidircd_cmd_notice_ops);
src/protocol/obsolete/solidircd.h
+2 -2
View File
@@ -76,8 +76,8 @@ void solidircd_cmd_372_error(const char *source);
void solidircd_cmd_375(const char *source);
void solidircd_cmd_376(const char *source);
void solidircd_cmd_nick(const char *nick, const char *name, const char *modes);
void solidircd_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void solidircd_cmd_mode(const char *source, const char *dest, const char *buf);
void solidircd_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void solidircd_SendMode(const char *source, const char *dest, const char *buf);
void solidircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void solidircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void solidircd_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/ultimate3.c
+5 -5
View File
@@ -1062,14 +1062,14 @@ void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes)
ultimate3_cmd_sqline(nick, "Reserved for services");
}
void ultimate3_cmd_guest_nick(const char *nick, const char *user, const char *host,
void ultimate3_SendGuestNick(const char *nick, const char *user, const char *host,
const char *real, const char *modes)
{
send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick,
(long int) time(NULL), modes, user, host, ServerName, real);
}
void ultimate3_cmd_mode(const char *source, const char *dest, const char *buf)
void ultimate3_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -1150,7 +1150,7 @@ void ultimate3_cmd_serv_privmsg(const char *source, const char *dest, const char
void ultimate3_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
anope_SendMode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
}
void ultimate3_cmd_351(const char *source)
@@ -1713,8 +1713,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(ultimate3_cmd_375);
pmodule_cmd_376(ultimate3_cmd_376);
pmodule_cmd_nick(ultimate3_cmd_nick);
pmodule_cmd_guest_nick(ultimate3_cmd_guest_nick);
pmodule_cmd_mode(ultimate3_cmd_mode);
pmodule_SendGuestNick(ultimate3_cmd_guest_nick);
pmodule_SendMode(ultimate3_cmd_mode);
pmodule_cmd_bot_nick(ultimate3_cmd_bot_nick);
pmodule_cmd_kick(ultimate3_cmd_kick);
pmodule_cmd_notice_ops(ultimate3_cmd_notice_ops);
src/protocol/obsolete/ultimate3.h
+2 -2
View File
@@ -62,8 +62,8 @@ void ultimate3_cmd_372_error(const char *source);
void ultimate3_cmd_375(const char *source);
void ultimate3_cmd_376(const char *source);
void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes);
void ultimate3_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ultimate3_cmd_mode(const char *source, const char *dest, const char *buf);
void ultimate3_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ultimate3_SendMode(const char *source, const char *dest, const char *buf);
void ultimate3_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ultimate3_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void ultimate3_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/obsolete/viagra.c
+5 -5
View File
@@ -865,7 +865,7 @@ void viagra_SendSVSKill(const char *source, const char *user, const char *buf)
return;
}
void viagra_cmd_mode(const char *source, const char *dest, const char *buf)
void viagra_SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) {
return;
@@ -1384,7 +1384,7 @@ void viagra_cmd_invite(const char *source, const char *chan, const char *nick)
void viagra_cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
int anope_event_capab(const char *source, int ac, const char **av)
@@ -1414,7 +1414,7 @@ void viagra_cmd_svsnick(const char *source, const char *guest, time_t when)
send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void viagra_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
void viagra_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
{
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
@@ -1612,8 +1612,8 @@ void moduleAddAnopeCmds()
pmodule_cmd_375(viagra_cmd_375);
pmodule_cmd_376(viagra_cmd_376);
pmodule_cmd_nick(viagra_cmd_nick);
pmodule_cmd_guest_nick(viagra_cmd_guest_nick);
pmodule_cmd_mode(viagra_cmd_mode);
pmodule_SendGuestNick(viagra_cmd_guest_nick);
pmodule_SendMode(viagra_cmd_mode);
pmodule_cmd_bot_nick(viagra_cmd_bot_nick);
pmodule_cmd_kick(viagra_cmd_kick);
pmodule_cmd_notice_ops(viagra_cmd_notice_ops);
src/protocol/obsolete/viagra.h
+2 -2
View File
@@ -71,8 +71,8 @@ void viagra_cmd_372_error(const char *source);
void viagra_cmd_375(const char *source);
void viagra_cmd_376(const char *source);
void viagra_cmd_nick(const char *nick, const char *name, const char *modes);
void viagra_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void viagra_cmd_mode(const char *source, const char *dest, const char *buf);
void viagra_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void viagra_SendMode(const char *source, const char *dest, const char *buf);
void viagra_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void viagra_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void viagra_cmd_notice_ops(const char *source, const char *dest, const char *buf);
src/protocol/ratbox.c
+2 -2
View File
@@ -997,7 +997,7 @@ void RatboxProto::cmd_numeric(const char *source, int numeric, const char *dest,
send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
}
void RatboxProto::cmd_mode(const char *source, const char *dest, const char *buf)
void RatboxProto::SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) return;
if (source) {
@@ -1045,7 +1045,7 @@ void RatboxProto::cmd_bot_chan_mode(const char *nick, const char *chan)
Uid *u = find_uid(nick);
ratbox_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
}
else anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
else anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* QUIT */
src/protocol/ratbox.h
+1 -1
View File
@@ -52,7 +52,7 @@ class RatboxProto : public IRCDProto {
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void cmd_mode(const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_kick(const char *, const char *, const char *, const char *);
void cmd_notice_ops(const char *, const char *, const char *);
src/protocol/unreal32.c
+3 -3
View File
@@ -541,13 +541,13 @@ void UnrealIRCdProto::SendSVSMode(User *u, int ac, const char **av)
}
}
void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
void UnrealIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
myIrcd->nickip ? " *" : " ", real);
}
void UnrealIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
void UnrealIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
{
if (!buf) return;
send_cmd(source, "%s %s %s", send_token("MODE", "G"), dest, buf);
@@ -576,7 +576,7 @@ void UnrealIRCdProto::cmd_notice_ops(const char *source, const char *dest, const
void UnrealIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
anope_cmd_mode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
anope_SendMode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
}
/* PROTOCTL */
src/protocol/unreal32.h
+2 -2
View File
@@ -89,8 +89,8 @@ class UnrealIRCdProto : public IRCDProto {
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *, const char *, const char *);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_kick(const char *, const char *, const char *, const char *);
void cmd_notice_ops(const char *, const char *, const char *);