diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cs_ban.c | 4 | ||||
| -rw-r--r-- | src/core/cs_clear.c | 26 | ||||
| -rw-r--r-- | src/core/cs_drop.c | 2 | ||||
| -rw-r--r-- | src/core/cs_modes.c | 12 | ||||
| -rw-r--r-- | src/core/cs_register.c | 4 | ||||
| -rw-r--r-- | src/core/cs_topic.c | 2 | ||||
| -rw-r--r-- | src/core/os_clearmodes.c | 24 | ||||
| -rw-r--r-- | src/core/os_mode.c | 2 | ||||
| -rw-r--r-- | src/core/os_oline.c | 2 | ||||
| -rw-r--r-- | src/core/os_umode.c | 2 |
10 files changed, 40 insertions, 40 deletions
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index fa8b9ee97..3ddc70995 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -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 */ diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index dee19bcf4..700c057a2 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -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]); } } diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 045594209..43305c158 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -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"); } } diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index ab8e82d4a..d41b4bcda 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -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; diff --git a/src/core/cs_register.c b/src/core/cs_register.c index 3b11bef3b..1b5d3ff68 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -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); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index b117d3d35..0a7854f69 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -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 : "", diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 0b16571a6..51434212d 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -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); } } diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 386636a7c..09e82f59f 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -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); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 6ffb282f0..bf85b38ca 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -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); diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 705120643..076d82096 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -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); |
