Send usermodes on whois if user is self or opered

[user/henk/code/inspircd.git] / src / commands / cmd_whois.cpp

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index b0ce2b320fd7c889cfa9edbd50eeeb91f25588e7..a10f170f1db9f848780728680ca404940be4b008 100644 (file)
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -64,6 +64,18 @@ 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, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network);
                }
 
+               if (user == dest || IS_OPER(user))
+               {
+                       if (dest->modes[UM_SNOMASK] != 0)
+                       {
+                               ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s +%s", user->nick, dest->nick, dest->FormatModes(), dest->FormatNoticeMasks());
+                       }
+                       else
+                       {
+                               ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s", user->nick, dest->nick, dest->FormatModes());
+                       }
+               }
+
                FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
 
                /*
@@ -72,7 +84,7 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
                 */
                if ((idle) || (signon))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+                       ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %lu %lu :seconds idle, signon time",user->nick, dest->nick, idle, signon);
                }
 
                ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, dest->nick);