So much stuff changed in this one, i forgot most of it.

[user/henk/code/inspircd.git] / src / modules / m_check.cpp

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index a00d32b9ef069b3321c89706e14100b529701c8b..180a989c950eeed9414e4cc9e7c2f8a69f97a764 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,15 +19,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "message.h"
 #include "commands.h"
 #include "inspircd.h"
 #include "helperfuncs.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
-extern user_hash clientlist;
-extern bool match(const char *, const char *);
+extern InspIRCd* ServerInstance;
 
 static Server *Srv;
 
@@ -53,8 +52,8 @@ class cmd_check : public command_t
 
                checkstr = "304 " + std::string(user->nick) + " :CHECK";
 
-               targuser = Srv->FindNick(std::string(parameters[0]));
-               targchan = Srv->FindChannel(std::string(parameters[0]));
+               targuser = ServerInstance->FindNick(parameters[0]);
+               targchan = ServerInstance->FindChan(parameters[0]);
 
                /*
                 * Syntax of a /check reply:
@@ -63,33 +62,33 @@ class cmd_check : public command_t
                 *  :server.name 304 target :CHECK END
                 */
 
-               Srv->SendTo(NULL, user, checkstr + " START " + parameters[0]);
+               user->WriteServ(checkstr + " START " + parameters[0]);
 
                if (targuser)
                {
                        /* /check on a user */
-                       Srv->SendTo(NULL, user, checkstr + " nuh " + targuser->GetFullHost());
-                       Srv->SendTo(NULL, user, checkstr + " realnuh " + targuser->GetFullRealHost());
-                       Srv->SendTo(NULL, user, checkstr + " realname " + targuser->fullname);
-                       Srv->SendTo(NULL, user, checkstr + " modes +" + targuser->FormatModes());
-                       Srv->SendTo(NULL, user, checkstr + " server " + targuser->server);
+                       user->WriteServ(checkstr + " nuh " + targuser->GetFullHost());
+                       user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
+                       user->WriteServ(checkstr + " realname " + targuser->fullname);
+                       user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
+                       user->WriteServ(checkstr + " server " + targuser->server);
                        if (targuser->awaymsg[0] != 0)
                        {
                                /* user is away */
-                               Srv->SendTo(NULL, user, checkstr + " awaymsg " + targuser->awaymsg);
+                               user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
                        }
                        if (targuser->oper[0] != 0)
                        {
                                /* user is an oper of type ____ */
-                               Srv->SendTo(NULL, user, checkstr + " opertype " + targuser->oper);
+                               user->WriteServ(checkstr + " opertype " + targuser->oper);
                        }
                        if (IS_LOCAL(targuser))
                        {
                                /* port information is only held for a local user! */
-                               Srv->SendTo(NULL, user, checkstr + " onport " + ConvToStr(targuser->GetPort()));
+                               user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort()));
                        }
 
-                       chliststr = chlist(targuser, targuser);
+                       chliststr = targuser->ChannelList(targuser);
                        std::stringstream dump(chliststr);
 
                        Srv->DumpText(user,checkstr + " onchans ", dump);
@@ -102,20 +101,20 @@ class cmd_check : public command_t
 
                        mytime = gmtime(&creation_time);
                        strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-                       Srv->SendTo(NULL, user, checkstr + " created " + timebuf);
+                       user->WriteServ(checkstr + " created " + timebuf);
 
                        if (targchan->topic[0] != 0)
                        {
                                /* there is a topic, assume topic related information exists */
-                               Srv->SendTo(NULL, user, checkstr + " topic " + targchan->topic);
-                               Srv->SendTo(NULL, user, checkstr + " topic_setby " + targchan->setby);
+                               user->WriteServ(checkstr + " topic " + targchan->topic);
+                               user->WriteServ(checkstr + " topic_setby " + targchan->setby);
                                mytime = gmtime(&topic_time);
                                strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-                               Srv->SendTo(NULL, user, checkstr + " topic_setat " + timebuf);
+                               user->WriteServ(checkstr + " topic_setat " + timebuf);
                        }
 
-                       Srv->SendTo(NULL, user, checkstr + " modes " + chanmodes(targchan, true));
-                       Srv->SendTo(NULL, user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+                       user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
+                       user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
                        
                        /* now the ugly bit, spool current members of a channel. :| */
 
@@ -127,12 +126,12 @@ class cmd_check : public command_t
                                char list[MAXBUF];
                                char tmpbuf[MAXBUF];
                                char* ptr = list;
-                               int flags = cflags(i->second, targchan);
+                               int flags = targchan->GetStatusFlags(i->second);
                                /*
                                 * find how many connections from this user's IP -- unlike Asuka,
                                 * I define a clone as coming from the same host. --w00t
                                 */
-                               sprintf(ptr, "%lu    ", FindMatchingGlobal(i->second));
+                               sprintf(ptr, "%lu    ", i->second->GlobalCloneCount());
                                
                                if (flags & UCMODE_OP)
                                {
@@ -152,7 +151,7 @@ class cmd_check : public command_t
                                sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
                                strcat(ptr, tmpbuf);
                                
-                               Srv->SendTo(NULL, user, checkstr + " member " + ptr);
+                               user->WriteServ(checkstr + " member " + ptr);
                        }
                }
                else
@@ -161,25 +160,25 @@ class cmd_check : public command_t
                        long x = 0;
 
                        /* hostname or other */
-                       for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+                       for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
                        {
                                if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
                                {
                                        /* host or vhost matches mask */
-                                       Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                                /* IP address */
                                else if (match(a->second->GetIPString(), parameters[0]))
                                {
                                        /* same IP. */
-                                       Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                        }
 
-                       Srv->SendTo(NULL, user, checkstr + " matches " + ConvToStr(x));
+                       user->WriteServ(checkstr + " matches " + ConvToStr(x));
                }
 
-               Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0]));
+               user->WriteServ(checkstr + " END " + std::string(parameters[0]));
        }
 };