Made many of the functions in IRCDProto accept the relative object pointers instea of char* everywhere, and updated TODO

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2706 5417fbe8-f217-4b02-8779-1006273d7864

55 files changed, 306 insertions, 348 deletions

diff --git a/src/actions.c b/src/actions.c
index 37bf95798..76ddb435b 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -65,7 +65,7 @@ void kill_user(const char *source, const char *user, const char *reason)
 
 	snprintf(buf, sizeof(buf), "%s (%s)", source, reason);
 
-	ircdproto->SendSVSKill(source, user, buf);
+	ircdproto->SendSVSKill(findbot(source), finduser(user), buf);
 
 	if (!ircd->quitonkill && finduser(user)) {
 		do_kill(user, buf);
@@ -106,8 +106,7 @@ void sqline(char *mask, char *reason)
 						av[0] = c->name;
 						av[1] = cu->user->nick;
 						av[2] = reason;
-						ircdproto->SendKick(findbot(Config.s_OperServ), av[0], av[1],
-									   "Q-Lined: %s", av[2]);
+						ircdproto->SendKick(findbot(Config.s_OperServ), c, cu->user, "Q-Lined: %s", av[2]);
 						do_kick(Config.s_ChanServ, 3, av);
 					}
 				}
@@ -161,7 +160,7 @@ void common_unban(ChannelInfo * ci, char *nick)
 		ip = str_is_ip(host);
 
 	if (ircd->svsmode_unban)
-		ircdproto->SendBanDel(ci->name, nick);
+		ircdproto->SendBanDel(ci->c, nick);
 	else
 	{
 		for (ban = ci->c->bans->entries; ban; ban = next)
diff --git a/src/bots.cpp b/src/bots.cpp
index ff439e6d4..cae202bf2 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -167,9 +167,9 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci)
 	if (ci->c && ci->c->usercount >= Config.BSMinUsers)
 	{
 		if (u)
-			ircdproto->SendPart(ci->bi, ci->name, "UNASSIGN from %s", u->nick);
+			ircdproto->SendPart(ci->bi, ci->c, "UNASSIGN from %s", u->nick);
 		else
-			ircdproto->SendPart(ci->bi, ci->name, "");
+			ircdproto->SendPart(ci->bi, ci->c, "");
 	}
 
 	ci->bi->chancount--;
diff --git a/src/botserv.c b/src/botserv.c
index 9a8229d6c..9dc7e3ed1 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -644,7 +644,7 @@ void bot_join(ChannelInfo * ci)
 		/* Should we be invited? */
 		if (ci->c->HasMode(CMODE_INVITE)
 			|| (limit && ci->c->usercount >= limit))
-			ircdproto->SendNoticeChanops(ci->bi, ci->c->name,
+			ircdproto->SendNoticeChanops(ci->bi, ci->c,
 				 "%s invited %s into the channel.",
 				 ci->bi->nick, ci->bi->nick);
 	}
@@ -708,7 +708,7 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...)
 	av[0] = ci->name;
 	av[1] = u->nick;
 	av[2] = buf;
-	ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
+	ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]);
 	do_kick(ci->bi->nick, 3, av);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, buf));
 }
@@ -765,10 +765,9 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
 
 	/* Check if we need to do a signkick or not -GD */
 	if ((ci->HasFlag(CI_SIGNKICK) || ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(requester, ci, CA_SIGNKICK))
-		ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s (%s)", kav[2],
-					   requester->nick);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", kav[2], requester->nick);
 	else
-		ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s", kav[2]);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s", kav[2]);
 
 	do_kick(ci->bi->nick, 3, kav);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, kav[2]));
@@ -811,10 +810,9 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick,
 	}
 
 	if (ci->HasFlag(CI_SIGNKICK) || ((ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(requester, ci, CA_SIGNKICK)))
-		ircdproto->SendKick(ci->bi, av[0], av[1], "%s (%s)", av[2],
-					   requester->nick);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s (%s)", av[2], requester->nick);
 	else
-		ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
+		ircdproto->SendKick(ci->bi, ci->c, u, "%s", av[2]);
 	do_kick(ci->bi->nick, 3, av);
 	FOREACH_MOD(I_OnBotKick, OnBotKick(u, ci, av[2]));
 }
