From 950b9e70437ea1fe3ee5aafe8672fe3cbbe479ec Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 22 Mar 2010 22:30:21 +0000 Subject: Change to a tristate git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12653 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/whois.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/whois.cpp') diff --git a/src/whois.cpp b/src/whois.cpp index 8f85d86cc..4aa5e4726 100644 --- a/src/whois.cpp +++ b/src/whois.cpp @@ -23,16 +23,13 @@ void InspIRCd::DoWhois(User* user, User* dest,unsigned long signon, unsigned lon std::string cl = dest->ChannelList(user, false); - if (cl.length()) - user->SplitChanList(dest,cl); - if (IS_OPER(user) && ServerInstance->Config->OperSpyWhois) + user->SplitChanList(dest,cl); + if (user->HasPrivPermission("users/auspex") && ServerInstance->Config->OperSpyWhois != ServerConfig::SPYWHOIS_NONE) { std::string scl = dest->ChannelList(user, true); - if (scl.length()) - { - this->SendWhoisLine(user, dest, 336, "%s %s :is on private/secret channels:",user->nick.c_str(), dest->nick.c_str()); - user->SplitChanList(dest,scl); - } + if (scl.length() && ServerInstance->Config->OperSpyWhois == ServerConfig::SPYWHOIS_SPLITMSG) + SendWhoisLine(user, dest, 336, "%s %s :is on private/secret channels:",user->nick.c_str(), dest->nick.c_str()); + user->SplitChanList(dest,scl); } if (user != dest && !this->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")) { -- cgit v1.2.3