mirror of
https://github.com/anope/anope.git
synced 2026-07-01 10:26:38 +02:00
Replaced anope_SendSVSMode_chan() with direct call to SendSVSModeChan() in IRCDProto class.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1363 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
@@ -1124,7 +1124,6 @@ E void anope_cmd_svinfo(); /* SVINFO */
|
||||
E void anope_cmd_svsadmin(const char *server, int set); /* SVSADMIN */
|
||||
E void anope_cmd_svsinfo(); /* SVSINFO */
|
||||
E void anope_SendSVSJoin(const char *source, const char *nick,const char *chan, const char *param); /* SVSJOIN */
|
||||
E void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick); /* SVSMODE */
|
||||
E void anope_SendSVSPart(const char *source, const char *nick,const char *chan); /* SVSPART */
|
||||
E void anope_SendSWhois(const char *source, const char *who, const char *mask); /* SWHOIS */
|
||||
E void anope_SendEOB(); /* EOB - end of burst */
|
||||
|
||||
+1
-1
@@ -1452,7 +1452,7 @@ class IRCDProto {
|
||||
virtual void SendSZLine(const char *, const char *, const char *) { }
|
||||
virtual void SendSGLine(const char *, const char *) { }
|
||||
virtual void SendBanDel(const char *, const char *) { }
|
||||
virtual void SendSVSMode_chan(const char *, const char *, const char *) { }
|
||||
virtual void SendSVSModeChan(const char *, const char *, const char *) { }
|
||||
virtual void SendSVID(const char *, time_t) { }
|
||||
virtual void SendUnregisteredNick(User *) { }
|
||||
virtual void SendSVID2(User *, const char *) { }
|
||||
|
||||
+7
-7
@@ -177,12 +177,12 @@ int do_clear(User * u)
|
||||
|
||||
if (ircd->svsmode_ucmode) {
|
||||
av[0] = chan;
|
||||
anope_SendSVSMode_chan(av[0], "-o", NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], "-o", NULL);
|
||||
if (ircd->owner) {
|
||||
anope_SendSVSMode_chan(av[0], ircd->ownerunset, NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], ircd->ownerunset, NULL);
|
||||
}
|
||||
if (ircd->protect || ircd->admin) {
|
||||
anope_SendSVSMode_chan(av[0], ircd->adminunset, NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], ircd->adminunset, NULL);
|
||||
}
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
@@ -284,9 +284,9 @@ int do_clear(User * u)
|
||||
|
||||
if (ircd->svsmode_ucmode) {
|
||||
if (ircdcap->tsmode)
|
||||
anope_SendSVSMode_chan(av[0], av[2], NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], av[2], NULL);
|
||||
else
|
||||
anope_SendSVSMode_chan(av[0], av[1], NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], av[1], NULL);
|
||||
|
||||
do_cmode(s_ChanServ, ac, av);
|
||||
break;
|
||||
@@ -328,9 +328,9 @@ int do_clear(User * u)
|
||||
|
||||
if (ircd->svsmode_ucmode) {
|
||||
if (ircdcap->tsmode)
|
||||
anope_SendSVSMode_chan(av[0], av[2], NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], av[2], NULL);
|
||||
else
|
||||
anope_SendSVSMode_chan(av[0], av[1], NULL);
|
||||
ircdproto->SendSVSModeChan(av[0], av[1], NULL);
|
||||
|
||||
do_cmode(s_ChanServ, ac, av);
|
||||
break;
|
||||
|
||||
@@ -105,7 +105,7 @@ int do_clearmodes(User * u)
|
||||
if (all) {
|
||||
/* Clear mode +o */
|
||||
if (ircd->svsmode_ucmode) {
|
||||
anope_SendSVSMode_chan(c->name, "-o", NULL);
|
||||
ircdproto->SendSVSModeChan(c->name, "-o", NULL);
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
if (!chan_has_user_status(c, cu->user, CUS_OP)) {
|
||||
@@ -129,7 +129,7 @@ int do_clearmodes(User * u)
|
||||
}
|
||||
|
||||
if (ircd->svsmode_ucmode) {
|
||||
anope_SendSVSMode_chan(c->name, "-v", NULL);
|
||||
ircdproto->SendSVSModeChan(c->name, "-v", NULL);
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
if (!chan_has_user_status(c, cu->user, CUS_VOICE)) {
|
||||
@@ -155,7 +155,7 @@ int do_clearmodes(User * u)
|
||||
|
||||
/* Clear mode +h */
|
||||
if (ircd->svsmode_ucmode && ircd->halfop) {
|
||||
anope_SendSVSMode_chan(c->name, "-h", NULL);
|
||||
ircdproto->SendSVSModeChan(c->name, "-h", NULL);
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
|
||||
@@ -179,7 +179,7 @@ int do_clearmodes(User * u)
|
||||
}
|
||||
/* Clear mode Owners */
|
||||
if (ircd->svsmode_ucmode && ircd->owner) {
|
||||
anope_SendSVSMode_chan(c->name, ircd->ownerunset, NULL);
|
||||
ircdproto->SendSVSModeChan(c->name, ircd->ownerunset, NULL);
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
|
||||
@@ -204,7 +204,7 @@ int do_clearmodes(User * u)
|
||||
/* Clear mode protected or admins */
|
||||
if (ircd->svsmode_ucmode && (ircd->protect || ircd->admin)) {
|
||||
|
||||
anope_SendSVSMode_chan(c->name, ircd->adminunset, NULL);
|
||||
ircdproto->SendSVSModeChan(c->name, ircd->adminunset, NULL);
|
||||
for (cu = c->users; cu; cu = next) {
|
||||
next = cu->next;
|
||||
if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
|
||||
|
||||
@@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
|
||||
ircdproto->ProcessUsermodes(user, ac, av);
|
||||
}
|
||||
|
||||
void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick)
|
||||
{
|
||||
ircdproto->SendSVSMode_chan(name, mode, nick);
|
||||
}
|
||||
|
||||
void anope_SendSVID(const char *nick, time_t ts)
|
||||
{
|
||||
ircdproto->SendSVID(nick, ts);
|
||||
|
||||
@@ -474,13 +474,13 @@ void BahamutIRCdProto::SendSVSHoldDel(const char *nick)
|
||||
/* SVSMODE -b */
|
||||
void BahamutIRCdProto::SendBanDel(const char *name, const char *nick)
|
||||
{
|
||||
SendSVSMode_chan(name, "-b", nick);
|
||||
SendSVSModeChan(name, "-b", nick);
|
||||
}
|
||||
|
||||
|
||||
/* SVSMODE channel modes */
|
||||
|
||||
void BahamutIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const char *nick)
|
||||
void BahamutIRCdProto::SendSVSModeChan(const char *name, const char *mode, const char *nick)
|
||||
{
|
||||
if (nick) send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick);
|
||||
else send_cmd(ServerName, "SVSMODE %s %s", name, mode);
|
||||
|
||||
@@ -83,7 +83,7 @@ class BahamutIRCdProto : public IRCDProto {
|
||||
void SendSZLine(const char *, const char *, const char *);
|
||||
void SendSGLine(const char *, const char *);
|
||||
void SendBanDel(const char *, const char *);
|
||||
void SendSVSMode_chan(const char *, const char *, const char *);
|
||||
void SendSVSModeChan(const char *, const char *, const char *);
|
||||
void SendSVID(const char *, time_t);
|
||||
void SendUnregisteredNick(User *);
|
||||
void SendSVID3(User *, const char *);
|
||||
|
||||
@@ -1165,13 +1165,13 @@ void UnrealIRCdProto::SendSGLine(const char *mask, const char *reason)
|
||||
/* SVSMODE -b */
|
||||
void UnrealIRCdProto::SendBanDel(const char *name, const char *nick)
|
||||
{
|
||||
SendSVSMode_chan(name, "-b", nick);
|
||||
SendSVSModeChan(name, "-b", nick);
|
||||
}
|
||||
|
||||
|
||||
/* SVSMODE channel modes */
|
||||
|
||||
void UnrealIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const char *nick)
|
||||
void UnrealIRCdProto::SendSVSModeChan(const char *name, const char *mode, const char *nick)
|
||||
{
|
||||
if (nick) send_cmd(ServerName, "%s %s %s %s", send_token("SVSMODE", "n"), name, mode, nick);
|
||||
else send_cmd(ServerName, "%s %s %s", send_token("SVSMODE", "n"), name, mode);
|
||||
|
||||
@@ -109,7 +109,7 @@ class UnrealIRCdProto : public IRCDProto {
|
||||
void SendSZLine(const char *, const char *, const char *);
|
||||
void SendSGLine(const char *, const char *);
|
||||
void SendBanDel(const char *, const char *);
|
||||
void SendSVSMode_chan(const char *, const char *, const char *);
|
||||
void SendSVSModeChan(const char *, const char *, const char *);
|
||||
void SendSVID(const char *, time_t);
|
||||
void SendUnregisteredNick(User *);
|
||||
void SendSVID2(User *, const char *);
|
||||
|
||||
Reference in New Issue
Block a user