diff --git a/src/channels.c b/src/channels.c
index 2115d2658..997432d88 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -319,7 +319,7 @@ void Channel::RemoveModeInternal(ChannelMode *cm, const std::string &param, bool
 	{
 		ci->UnsetFlag(CI_PERSIST);
 		if (Config.s_BotServ && ci->bi && usercount == Config.BSMinUsers - 1)
-			ircdproto->SendPart(ci->bi, name, NULL);
+			ircdproto->SendPart(ci->bi, this, NULL);
 		if (!users)
 			delete this;
 	}
@@ -735,7 +735,7 @@ void chan_deluser(User * user, Channel * c)
 		return;
 
 	if (Config.s_BotServ && c->ci && c->ci->bi && c->usercount == Config.BSMinUsers - 1)
-		ircdproto->SendPart(c->ci->bi, c->name, NULL);
+		ircdproto->SendPart(c->ci->bi, c, NULL);
 
 	if (!c->users)
 		delete c;
@@ -1318,7 +1318,7 @@ void do_sjoin(const char *source, int ac, const char **av)
 				if (c->ci->bi)
 				{
 					/* This is ugly, but it always works */
-					ircdproto->SendPart(c->ci->bi, c->name, "TS reop");
+					ircdproto->SendPart(c->ci->bi, c, "TS reop");
 					bot_join(c->ci);
 				}
 				/* Make sure +r is set */
@@ -1425,7 +1425,7 @@ void do_sjoin(const char *source, int ac, const char **av)
 			}
 
 			if (is_sqlined && !is_oper(user)) {
-				ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined");
+				ircdproto->SendKick(findbot(Config.s_OperServ), c, user, "Q-Lined");
 			} else {
 				if (!check_kick(user, av[1], ts)) {
 					FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1]));
@@ -1511,7 +1511,7 @@ void do_sjoin(const char *source, int ac, const char **av)
 			}
 
 			if (is_sqlined && !is_oper(user)) {
-				ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined");
+				ircdproto->SendKick(findbot(Config.s_OperServ), c, user, "Q-Lined");
 			} else {
 				if (!check_kick(user, av[1], ts)) {
 					FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1]));
@@ -1586,7 +1586,7 @@ void do_sjoin(const char *source, int ac, const char **av)
 			}
 
 			if (is_sqlined && !is_oper(user)) {
-				ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined");
+				ircdproto->SendKick(findbot(Config.s_OperServ), c, user, "Q-Lined");
 			} else {
 				if (!check_kick(user, av[1], ts)) {
 					FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1]));
@@ -1644,7 +1644,7 @@ void do_sjoin(const char *source, int ac, const char **av)
 		}
 
 		if (is_sqlined && !is_oper(user)) {
-			ircdproto->SendKick(findbot(Config.s_OperServ), av[1], user->nick, "Q-Lined");
+			ircdproto->SendKick(findbot(Config.s_OperServ), c, user, "Q-Lined");
 		} else {
 			FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1]));
 
@@ -2047,7 +2047,7 @@ Channel *join_user_update(User * user, Channel * chan, const char *name,
 				if (chan->ci->bi)
 				{
 					/* This is ugly, but it always works */
-					ircdproto->SendPart(chan->ci->bi, chan->name, "TS reop");
+					ircdproto->SendPart(chan->ci->bi, chan, "TS reop");
 					bot_join(chan->ci);
 				}
 				/* Make sure +r is set */
diff --git a/src/chanserv.c b/src/chanserv.c
index c85efc259..941925b1b 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -136,7 +136,8 @@ class ChanServTimer : public Timer
 			if (ci)
 				ci->UnsetFlag(CI_INHABIT);
 
-			ircdproto->SendPart(findbot(Config.s_ChanServ), channel.c_str(), NULL);
+			if (ci->c)
+				ircdproto->SendPart(findbot(Config.s_ChanServ), ci->c, NULL);
 		}
 };
 
