1) Fix for nickname overruled with new cullList stuff -- we have to change their...

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index c0c5b97a3eb0575bcbb50c0bbe9b3f5c5e5711bc..8c8af78af6aa35a2ab692c7de2d8e4d6487c6fee 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -26,10 +23,10 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
        // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
        if (dest->registered == REG_ALL)
        {
-               user->WriteServ("311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
+               ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
                if ((user == dest) || (*user->oper))
                {
-                       user->WriteServ("378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
+                       ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
                }
                std::string cl = dest->ChannelList(user);
                if (cl.length())
@@ -40,45 +37,44 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
                        }
                        else
                        {
-                               user->WriteServ("319 %s %s :%s",user->nick, dest->nick, cl.c_str());
+                               ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick, dest->nick, cl.c_str());
                        }
                }
                if (*ServerInstance->Config->HideWhoisServer && !(*user->oper))
                {
-                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
+                       ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
                }
                else
                {
-                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
+                       ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
                }
                if (*dest->awaymsg)
                {
-                       user->WriteServ("301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
+                       ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick, dest->nick, dest->awaymsg);
                }
                if (*dest->oper)
                {
-                       user->WriteServ("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 ((!signon) && (!idle))
-               {
-                       FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+                       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);
                }
+
+               FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+
                if (!strcasecmp(user->server,dest->server))
                {
                        // idle time and signon line can only be sent if youre on the same server (according to RFC)
-                       user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-ServerInstance->Time()), dest->signon);
+                       ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-ServerInstance->Time()), dest->signon);
                }
                else
                {
                        if ((idle) || (signon))
-                               user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+                               ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
                }
-               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
+               ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, dest->nick);
        }
        else
        {
-               user->WriteServ("401 %s %s :No such nick/channel",user->nick, *nick ? nick : "*");
-               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
+               ServerInstance->SendWhoisLine(user, dest, 401, "%s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+               ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
        }
 }