From bcaf406747ea0456e97f40ba09f76223dd246581 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 27 Feb 2011 16:47:23 -0500 Subject: Made akills work on IRCds that do not support bans (ngircd) --- include/operserv.h | 16 +++++++--------- include/services.h | 10 +++++----- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/operserv.h b/include/operserv.h index f40815a45..f039b6107 100644 --- a/include/operserv.h +++ b/include/operserv.h @@ -97,10 +97,6 @@ class CoreExport XLineManager */ static std::pair CheckAll(User *u); - /** Called on burst when all of our XLines should be bursted to the uplink - */ - static void Burst(); - /** Get the number of XLines in this XLineManager * @return The number of XLines */ @@ -184,8 +180,10 @@ class CoreExport XLineManager virtual void OnExpire(XLine *x); /** Called to send an XLine to the IRCd + * @param u The user, if we know it + * @param x The xline */ - virtual void Send(XLine *x) = 0; + virtual void Send(User *u, XLine *x) = 0; }; /* This is for AKILLS */ @@ -200,7 +198,7 @@ class SGLineManager : public XLineManager void OnExpire(XLine *x); - void Send(XLine *x); + void Send(User *u, XLine *x); }; class SNLineManager : public XLineManager @@ -214,7 +212,7 @@ class SNLineManager : public XLineManager void OnExpire(XLine *x); - void Send(XLine *x); + void Send(User *u, XLine *x); XLine *Check(User *u); }; @@ -230,7 +228,7 @@ class SQLineManager : public XLineManager void OnExpire(XLine *x); - void Send(XLine *x); + void Send(User *u, XLine *x); static bool Check(Channel *c); }; @@ -246,7 +244,7 @@ class SZLineManager : public XLineManager void OnExpire(XLine *x); - void Send(XLine *x); + void Send(User *u, XLine *x); }; #endif // OPERSERV_H diff --git a/include/services.h b/include/services.h index 646dbfbfe..58c512d0b 100644 --- a/include/services.h +++ b/include/services.h @@ -973,7 +973,7 @@ class CoreExport IRCDProto virtual void SendSVSNOOP(const Anope::string &, int) { } virtual void SendTopic(BotInfo *, Channel *) = 0; virtual void SendVhostDel(User *) { } - virtual void SendAkill(const XLine *) = 0; + virtual void SendAkill(User *, const XLine *) = 0; virtual void SendAkillDel(const XLine *) = 0; virtual void SendSVSKill(const BotInfo *source, const User *user, const char *fmt, ...); virtual void SendMode(const BotInfo *bi, const Channel *dest, const char *fmt, ...); @@ -992,11 +992,11 @@ class CoreExport IRCDProto virtual void SendPing(const Anope::string &servname, const Anope::string &who); virtual void SendPong(const Anope::string &servname, const Anope::string &who); virtual void SendJoin(BotInfo *, Channel *, const ChannelStatus *) = 0; - virtual void SendSQLineDel(const XLine *x) = 0; + virtual void SendSQLineDel(const XLine *x) { } virtual void SendInvite(const BotInfo *bi, const Anope::string &chan, const Anope::string &nick); virtual void SendPart(const BotInfo *bi, const Channel *chan, const char *fmt, ...); virtual void SendGlobops(const BotInfo *source, const char *fmt, ...); - virtual void SendSQLine(const XLine *x) = 0; + virtual void SendSQLine(User *, const XLine *x) { } virtual void SendSquit(const Anope::string &servname, const Anope::string &message); virtual void SendSVSO(const Anope::string &, const Anope::string &, const Anope::string &) { } virtual void SendChangeBotNick(const BotInfo *bi, const Anope::string &newnick); @@ -1007,8 +1007,8 @@ class CoreExport IRCDProto virtual void SendSVSHoldDel(const Anope::string &) { } virtual void SendSGLineDel(const XLine *) { } virtual void SendSZLineDel(const XLine *) { } - virtual void SendSZLine(const XLine *) { } - virtual void SendSGLine(const XLine *) { } + virtual void SendSZLine(User *u, const XLine *) { } + virtual void SendSGLine(User *, const XLine *) { } virtual void SendUnregisteredNick(const User *) { } virtual void SendCTCP(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...); virtual void SendSVSJoin(const Anope::string &, const Anope::string &, const Anope::string &, const Anope::string &) { } -- cgit