@@ -722,7 +723,8 @@ int check_kick(User * user, const char *chan, time_t chants)
 	}
 
 	c->SetMode(NULL, CMODE_BAN, mask);
-	ircdproto->SendKick(whosends(ci), chan, user->nick, "%s", reason);
+	if (c)
+		ircdproto->SendKick(whosends(ci), c, user, "%s", reason);
 
 	return 1;
 }
@@ -793,11 +795,10 @@ void restore_topic(const char *chan)
 			c->SetMode(NULL, CMODE_OP, Config.s_ChanServ);
 		}
 	}
-	ircdproto->SendTopic(whosends(ci), c->name, c->topic_setter,
-					c->topic ? c->topic : "", c->topic_time);
+	ircdproto->SendTopic(whosends(ci), c, c->topic_setter, c->topic ? c->topic : "");
 	if (ircd->join2set) {
 		if (whosends(ci) == findbot(Config.s_ChanServ)) {
-			ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL);
+			ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL);
 		}
 	}
 }
@@ -856,12 +857,11 @@ int check_topiclock(Channel * c, time_t topic_time)
 		}
 	}
 
-	ircdproto->SendTopic(whosends(ci), c->name, c->topic_setter,
-					c->topic ? c->topic : "", c->topic_time);
+	ircdproto->SendTopic(whosends(ci), c, c->topic_setter, c->topic ? c->topic : "");
 
 	if (ircd->join2set) {
 		if (whosends(ci) == findbot(Config.s_ChanServ)) {
-			ircdproto->SendPart(findbot(Config.s_ChanServ), c->ci->name, NULL);
+			ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL);
 		}
 	}
 	return 1;
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 81a1c5124..f6fb4f092 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -78,10 +78,9 @@ class CommandCSBan : public Command
 			if ((ci->HasFlag(CI_SIGNKICK))
 				|| ((ci->HasFlag(CI_SIGNKICK_LEVEL))
 					&& !check_access(u, ci, CA_SIGNKICK)))
-				ircdproto->SendKick(whosends(ci), ci->name, target, "%s (%s)",
-								 reason, u->nick);
+				ircdproto->SendKick(whosends(ci), ci->c, u2, "%s (%s)", reason, u->nick);
 			else
-				ircdproto->SendKick(whosends(ci), ci->name, target, "%s", reason);
+				ircdproto->SendKick(whosends(ci), ci->c, u2, "%s", reason);
 
 			const char *kav[4];
 			 kav[0] = ci->name;
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index fa82c9f11..cc8208829 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -68,18 +68,18 @@ class CommandCSClear : public Command
 
 			if (ircd->svsmode_ucmode) {
 				av[0] = chan;
-				ircdproto->SendSVSModeChan(av[0], "-o", NULL);
+				ircdproto->SendSVSModeChan(c, "-o", NULL);
 				if (owner) {
 					modebuf = '-';
 					modebuf += owner->ModeChar;
 
-					ircdproto->SendSVSModeChan(av[0], modebuf.c_str(), NULL);
+					ircdproto->SendSVSModeChan(c, modebuf.c_str(), NULL);
 				}
 				if (admin) {
 					modebuf = '-';
 					modebuf += admin->ModeChar;
 
-					ircdproto->SendSVSModeChan(av[0], modebuf.c_str(), NULL);
+					ircdproto->SendSVSModeChan(c, modebuf.c_str(), NULL);
 				}
 				for (cu = c->users; cu; cu = bnext)
 				{
@@ -159,7 +159,7 @@ class CommandCSClear : public Command
 				av[0] = sstrdup(chan);
 				av[1] = sstrdup(cu->user->nick);
 				av[2] = sstrdup(buf);
-				ircdproto->SendKick(whosends(ci), av[0], av[1], av[2]);
+				ircdproto->SendKick(whosends(ci), c, cu->user, av[2]);
 				do_kick(Config.s_ChanServ, 3, av);
 				delete [] av[2];
 				delete [] av[1];
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 561f79e6f..82ffc2a1f 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -81,7 +81,7 @@ class CommandCSDrop : public Command
 		 */
 		if (Config.WallDrop) {
 			if ((level < ACCESS_FOUNDER) || (!IsRealFounder(u, ci) && ci->HasFlag(CI_SECUREFOUNDER)))
-				ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick, chan);
+				ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used DROP on channel \2%s\2", u->nick, chan);
 		}
 
 		notice_lang(Config.s_ChanServ, u, CHAN_DROPPED, chan);
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 61b045cd9..9c1690fe2 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -85,13 +85,13 @@ class CommandCSForbid : public Command
 				av[0] = c->name;
 				av[1] = cu->user->nick;
 				av[2] = reason ? reason : getstring(cu->user->nc, CHAN_FORBID_REASON);
-				ircdproto->SendKick(findbot(Config.s_ChanServ), av[0], av[1], av[2]);
+				ircdproto->SendKick(findbot(Config.s_ChanServ), c, cu->user, av[2]);
 				do_kick(Config.s_ChanServ, 3, av);
 			}
 		}
 
 		if (Config.WallForbid)
