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 92b6d64f010f73f14afdea708639f1113572eacb..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:
@@ -89,7 +88,7 @@ class cmd_check : public command_t
                                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);
@@ -114,7 +113,7 @@ class cmd_check : public command_t
                                user->WriteServ(checkstr + " topic_setat " + timebuf);
                        }
 
-                       user->WriteServ(checkstr + " modes " + chanmodes(targchan, true));
+                       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,7 +126,7 @@ 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
@@ -161,7 +160,7 @@ 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]))
                                {