diff options
Diffstat (limited to 'src')
50 files changed, 145 insertions, 157 deletions
diff --git a/src/botserv.c b/src/botserv.c index a473d20db..34cf3dc6c 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -491,7 +491,7 @@ void load_bs_dbase(void) restore_db(f); \ log_perror("Write error on %s", BotDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", BotDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", BotDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ diff --git a/src/chanserv.c b/src/chanserv.c index 3472db927..a82de829a 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -611,7 +611,7 @@ void load_cs_dbase(void) restore_db(f); \ log_perror("Write error on %s", ChanDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", ChanDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", ChanDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -876,7 +876,7 @@ void check_modes(Channel * c) /* Check for mode bouncing */ if (c->server_modecount >= 3 && c->chanserv_modecount >= 3) { - anope_SendGlobops(NULL, + ircdproto->SendGlobops(NULL, "Warning: unable to set modes on channel %s. " "Are your servers' U:lines configured correctly?", c->name); diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 0b8eab366..93607ace1 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -117,7 +117,7 @@ int do_drop(User * u) * drop the channel before issuing the wallops. */ if (WallDrop && is_servadmin && level < ACCESS_FOUNDER) - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick, chan); diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index dc70d939f..f327237a8 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -118,7 +118,7 @@ int do_forbid(User * u) } if (WallForbid) - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name); diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index de699e135..64113e5a6 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -88,7 +88,7 @@ int do_getpass(User * u) alog("%s: %s!%s@%s used GETPASS on %s", s_ChanServ, u->nick, u->username, u->host, ci->name); if (WallGetpass) { - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used GETPASS on channel \2%s\2", u->nick, chan); } diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 67c1b5f99..43bf5d3e4 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -393,7 +393,7 @@ int do_set_password(User * u, ChannelInfo * ci, char *param) alog("%s: %s!%s@%s set password as Services admin for %s", s_ChanServ, u->nick, u->username, u->host, ci->name); if (WallSetpass) - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 set password as Services admin for channel \2%s\2", u->nick, ci->name); } else { diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index f97b5c54a..67011209a 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -133,7 +133,7 @@ int do_suspend(User * u) } if (WallForbid) - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name); @@ -194,7 +194,7 @@ int do_unsuspend(User * u) } if (WallForbid) - anope_SendGlobops(s_ChanServ, + ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name); diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index a9a78bd42..bd12cdbbf 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -88,7 +88,7 @@ int do_drop(User * u) if (readonly) notice_lang(s_NickServ, u, READ_ONLY_MODE); if (WallDrop) - anope_SendGlobops(s_NickServ, + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)", @@ -132,7 +132,7 @@ int do_drop(User * u) if (!is_mine) { if (WallDrop) - anope_SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2", + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); notice_lang(s_NickServ, u, NICK_X_DROPPED, nick); } else { diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 8160b220d..eb78b256e 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -119,7 +119,7 @@ int do_forbid(User * u) } if (WallForbid) - anope_SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2", + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick, nick); alog("%s: %s set FORBID for nick %s", s_NickServ, u->nick, nick); diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 6079ca2ba..35589211c 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -80,7 +80,7 @@ int do_getpass(User * u) alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, u->username, u->host, nick); if (WallGetpass) - anope_SendGlobops(s_NickServ, + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); notice_lang(s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick, @@ -100,7 +100,7 @@ int do_getpass(User * u) alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, u->username, u->host, nick); if (WallGetpass) - anope_SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick, tmp_pass); diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index cfa6bd0a4..9383c5c52 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $ * */ @@ -183,7 +183,7 @@ int do_saset(User * u) } else if (stricmp(cmd, "NOEXPIRE") == 0) { do_saset_noexpire(u, na, param); } else if (stricmp(cmd, "AUTOOP") == 0) { - do_saset_autoop(u, na->nc, param); + do_saset_autoop(u, na->nc, param); } else if (stricmp(cmd, "LANGUAGE") == 0) { do_saset_language(u, na->nc, param); } else { @@ -261,7 +261,7 @@ int do_saset_password(User * u, NickCore * nc, char *param) u->nick, u->username, u->host, nc->display, (nc->email ? nc->email : "none")); if (WallSetpass) - anope_SendGlobops(s_NickServ, + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick, nc->display); return MOD_CONT; diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 53823f75f..7394015d4 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -119,7 +119,7 @@ int do_suspend(User * u) } if (WallForbid) - anope_SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2", + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick, nick); alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick); @@ -172,7 +172,7 @@ int do_unsuspend(User * u) na->nc->flags &= ~NI_SUSPENDED; if (WallForbid) - anope_SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", + ircdproto->SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick, nick); alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick, diff --git a/src/core/os_akill.c b/src/core/os_akill.c index d2250fef2..5c142f71e 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -178,7 +178,7 @@ int do_akill(User * u) (wall_expiry == 1) ? "" : "s"); } - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "%s added an AKILL for %s (%s) (%s)", u->nick, mask, reason, buf); } diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index c92a6e481..16ea99071 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -68,7 +68,7 @@ void myOperServHelp(User * u) * * /msg OperServ ChanKill +expire #channel reason * @param u The user who issued the command - * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing. + * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing. * **/ int do_chankill(User * u) @@ -118,7 +118,7 @@ int do_chankill(User * u) cu->user->host, NULL, NULL); } if (WallOSAkill) { - anope_SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)", + ircdproto->SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)", u->nick, channel, reason); } } else { diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 23c4a2993..214404e3d 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -99,7 +99,7 @@ int do_clearmodes(User * u) } if (WallOSClearmodes) { - anope_SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s", + ircdproto->SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s", u->nick, all ? " ALL" : "", chan); } if (all) { diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index e2ab6da80..4b6079d20 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -105,7 +105,7 @@ int do_defcon(User * u) notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel); defcon_sendlvls(u); alog("Defcon level changed to %d by Oper %s", newLevel, u->nick); - anope_SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL), + ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL), u->nick, newLevel); /* Global notice the user what is happening. Also any Message that the Admin would like to add. Set in config file. */ diff --git a/src/core/os_global.c b/src/core/os_global.c index befaf881c..4258b8df1 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -75,7 +75,7 @@ int do_global(User * u) return MOD_CONT; } if (WallOSGlobal) - anope_SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.", u->nick); oper_global(u->nick, "%s", msg); return MOD_CONT; diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 928da7ef9..5cab65795 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -80,7 +80,7 @@ int do_jupe(User * u) anope_SendJupe(jserver, u->nick, reason); if (WallOSJupe) - anope_SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2", u->nick, jserver); } } diff --git a/src/core/os_kick.c b/src/core/os_kick.c index af3d58496..f1ce4a072 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -87,7 +87,7 @@ int do_os_kick(User * u) } ircdproto->SendKick(s_OperServ, chan, nick, "%s (%s)", u->nick, s); if (WallOSKick) - anope_SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick, + ircdproto->SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick, nick, chan); argv[0] = sstrdup(chan); argv[1] = sstrdup(nick); diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 43cd96f9f..60d4f4fcf 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -95,7 +95,7 @@ int do_os_mode(User * u) free(av); if (WallOSMode) - anope_SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick, + ircdproto->SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick, modes, chan); } return MOD_CONT; diff --git a/src/core/os_noop.c b/src/core/os_noop.c index e406065d2..65eff229f 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -84,7 +84,7 @@ int do_noop(User * u) snprintf(reason, sizeof(reason), "NOOP command used by %s", u->nick); if (WallOSNoOp) - anope_SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2", u->nick, server); notice_lang(s_OperServ, u, OPER_NOOP_SET, server); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 9ae96a39c..31ecfef00 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -94,12 +94,12 @@ int do_operoline(User * u) common_svsmode(u2, "+o", NULL); notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP); notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick); - anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); } else if (u2 && flags[0] == '-') { anope_SendSVSO(s_OperServ, nick, flags); notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick); - anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); } else syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX); diff --git a/src/core/os_raw.c b/src/core/os_raw.c index 6628adb9d..142a44980 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -67,7 +67,7 @@ int do_raw(User * u) char *kw = strtok(text, " "); while (kw && *kw == ':') kw = strtok(NULL, " "); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used RAW command for \2%s\2", u->nick, (kw ? kw : "\2non RFC compliant message\2")); diff --git a/src/core/os_set.c b/src/core/os_set.c index 28d66fe5c..a8091bf95 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -214,14 +214,14 @@ int do_set(User * u) u->isSuperAdmin = 1; notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ON); alog("%s: %s is a SuperAdmin ", s_OperServ, u->nick); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_SUPER_ADMIN_WALL_ON), u->nick); } else if (stricmp(setting, "off") == 0) { u->isSuperAdmin = 0; notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_OFF); alog("%s: %s is no longer a SuperAdmin", s_OperServ, u->nick); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_SUPER_ADMIN_WALL_OFF), u->nick); } else { diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 5babb79e8..586c0db42 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -121,7 +121,7 @@ int do_sgline(User * u) size_t masklen = strlen(mask); if (mask[masklen - 1] == ' ') mask[masklen - 1] = '\0'; - + /* We first do some sanity check on the proposed mask. */ if (mask && strspn(mask, "*?") == strlen(mask)) { @@ -162,7 +162,7 @@ int do_sgline(User * u) (wall_expiry == 1) ? "" : "s"); } - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "%s added an SGLINE for %s (%s)", u->nick, mask, buf); } diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index c79e6aff2..f7b503ec1 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -157,7 +157,7 @@ int do_sqline(User * u) (wall_expiry == 1) ? "" : "s"); } - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "%s added an SQLINE for %s (%s)", u->nick, mask, buf); } diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index ea44bc1b0..6e59a2b97 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -117,7 +117,7 @@ int do_svsnick(User * u) notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick); } else { notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick); - anope_SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s", + ircdproto->SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s", u->nick, nick, newnick); anope_SendForceNickChange(nick, newnick, time(NULL)); } diff --git a/src/core/os_szline.c b/src/core/os_szline.c index 20882a7c9..5f33fd38c 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -154,7 +154,7 @@ int do_szline(User * u) (wall_expiry == 1) ? "" : "s"); } - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "%s added an SZLINE for %s (%s)", u->nick, mask, buf); } diff --git a/src/core/os_umode.c b/src/core/os_umode.c index bc33e07d7..65b55c3aa 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -109,7 +109,7 @@ int do_operumodes(User * u) notice_lang(s_OperServ, u2, OPER_UMODE_CHANGED, u->nick); if (WallOSMode) - anope_SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s", + ircdproto->SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s", u->nick, nick); } return MOD_CONT; diff --git a/src/datafiles.c b/src/datafiles.c index 10d078f11..b5d381c32 100644 --- a/src/datafiles.c +++ b/src/datafiles.c @@ -6,9 +6,9 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * - * $Id$ + * Based on the original code of Services by Andy Church. + * + * $Id$ * */ @@ -93,7 +93,7 @@ static dbFILE *open_db_read(const char *service, const char *filename) #ifndef NOT_MAIN log_perror("Can't read %s database %s", service, filename); if (time(NULL) - lastwarn > WarningTimeout) { - anope_SendGlobops(NULL, + ircdproto->SendGlobops(NULL, "Write error on %s: Memory allocation failed", filename); lastwarn = time(NULL); @@ -111,7 +111,7 @@ static dbFILE *open_db_read(const char *service, const char *filename) log_perror("Can not read %s database %s", service, f->filename); if (time(NULL) - lastwarn > WarningTimeout) { - anope_SendGlobops(NULL, "Write error on %s: %s", f->filename, + ircdproto->SendGlobops(NULL, "Write error on %s: %s", f->filename, strerror(errno)); lastwarn = time(NULL); } @@ -198,7 +198,7 @@ static dbFILE *open_db_write(const char *service, const char *filename, static int walloped = 0; if (!walloped) { walloped++; - anope_SendGlobops(NULL, "Can not back up %s database %s", + ircdproto->SendGlobops(NULL, "Can not back up %s database %s", service, filename); } #ifdef _WIN32 @@ -248,7 +248,7 @@ static dbFILE *open_db_write(const char *service, const char *filename, static int walloped = 0; if (!walloped) { walloped++; - anope_SendGlobops(NULL, "Can't write to %s database %s", + ircdproto->SendGlobops(NULL, "Can't write to %s database %s", service, filename); } errno = errno_save; @@ -587,7 +587,7 @@ static void rename_database(char *name, char *ext) snprintf(destpath, sizeof(destpath), "backups/%s.%s", name, ext); if (rename(name, destpath) != 0) { alog("Backup of %s failed.", name); - anope_SendGlobops(s_OperServ, "WARNING! Backup of %s failed.", + ircdproto->SendGlobops(s_OperServ, "WARNING! Backup of %s failed.", name); } } diff --git a/src/hostserv.c b/src/hostserv.c index a8a802a56..ac42fd8ae 100644 --- a/src/hostserv.c +++ b/src/hostserv.c @@ -6,9 +6,9 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * - * $Id$ + * Based on the original code of Services by Andy Church. + * + * $Id$ * */ @@ -104,7 +104,7 @@ HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent, next = (HostCore *)malloc(sizeof(HostCore)); if (next == NULL) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); } else { next->nick = (char *)malloc(sizeof(char) * strlen(nick) + 1); @@ -114,7 +114,7 @@ HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent, next->vIdent = (char *)malloc(sizeof(char) * strlen(vIdent) + 1); if ((next->nick == NULL) || (next->vHost == NULL) || (next->creator == NULL)) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -123,7 +123,7 @@ HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent, strcpy(next->creator, creator); if (vIdent) { if ((next->vIdent == NULL)) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -192,7 +192,7 @@ HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick, newCore = (HostCore *)malloc(sizeof(HostCore)); if (newCore == NULL) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to insert into the vHost LL, problems i sense.."); return NULL; } else { @@ -203,7 +203,7 @@ HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick, newCore->vIdent = (char *)malloc(sizeof(char) * strlen(vIdent) + 1); if ((newCore->nick == NULL) || (newCore->vHost == NULL) || (newCore->creator == NULL)) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -212,7 +212,7 @@ HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick, strcpy(newCore->creator, creator); if (vIdent) { if ((newCore->vIdent == NULL)) { - anope_SendGlobops(s_HostServ, + ircdproto->SendGlobops(s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -463,7 +463,7 @@ void load_hs_dbase_v3(dbFILE * f) restore_db(f); \ log_perror("Write error on %s", HostDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", HostDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", HostDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -607,7 +607,7 @@ int is_host_remover(User * u) } /* - * Sets the last_usermak properly. Using virtual ident and/or host + * Sets the last_usermak properly. Using virtual ident and/or host */ void set_lastmask(User * u) { diff --git a/src/init.c b/src/init.c index 861b7cd38..2fc6f03de 100644 --- a/src/init.c +++ b/src/init.c @@ -726,7 +726,7 @@ int init_secondary(int ac, char **av) /* Announce a logfile error if there was one */ if (openlog_failed) { - anope_SendGlobops(NULL, "Warning: couldn't open logfile: %s", + ircdproto->SendGlobops(NULL, "Warning: couldn't open logfile: %s", strerror(openlog_errno)); } diff --git a/src/ircd.c b/src/ircd.c index 41710389a..a179685ec 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -43,18 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av) ircdproto->ProcessUsermodes(user, ac, av); } -void anope_SendGlobops(const char *source, const char *fmt, ...) -{ - va_list args; - char buf[BUFSIZE] = ""; - if (fmt) { - va_start(args, fmt); - vsnprintf(buf, BUFSIZE - 1, fmt, args); - va_end(args); - } - ircdproto->SendGlobops(source, buf); -} - void anope_SendSQLine(const char *mask, const char *reason) { ircdproto->SendSQLine(mask, reason); @@ -245,7 +245,7 @@ void fatal(const char *fmt, ...) if (nofork) fprintf(stderr, "%s FATAL: %s\n", buf, buf2); if (servsock >= 0) - anope_SendGlobops(NULL, "FATAL ERROR! %s", buf2); + ircdproto->SendGlobops(NULL, "FATAL ERROR! %s", buf2); /* one of the many places this needs to be called from */ ModuleRunTimeDirCleanUp(); @@ -283,7 +283,7 @@ void fatal_perror(const char *fmt, ...) fprintf(stderr, "%s FATAL: %s: %s\n", buf, buf2, strerror(errno_save)); if (servsock >= 0) - anope_SendGlobops(NULL, "FATAL ERROR! %s: %s", buf2, + ircdproto->SendGlobops(NULL, "FATAL ERROR! %s: %s", buf2, strerror(errno_save)); /* one of the many places this needs to be called from */ @@ -326,7 +326,7 @@ void fatal_sockerror(const char *fmt, ...) fprintf(stderr, "%s FATAL: %s: %s\n", buf, buf2, ano_sockstrerror(errno_save)); if (servsock >= 0) - anope_SendGlobops(NULL, "FATAL ERROR! %s: %s", buf2, + ircdproto->SendGlobops(NULL, "FATAL ERROR! %s: %s", buf2, strerror(errno_save)); /* one of the many places this needs to be called from */ diff --git a/src/main.c b/src/main.c index 45b5be1d9..9e16b6e53 100644 --- a/src/main.c +++ b/src/main.c @@ -385,7 +385,7 @@ void sighandler(int signum) inbuf[447] = '>'; inbuf[448] = 0; } - anope_SendGlobops(NULL, "PANIC! buffer = %s\r\n", inbuf); + ircdproto->SendGlobops(NULL, "PANIC! buffer = %s\r\n", inbuf); modules_unload_all(false, true); } else if (waiting < 0) { /* This is static on the off-chance we run low on stack */ @@ -461,7 +461,7 @@ void sighandler(int signum) default: snprintf(buf, sizeof(buf), "waiting=%d", waiting); } - anope_SendGlobops(NULL, "PANIC! %s (%s)", buf, strsignal(signum)); + ircdproto->SendGlobops(NULL, "PANIC! %s (%s)", buf, strsignal(signum)); alog("PANIC! %s (%s)", buf, strsignal(signum)); modules_unload_all(false, true); } @@ -585,7 +585,7 @@ int main(int ac, char **av, char **envp) if (!readonly && (save_data || t - last_update >= UpdateTimeout)) { if (delayed_quit) - anope_SendGlobops(NULL, + ircdproto->SendGlobops(NULL, "Updating databases on shutdown, please wait."); save_databases(); diff --git a/src/messages.c b/src/messages.c index 87d466562..6f45b06e8 100644 --- a/src/messages.c +++ b/src/messages.c @@ -166,7 +166,7 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) if (!is_oper(u) && OSOpersOnly) { notice_lang(s_OperServ, u, ACCESS_DENIED); if (WallBadOS) - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "Denied access to %s from %s!%s@%s (non-oper)", s_OperServ, u->nick, u->username, u->host); diff --git a/src/modules.c b/src/modules.c index 6f62840c8..3be6f3f3f 100644 --- a/src/modules.c +++ b/src/modules.c @@ -670,7 +670,7 @@ int loadModule(Module * m, User * u) } if (u) { - anope_SendGlobops(s_OperServ, "%s loaded module %s", u->nick, + ircdproto->SendGlobops(s_OperServ, "%s loaded module %s", u->nick, m->name); notice_lang(s_OperServ, u, OPER_MODULE_LOADED, m->name); } @@ -726,7 +726,7 @@ int unloadModule(Module * m, User * u) return MOD_ERR_NOUNLOAD; } else { if (u) { - anope_SendGlobops(s_OperServ, "%s unloaded module %s", u->nick, + ircdproto->SendGlobops(s_OperServ, "%s unloaded module %s", u->nick, m->name); notice_lang(s_OperServ, u, OPER_MODULE_UNLOADED, m->name); } diff --git a/src/modules/os_info.c b/src/modules/os_info.c index f77628978..dbb7c02eb 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -136,7 +136,7 @@ void AnopeFini(void) * Provide the user interface to add/remove/update oper information * about a nick. * We are going to assume that anyone who gets this far is an oper; - * the createCommand should have handled this checking for us and its + * the createCommand should have handled this checking for us and its * tedious / a waste to do it twice. * @param u The user who executed this command * @return MOD_CONT if we want to process other commands in this command @@ -205,8 +205,8 @@ int myAddNickInfo(User * u) /** * Provide the user interface to add/remove/update oper information * about a channel. - * We are going to assume that anyone who gets this far is an oper; - * the createCommand should have handled this checking for us and + * We are going to assume that anyone who gets this far is an oper; + * the createCommand should have handled this checking for us and * its tedious / a waste to do it twice. * @param u The user who executed this command * @return MOD_CONT if we want to process other commands in this command @@ -273,7 +273,7 @@ int myAddChanInfo(User * u) /*************************************************************************/ /** - * Called after a user does a /msg nickserv info [nick] + * Called after a user does a /msg nickserv info [nick] * @param u The user who requested info * @return MOD_CONT to continue processing commands or MOD_STOP to stop **/ @@ -310,7 +310,7 @@ int myNickInfo(User * u) } /** - * Called after a user does a /msg chanserv info chan + * Called after a user does a /msg chanserv info chan * @param u The user who requested info * @return MOD_CONT to continue processing commands or MOD_STOP to stop **/ @@ -344,7 +344,7 @@ int myChanInfo(User * u) /*************************************************************************/ -/** +/** * Load data from the db file, and populate our OperInfo lines * @return 0 for success **/ @@ -399,7 +399,7 @@ int mLoadData(void) return ret; } -/** +/** * Save all our data to our db file * First walk through the nick CORE list, and any nick core which has * oper info attached to it, write to the file. @@ -419,7 +419,7 @@ int mSaveData(int argc, char **argv) if (!stricmp(argv[0], EVENT_START)) { if ((out = fopen(OSInfoDBName, "w")) == NULL) { alog("os_info: ERROR: can not open the database file!"); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "os_info: ERROR: can not open the database file!"); ret = 1; } else { @@ -453,18 +453,18 @@ int mSaveData(int argc, char **argv) return ret; } -/** +/** * Backup our databases using the commands provided by Anope * @return MOD_CONT **/ int mBackupData(int argc, char **argv) { ModuleDatabaseBackup(OSInfoDBName); - + return MOD_CONT; } -/** +/** * Load the configuration directives from Services configuration file. * @return 0 for success **/ @@ -494,7 +494,7 @@ int mLoadConfig(void) return 0; } -/** +/** * Manage the RELOAD EVENT * @return MOD_CONT **/ diff --git a/src/news.c b/src/news.c index aea3cc32d..92ffa1910 100644 --- a/src/news.c +++ b/src/news.c @@ -7,9 +7,9 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * - * $Id$ + * Based on the original code of Services by Andy Church. + * + * $Id$ * */ @@ -203,7 +203,7 @@ void load_news() restore_db(f); \ log_perror("Write error on %s", NewsDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", NewsDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", NewsDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -245,7 +245,7 @@ void save_rdb_news() alog("Unable to tag table 'anope_os_news' - News RDB save failed."); return; } - + for (i = 0; i < nnews; i++) { ni = &news[i]; if (rdb_save_news(ni) == 0) { @@ -253,12 +253,12 @@ void save_rdb_news() return; } } - + if (rdb_clean_table("anope_os_news") == 0) { alog("Unable to clean table 'anope_os_news' - News RDB save failed."); return; } - + rdb_close(); #endif } diff --git a/src/nickserv.c b/src/nickserv.c index d064dd032..b30dfd791 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -640,7 +640,7 @@ void load_ns_dbase(void) restore_db(f); \ log_perror("Write error on %s", NickDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", NickDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", NickDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ diff --git a/src/operserv.c b/src/operserv.c index 4fcb3fdb9..c0a3aa0c5 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -423,7 +423,7 @@ void load_os_dbase(void) restore_db(f); \ log_perror("Write error on %s", OperDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", OperDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", OperDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -903,7 +903,7 @@ void expire_akills(void) continue; if (WallAkillExpire) - anope_SendGlobops(s_OperServ, "AKILL on %s@%s has expired", + ircdproto->SendGlobops(s_OperServ, "AKILL on %s@%s has expired", ak->user, ak->host); slist_delete(&akills, i); } @@ -1091,7 +1091,7 @@ void expire_sglines(void) continue; if (WallSGLineExpire) - anope_SendGlobops(s_OperServ, "SGLINE on \2%s\2 has expired", + ircdproto->SendGlobops(s_OperServ, "SGLINE on \2%s\2 has expired", sx->mask); slist_delete(&sglines, i); } @@ -1311,7 +1311,7 @@ void expire_sqlines(void) continue; if (WallSQLineExpire) - anope_SendGlobops(s_OperServ, "SQLINE on \2%s\2 has expired", + ircdproto->SendGlobops(s_OperServ, "SQLINE on \2%s\2 has expired", sx->mask); slist_delete(&sqlines, i); @@ -1480,7 +1480,7 @@ void expire_szlines(void) continue; if (WallSZLineExpire) - anope_SendGlobops(s_OperServ, "SZLINE on \2%s\2 has expired", + ircdproto->SendGlobops(s_OperServ, "SZLINE on \2%s\2 has expired", sx->mask); slist_delete(&szlines, i); } @@ -1598,7 +1598,7 @@ void resetDefCon(int level) DefConLevel = level; send_event(EVENT_DEFCON_LEVEL, 1, strLevel); alog("Defcon level timeout, returning to lvl %d", level); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL), s_OperServ, level); if (GlobalOnDefcon) { diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 975467972..298b0f987 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -185,7 +185,7 @@ void BahamutIRCdProto::ProcessUsermodes(User *user, int ac, const char **av) case 'o': if (add) { ++opcnt; - if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); display_news(user, NEWS_OPER); } else --opcnt; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 840e35521..e867921d6 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -167,7 +167,7 @@ void CharybdisProto::ProcessUsermodes(User *user, int ac, const char **av) case 'o': if (add) { ++opcnt; - if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); display_news(user, NEWS_OPER); } else --opcnt; @@ -434,7 +434,7 @@ CUMode myCumodes[128] = { {0}, {0}, {0}, {0}, {0} }; -void CharybdisProto::SendGlobops(const char *source, const char *buf) +void CharybdisProto::SendGlobopsInternal(const char *source, const char *buf) { if (!buf) return; if (source) { diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 2a9332de7..085c1f0d6 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -53,6 +53,7 @@ class CharybdisProto : public IRCDTS6Proto { void SendNoticeChanopsInternal(const char *, const char *, const char *); void SendQuitInternal(const char *, const char *); void SendPartInternal(const char *, const char *, const char *); + void SendGlobopsInternal(const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendVhostDel(User *); @@ -64,7 +65,6 @@ class CharybdisProto : public IRCDTS6Proto { void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); void SendInvite(const char *, const char *, const char *); - void SendGlobops(const char *, const char *); void SendSQLine(const char *, const char *); void SendForceNickChange(const char *, const char *, time_t); void SendVhost(const char *, const char *, const char *); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index fed17d4f4..638dce58c 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -421,7 +421,7 @@ void InspIRCdProto::ProcessUsermodes(User *user, int ac, const char **av) case 'o': if (add) { ++opcnt; - if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); display_news(user, NEWS_OPER); } else --opcnt; @@ -524,7 +524,7 @@ void inspircd_cmd_chghost(const char *nick, const char *vhost) } send_cmd(s_OperServ, "CHGHOST %s %s", nick, vhost); } else { - anope_SendGlobops(s_OperServ, "CHGHOST not loaded!"); + ircdproto->SendGlobops(s_OperServ, "CHGHOST not loaded!"); } } @@ -791,7 +791,7 @@ void inspircd_cmd_chgident(const char *nick, const char *vIdent) } send_cmd(s_OperServ, "CHGIDENT %s %s", nick, vIdent); } else { - anope_SendGlobops(s_OperServ, "CHGIDENT not loaded!"); + ircdproto->SendGlobops(s_OperServ, "CHGIDENT not loaded!"); } } @@ -1201,13 +1201,13 @@ int anope_event_capab(const char *source, int ac, const char **av) return MOD_STOP; } if (!has_svsholdmod) { - anope_SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); } if (!has_chghostmod) { - anope_SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); } if (!has_chgidentmod) { - anope_SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); } if (has_messagefloodmod) { cbmi = myCbmodeinfos; diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index b58d63688..94a0dd625 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -166,7 +166,7 @@ void RatboxProto::ProcessUsermodes(User *user, int ac, const char **av) case 'o': if (add) { ++opcnt; - if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); display_news(user, NEWS_OPER); } else --opcnt; @@ -425,7 +425,7 @@ CUMode myCumodes[128] = { -void RatboxProto::SendGlobops(const char *source, const char *buf) +void RatboxProto::SendGlobopsInternal(const char *source, const char *buf) { if (!buf) return; if (source) { diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 2466c0a3d..fa4c94989 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -52,6 +52,7 @@ class RatboxProto : public IRCDTS6Proto { void SendNoticeChanopsInternal(const char *, const char *, const char *); void SendQuitInternal(const char *, const char *); void SendPartInternal(const char *, const char *, const char *); + void SendGlobopsInternal(const char *, const char *); public: void SendAkillDel(const char *, const char *); void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *); @@ -62,7 +63,6 @@ class RatboxProto : public IRCDTS6Proto { void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); void SendInvite(const char *, const char *, const char *); - void SendGlobops(const char *, const char *); void SendSQLine(const char *, const char *); void SendForceNickChange(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command void SendConnect(); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 61690dcaf..ada8e72c5 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -443,7 +443,7 @@ void UnrealIRCdProto::ProcessUsermodes(User *user, int ac, const char **av) case 'o': if (add) { ++opcnt; - if (WallOper) anope_SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); display_news(user, NEWS_OPER); } else --opcnt; diff --git a/src/servers.c b/src/servers.c index 6acbc413f..95f705435 100644 --- a/src/servers.c +++ b/src/servers.c @@ -408,7 +408,7 @@ void do_squit(const char *source, int ac, const char **av) if (s->flags & SERVER_JUPED) { snprintf(buf, BUFSIZE, "Received SQUIT for juped server %s", s->name); - anope_SendGlobops(s_OperServ, buf); + ircdproto->SendGlobops(s_OperServ, buf); } snprintf(buf, sizeof(buf), "%s %s", s->name, diff --git a/src/sessions.c b/src/sessions.c index 5b1eb2cb1..765333cc4 100644 --- a/src/sessions.c +++ b/src/sessions.c @@ -239,7 +239,7 @@ int add_session(const char *nick, const char *host, char *hostip) add_akill(NULL, akillmask, s_OperServ, time(NULL) + SessionAutoKillExpiry, "Session limit exceeded"); - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask); } @@ -288,7 +288,7 @@ void del_session(const char *host) if (!session) { if (debug) { - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "WARNING: Tried to delete non-existant session: \2%s", host); alog("session: Tried to delete non-existant session: %s", @@ -335,7 +335,7 @@ void expire_exceptions(void) if (exceptions[i].expires == 0 || exceptions[i].expires > now) continue; if (WallExceptionExpire) - anope_SendGlobops(s_OperServ, + ircdproto->SendGlobops(s_OperServ, "Session limit exception for %s has expired.", exceptions[i].mask); free(exceptions[i].mask); @@ -443,7 +443,7 @@ void load_exceptions() restore_db(f); \ log_perror("Write error on %s", ExceptionDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - anope_SendGlobops(NULL, "Write error on %s: %s", ExceptionDBName, \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", ExceptionDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ |