X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=54abe0940557617cedd728776b3a698a34b831ac;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=92b6d64f010f73f14afdea708639f1113572eacb;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 92b6d64f0..54abe0940 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,22 +19,19 @@ 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 *);
 
-static Server *Srv;
 
 class cmd_check : public command_t
 {
  public:
-	cmd_check() : command_t("CHECK", 'o', 1)
+ 	cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
@@ -53,8 +50,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,10 +86,10 @@ 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);
+			ServerInstance->DumpText(user,checkstr + " onchans ", dump);
 		}
 		else if (targchan)
 		{
@@ -114,7 +111,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 +124,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 +158,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]))
 				{
@@ -189,11 +186,11 @@ class ModuleCheck : public Module
  private:
 	cmd_check *mycommand;
  public:
-	ModuleCheck(Server* Me) : Module::Module(Me)
+	ModuleCheck(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_check();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_check(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleCheck()
@@ -225,7 +222,7 @@ class ModuleCheckFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleCheck(Me);
 	}