Move more stuff into userrec

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index e44757e6dc79230022392f41002e5d17856ebbeb..5f980750bc9d3c10c4308b56704ab1b62c291040 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -23,7 +23,7 @@
 #include "helperfuncs.h"
 #include "commands/cmd_whois.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern ModuleList modules;
@@ -43,40 +43,40 @@ const char* Spacify(char* n)
 void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
        // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
-       if (dest->registered == 7)
+       if (dest->registered == REG_ALL)
        {
-               WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
+               user->WriteServ("311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
                if ((user == dest) || (*user->oper))
                {
-                       WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, inet_ntoa(dest->ip4));
+                       user->WriteServ("378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
                }
-               std::string cl = chlist(dest,user);
+               std::string cl = dest->ChannelList(user);
                if (cl.length())
                {
                        if (cl.length() > 400)
                        {
-                               split_chlist(user,dest,cl);
+                               user->SplitChanList(dest,cl);
                        }
                        else
                        {
-                               WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl.c_str());
+                               user->WriteServ("319 %s %s :%s",user->nick, dest->nick, cl.c_str());
                        }
                }
-               if (*Config->HideWhoisServer && !(*user->oper))
+               if (*ServerInstance->Config->HideWhoisServer && !(*user->oper))
                {
-                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, Config->HideWhoisServer, Config->Network);
+                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
                }
                else
                {
-                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
+                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
                }
                if (*dest->awaymsg)
                {
-                       WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
+                       user->WriteServ("301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
                }
                if (*dest->oper)
                {
-                       WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), Config->Network);
+                       user->WriteServ("313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), ServerInstance->Config->Network);
                }
                if ((!signon) && (!idle))
                {
@@ -85,27 +85,28 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
                if (!strcasecmp(user->server,dest->server))
                {
                        // idle time and signon line can only be sent if youre on the same server (according to RFC)
-                       WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
+                       user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
                }
                else
                {
                        if ((idle) || (signon))
-                               WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+                               user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
                }
-               WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
+               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
        }
        else
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, nick);
-               WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, nick);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, nick);
+               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, nick);
        }
 }
 
 void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
+
        dest = Find(parameters[0]);
        if (dest)
        {
@@ -114,7 +115,7 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
        else
        {
                /* no such nick/channel */
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-               WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
        }
 }