diff options
76 files changed, 342 insertions, 342 deletions
diff --git a/include/depricated.h b/include/depricated.h index 8f127441e..0be4108f7 100644 --- a/include/depricated.h +++ b/include/depricated.h @@ -35,7 +35,7 @@ #define s_sgline(mask, reason) anope_cmd_sgline(mask, reason) #define s_szline(mask, reason) anope_cmd_szline(mask, reason) #define s_unsgline(mask) anope_cmd_unsgline(mask) -#define s_unsqline(mask) anope_cmd_unsqline(mask) +#define s_unsqline(mask) anope_SendSQLineDel(mask) #define s_unszline(mask) anope_cmd_unszline(mask) #define s_rakill(user, host) anope_SendAkillDel(user, host) diff --git a/include/extern.h b/include/extern.h index 8a48bf69f..2bf286b00 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1123,9 +1123,9 @@ E void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhos E void anope_SendVhostDel(User *u); E void anope_cmd_connect(); /* Connect */ E void anope_cmd_ea(); /* EA */ -E void anope_cmd_global(const char *source, const char *fmt, ...); /* GLOBOPS */ -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_SendGlobops(const char *source, const char *fmt, ...); /* GLOBOPS */ +E void anope_SendInvite(const char *source, const char *chan, const char *nick); /* INVITE */ +E void anope_SendJoin(const char *user, const char *channel, time_t chantime); /* JOIN */ E void anope_SendKick(const char *source, const char *chan, const char *user, const char *fmt, ...); /* KICK */ 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 */ @@ -1139,9 +1139,9 @@ E void anope_cmd_message(const char *source, const char *dest, const char *fmt, E void anope_SendNoticeChanops(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 */ E void anope_SendGlobalNotice(const char *source, const char *dest, const char *msg); /* NOTICE */ -E void anope_cmd_part(const char *nick, const char *chan, const char *fmt, ...); /* PART */ +E void anope_SendPart(const char *nick, const char *chan, const char *fmt, ...); /* PART */ E void anope_cmd_pass(const char *pass); /* PASS */ -E void anope_cmd_pong(const char *servname, const char *who); /* PONG */ +E void anope_SendPong(const char *servname, const char *who); /* PONG */ E void anope_cmd_privmsg(const char *source, const char *dest, const char *fmt, ...); /* PRIVMSG */ E void anope_cmd_action(const char *source, const char *dest, const char *fmt, ...); /* PRIVMSG */ E void anope_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg); /* PRIVMSG */ @@ -1168,7 +1168,7 @@ E void anope_cmd_svspart(const char *source, const char *nick,const char *chan); E void anope_cmd_swhois(const char *source, const char *who, const char *mask); /* SWHOIS */ E void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when); /* TOPIC */ E void anope_cmd_unsgline(const char *mask); /* UNSGLINE */ -E void anope_cmd_unsqline(const char *user); /* UNSQLINE */ +E void anope_SendSQLineDel(const char *user); /* UNSQLINE */ E void anope_cmd_unszline(const char *mask); /* UNSZLINE */ E void anope_cmd_eob(); /* EOB - end of burst */ E void anope_cmd_burst(); /* BURST - use eob to send burst 0 */ diff --git a/include/services.h b/include/services.h index f6feee436..d303c0e01 100644 --- a/include/services.h +++ b/include/services.h @@ -1273,24 +1273,24 @@ class IRCDProto { if (buf) send_cmd(source, "QUIT :%s", buf); else send_cmd(source, "QUIT"); } - virtual void cmd_pong(const char *servname, const char *who) + virtual void SendPong(const char *servname, const char *who) { send_cmd(servname, "PONG %s", who); } - virtual void cmd_join(const char *, const char *, time_t) = 0; - virtual void cmd_unsqline(const char *) = 0; - virtual void cmd_invite(const char *source, const char *chan, const char *nick) + virtual void SendJoin(const char *, const char *, time_t) = 0; + virtual void SendSQLineDel(const char *) = 0; + virtual void SendInvite(const char *source, const char *chan, const char *nick) { if (!source || !chan || !nick) return; send_cmd(source, "INVITE %s %s", nick, chan); } - virtual void cmd_part(const char *nick, const char *chan, const char *buf) + virtual void SendPart(const char *nick, const char *chan, const char *buf) { if (!nick || !chan) return; if (buf) send_cmd(nick, "PART %s :%s", chan, buf); else send_cmd(nick, "PART %s", chan); } - virtual void cmd_global(const char *source, const char *buf) + virtual void SendGlobops(const char *source, const char *buf) { if (!buf) return; send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf); diff --git a/src/bots.cpp b/src/bots.cpp index fe2c0e1ce..5195b23cf 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -108,7 +108,7 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci) send_event(EVENT_BOT_UNASSIGN, 2, ci->name, ci->bi->nick); if (u && ci->c && ci->c->usercount >= BSMinUsers) - anope_cmd_part(ci->bi->nick, ci->name, "UNASSIGN from %s", u->nick); + anope_SendPart(ci->bi->nick, ci->name, "UNASSIGN from %s", u->nick); ci->bi->chancount--; ci->bi = NULL; diff --git a/src/botserv.c b/src/botserv.c index b1686fcdc..8d529af0e 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_cmd_global(NULL, "Write error on %s: %s", BotDBName, \ + anope_SendGlobops(NULL, "Write error on %s: %s", BotDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -750,7 +750,7 @@ void bot_join(ChannelInfo * ci) "%s invited %s into the channel.", ci->bi->nick, ci->bi->nick); } - anope_cmd_join(ci->bi->nick, ci->c->name, ci->c->creation_time); + anope_SendJoin(ci->bi->nick, ci->c->name, ci->c->creation_time); anope_SendBotOp(ci->bi->nick, ci->c->name); send_event(EVENT_BOT_JOIN, 2, ci->name, ci->bi->nick); } diff --git a/src/channels.c b/src/channels.c index 7be1dfbbd..7a72a29c0 100644 --- a/src/channels.c +++ b/src/channels.c @@ -49,7 +49,7 @@ void chan_deluser(User * user, Channel * c) c->usercount--; if (s_BotServ && c->ci && c->ci->bi && c->usercount == BSMinUsers - 1) { - anope_cmd_part(c->ci->bi->nick, c->name, NULL); + anope_SendPart(c->ci->bi->nick, c->name, NULL); } if (!c->users) @@ -790,7 +790,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (c->ci && c->ci->bi) { /* This is ugly, but it always works */ - anope_cmd_part(c->ci->bi->nick, c->name, "TS reop"); + anope_SendPart(c->ci->bi->nick, c->name, "TS reop"); bot_join(c->ci); } /* XXX simple modes and bans */ diff --git a/src/chanserv.c b/src/chanserv.c index fd4d495fa..7f3570b3d 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_cmd_global(NULL, "Write error on %s: %s", ChanDBName, \ + anope_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_cmd_global(NULL, + anope_SendGlobops(NULL, "Warning: unable to set modes on channel %s. " "Are your servers' U:lines configured correctly?", c->name); @@ -1244,7 +1244,7 @@ static void timeout_leave(Timeout * to) if (ci) /* Check cos the channel may be dropped in the meantime */ ci->flags &= ~CI_INHABIT; - anope_cmd_part(s_ChanServ, chan, NULL); + anope_SendPart(s_ChanServ, chan, NULL); free(to->data); } @@ -1352,7 +1352,7 @@ int check_kick(User * user, const char *chan, time_t chants) * c may be NULL even if it exists */ if ((!(c = findchan(chan)) || c->usercount == 0) && !(ci->flags & CI_INHABIT)) { - anope_cmd_join(s_ChanServ, chan, (c ? c->creation_time : chants)); + anope_SendJoin(s_ChanServ, chan, (c ? c->creation_time : chants)); /* Lets hide the channel from /list just incase someone does /list * while we are here. - katsklaw */ @@ -1448,7 +1448,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_SendJoin(s_ChanServ, chan, c->creation_time); anope_SendMode(NULL, chan, "+o %s", s_ChanServ); } } @@ -1456,7 +1456,7 @@ void restore_topic(const char *chan) c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_cmd_part(s_ChanServ, c->name, NULL); + anope_SendPart(s_ChanServ, c->name, NULL); } } } @@ -1510,7 +1510,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_SendJoin(s_ChanServ, c->name, c->creation_time); anope_SendMode(NULL, c->name, "+o %s", s_ChanServ); } } @@ -1520,7 +1520,7 @@ int check_topiclock(Channel * c, time_t topic_time) if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_cmd_part(s_ChanServ, c->ci->name, NULL); + anope_SendPart(s_ChanServ, c->ci->name, NULL); } } return 1; @@ -1778,7 +1778,7 @@ int delchan(ChannelInfo * ci) } if (ci->c) { if (ci->bi && ci->c->usercount >= BSMinUsers) { - anope_cmd_part(ci->bi->nick, ci->c->name, NULL); + anope_SendPart(ci->bi->nick, ci->c->name, NULL); } ci->c->ci = NULL; } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index cce84d789..eba82f5f9 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -267,7 +267,7 @@ int do_bot(User * u) /* The new nick is really different, so we remove the Q line for the old nick. */ if (ircd->sqline) { - anope_cmd_unsqline(bi->nick); + anope_SendSQLineDel(bi->nick); } /* We check whether user with this nick is online, and kill it if so */ @@ -324,7 +324,7 @@ int do_bot(User * u) "Quit: Help! I'm being deleted by %s!", u->nick); if (ircd->sqline) { - anope_cmd_unsqline(bi->nick); + anope_SendSQLineDel(bi->nick); } delete bi; diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 43305c158..61aad543a 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -104,7 +104,7 @@ int do_drop(User * u) } if (ircd->chansqline && (ci->flags & CI_VERBOTEN)) { - anope_cmd_unsqline(ci->name); + anope_SendSQLineDel(ci->name); } alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)", @@ -117,7 +117,7 @@ int do_drop(User * u) * drop the channel before issuing the wallops. */ if (WallDrop && is_servadmin && level < ACCESS_FOUNDER) - anope_cmd_global(s_ChanServ, + anope_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 ac9073185..599f51605 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_cmd_global(s_ChanServ, + anope_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 df2ce9b2d..de699e135 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -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_cmd_global(s_ChanServ, + anope_SendGlobops(s_ChanServ, "\2%s\2 used GETPASS on channel \2%s\2", u->nick, chan); } diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 60e92fb80..5e538d791 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -84,7 +84,7 @@ int do_invite(User * u) } else if (!u || !check_access(u, ci, CA_INVITE)) { notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else { - anope_cmd_invite(whosends(ci), chan, u->nick); + anope_SendInvite(whosends(ci), chan, u->nick); } return MOD_CONT; } diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 0616e933b..67c1b5f99 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -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_cmd_global(s_ChanServ, + anope_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 b379d8e24..855e6b531 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_cmd_global(s_ChanServ, + anope_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_cmd_global(s_ChanServ, + anope_SendGlobops(s_ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 0a7854f69..a8c9533a7 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -103,7 +103,7 @@ int do_cs_topic(User * u) s_ChanServ, u->nick, u->username, u->host, c->name); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_cmd_join(s_ChanServ, c->name, c->creation_time); + anope_SendJoin(s_ChanServ, c->name, c->creation_time); anope_SendMode(NULL, c->name, "+o %s", s_ChanServ); } } @@ -111,7 +111,7 @@ int do_cs_topic(User * u) c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { - anope_cmd_part(s_ChanServ, c->name, NULL); + anope_SendPart(s_ChanServ, c->name, NULL); } } } diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index e191a8395..416ecd58d 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_cmd_global(s_NickServ, + anope_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)", @@ -120,7 +120,7 @@ int do_drop(User * u) notice_lang(s_NickServ, u, READ_ONLY_MODE); if (ircd->sqline && (na->status & NS_VERBOTEN)) { - anope_cmd_unsqline(na->nick); + anope_SendSQLineDel(na->nick); } alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)", @@ -132,7 +132,7 @@ int do_drop(User * u) if (!is_mine) { if (WallDrop) - anope_cmd_global(s_NickServ, "\2%s\2 used DROP on \2%s\2", + anope_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 6612be06e..ce26af71 |