Allow use of absolute paths with m_nationalchars

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

diff --git a/src/whois.cpp b/src/whois.cpp
index 8f85d86cce7e60883c2a58022122a78212ab9fbd..27b07c9444b0b65ae771782097ac1f32e09339c6 100644 (file)
--- a/src/whois.cpp
+++ b/src/whois.cpp
@@ -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);
                }
        }