-			ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name);
+			ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name);
 
 		if (ircd->chansqline)
 		{
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 5239d53cb..93d42620a 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -68,10 +68,10 @@ class CommandCSKick : public Command
 			if ((ci->HasFlag(CI_SIGNKICK))
 				|| ((ci->HasFlag(CI_SIGNKICK_LEVEL))
 					&& !check_access(u, ci, CA_SIGNKICK)))
-				ircdproto->SendKick(whosends(ci), ci->name, target, "%s (%s)",
+				ircdproto->SendKick(whosends(ci), ci->c, u2, "%s (%s)",
 								 reason, u->nick);
 			else
-				ircdproto->SendKick(whosends(ci), ci->name, target, "%s", reason);
+				ircdproto->SendKick(whosends(ci), ci->c, u2, "%s", reason);
 			av[0] = ci->name;
 			av[1] = target;
 			av[2] = reason;
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 40cdd287d..1ac511e17 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -589,7 +589,7 @@ class CommandCSSet : public Command
 				else if (ci->c)
 				{
 					if (Config.s_BotServ && ci->bi && ci->c->usercount == Config.BSMinUsers - 1)
-						ircdproto->SendPart(ci->bi, ci->c->name, NULL);
+						ircdproto->SendPart(ci->bi, ci->c, NULL);
 					if (!ci->c->users)
 						delete ci->c;
 
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index ddad30930..8976ba745 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -75,13 +75,13 @@ class CommandCSSuspend : public Command
 					av[0] = c->name;
 					av[1] = cu->user->nick;
 					av[2] = reason ? reason : getstring(cu->user->nc, CHAN_SUSPEND_REASON);
-					ircdproto->SendKick(findbot(Config.s_ChanServ), av[0], av[1], av[2]);
+					ircdproto->SendKick(findbot(Config.s_ChanServ), c, cu->user, av[2]);
 					do_kick(Config.s_ChanServ, 3, av);
 				}
 			}
 
 			if (Config.WallForbid)
-				ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name);
+				ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name);
 
 			alog("%s: %s set SUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name);
 			notice_lang(Config.s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan);
@@ -151,7 +151,7 @@ class CommandCSUnSuspend : public Command
 			}
 
 			if (Config.WallForbid)
-				ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name);
+				ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name);
 
 			alog("%s: %s set UNSUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name);
 			notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan);
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index d570fa827..2187a61e1 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -61,9 +61,9 @@ class CommandCSTopic : public Command
 				ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time);
 				ircdproto->SendMode(NULL, c->name, "+o %s", Config.s_ChanServ);
 			}
-			ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "", c->topic_time);
+			ircdproto->SendTopic(whosends(ci), c, u->nick, topic ? topic : "");
 			if (ircd->join2set && whosends(ci) == findbot(Config.s_ChanServ))
