Fix bug #113

[user/henk/code/inspircd.git] / src / whois.cpp

diff --git a/src/whois.cpp b/src/whois.cpp
index 1f21553c5b1ca89ee9e2e4baa5dce10d336ed8db..27b07c9444b0b65ae771782097ac1f32e09339c6 100644 (file)
--- a/src/whois.cpp
+++ b/src/whois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,15 +22,19 @@ void InspIRCd::DoWhois(User* user, User* dest,unsigned long signon, unsigned lon
        }
 
        std::string cl = dest->ChannelList(user, false);
+       const ServerConfig::OperSpyWhoisState state = user->HasPrivPermission("users/auspex") ? ServerInstance->Config->OperSpyWhois : ServerConfig::SPYWHOIS_NONE;
 
-       if (cl.length())
-               user->SplitChanList(dest,cl);
-       if (IS_OPER(user) && ServerInstance->Config->OperSpyWhois)
+       if (state == ServerConfig::SPYWHOIS_SINGLEMSG)
+               cl.append(dest->ChannelList(user, true));
+
+       user->SplitChanList(dest,cl);
+
+       if (state == ServerConfig::SPYWHOIS_SPLITMSG)
        {
                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());
+                       SendWhoisLine(user, dest, 336, "%s %s :is on private/secret channels:",user->nick.c_str(), dest->nick.c_str());
                        user->SplitChanList(dest,scl);
                }
        }