From 279e9acfaca41fe03e9d835a559e79844baadf3c Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 27 Jan 2007 16:19:06 +0000 Subject: fix so that OnWhois is triggered for remote whois, and remove smelly bold chars from m_botmode's numeric output. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6444 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_whois.cpp | 7 +++---- src/modules/m_botmode.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp index 58328b3cc..8c8af78af 100644 --- a/src/cmd_whois.cpp +++ b/src/cmd_whois.cpp @@ -56,10 +56,9 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo { ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network); } - if ((!signon) && (!idle)) - { - FOREACH_MOD(I_OnWhois,OnWhois(user,dest)); - } + + FOREACH_MOD(I_OnWhois,OnWhois(user,dest)); + if (!strcasecmp(user->server,dest->server)) { // idle time and signon line can only be sent if youre on the same server (according to RFC) diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 9ed7ef2ee..2f9a3fafd 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -89,7 +89,7 @@ class ModuleBotMode : public Module { if (dst->IsModeSet('B')) { - ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+ServerInstance->Config->Network); + ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network); } } -- cgit v1.2.3