-				ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL);
+				ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL);
 		}
 		return MOD_CONT;
 	}
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 985ce3e13..aaddbf28d 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -37,7 +37,7 @@ class CommandHSOn : public Command
 				notice_lang(Config.s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost);
 			else
 				notice_lang(Config.s_HostServ, u, HOST_ACTIVATED, vHost);
-			ircdproto->SendVhost(u->nick, vIdent, vHost);
+			ircdproto->SendVhost(u, vIdent, vHost);
 			if (ircd->vhost)
 			{
 				if (u->vhost)
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 096fb09af..064390cbd 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -43,7 +43,7 @@ class CommandNSDrop : public Command
 				if ((nr = findrequestnick(nick)) && u->nc->IsServicesOper())
 				{
 					if (Config.WallDrop)
-						ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick);
+						ircdproto->SendGlobops(findbot(Config.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)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nr->nick, nr->email);
 					delete nr;
 					notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick);
@@ -80,7 +80,7 @@ class CommandNSDrop : public Command
 			if (!is_mine)
 			{
 				if (Config.WallDrop)
-					ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick);
+					ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used DROP on \2%s\2", u->nick, nick);
 				notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick);
 			}
 			else
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 68deea161..f45dadceb 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -71,7 +71,7 @@ class CommandNSForbid : public Command
 				ircdproto->SendSQLine(na->nick, reason ? reason : "Forbidden");
 
 			if (Config.WallForbid)
-				ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick, nick);
+				ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used FORBID on \2%s\2", u->nick, nick);
 
 			alog("%s: %s set FORBID for nick %s", Config.s_NickServ, u->nick, nick);
 			notice_lang(Config.s_NickServ, u, NICK_FORBID_SUCCEEDED, nick);
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index ac52ccac9..8f4600814 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -35,7 +35,7 @@ class CommandNSGetPass : public Command
 			{
 				alog("%s: %s!%s@%s used GETPASS on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick);
 				if (Config.WallGetpass)
-					ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick);
+					ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used GETPASS on \2%s\2", u->nick, nick);
 				notice_lang(Config.s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick, nr->passcode);
 			}
 			else
@@ -51,7 +51,7 @@ class CommandNSGetPass : public Command
 			{
 				alog("%s: %s!%s@%s used GETPASS on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick);
 				if (Config.WallGetpass)
-					ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick);
+					ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used GETPASS on \2%s\2", u->nick, nick);
 				notice_lang(Config.s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick, tmp_pass);
 			}
 			else
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 54f0608b0..28ba915bd 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -95,7 +95,7 @@ private:
 
 		alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->display, nc->email ? nc->email : "none");
 		if (Config.WallSetpass)
-			ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick, nc->display);
+			ircdproto->SendGlobops(findbot(Config.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 c7a1690ae..330e96222 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -79,7 +79,7 @@ class CommandNSSuspend : public Command
 			}
 
 			if (Config.WallForbid)
-				ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick, nick);
+				ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used SUSPEND on \2%s\2", u->nick, nick);
 
 			alog("%s: %s set SUSPEND for nick %s", Config.s_NickServ, u->nick, nick);
 			notice_lang(Config.s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick);
@@ -147,7 +147,7 @@ class CommandNSUnSuspend : public Command
 			na->nc->UnsetFlag(NI_SUSPENDED);
 
 			if (Config.WallForbid)
-				ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick, nick);
+				ircdproto->SendGlobops(findbot(Config.s_NickServ), "\2%s\2 used UNSUSPEND on \2%s\2", u->nick, nick);
 
 			alog("%s: %s set UNSUSPEND for nick %s", Config.s_NickServ, u->nick, nick);
 			notice_lang(Config.s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick);
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index ae36ad5da..7561cb0e6 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -129,7 +129,7 @@ class CommandOSAKill : public Command
 					snprintf(buf, sizeof(buf), "expires in %d