X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_whois.cpp;h=d732bd7715e9651140c47c984c9738dd3822b312;hb=436fad2bf0fb122470a47a1453fa24b446104a8f;hp=29264348c3f9138cd7944d2ea2be3a0554690219;hpb=b22124cbc3f4fb365a743cd5d5bb76223e48eeed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 29264348c..d732bd771 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,7 +27,7 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
 	if (dest->registered == REG_ALL)
 	{
 		ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->dhost.c_str(), dest->fullname.c_str());
-		if (user == dest || IS_OPER(user))
+		if (user == dest || user->HasPrivPermission("users/auspex"))
 		{
 			ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->host.c_str(), dest->GetIPString());
 		}
@@ -45,7 +45,7 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
 				ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), cl.c_str());
 			}
 		}
-		if (*ServerInstance->Config->HideWhoisServer && !IS_OPER(user))
+		if (*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex"))
 		{
 			ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
 		}
@@ -64,9 +64,9 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
 			ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick.c_str(), dest->nick.c_str(), (strchr("AEIOUaeiou",dest->oper[0]) ? "an" : "a"),irc::Spacify(dest->oper.c_str()), ServerInstance->Config->Network);
 		}
 
-		if (user == dest || IS_OPER(user))
+		if (user == dest || user->HasPrivPermission("users/auspex"))
 		{
-			if (dest->modes[UM_SNOMASK] != 0)
+			if (dest->IsModeSet('s') != 0)
 			{
 				ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s +%s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes(), dest->FormatNoticeMasks());
 			}