X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=1f142014ef71fe398905467edb3a7dbc8e14b80a;hb=697098bb47651b40ed9c768361d1a3b1ca452856;hp=cc8c7846bef1ac99000e097ea52e14cc250ed92f;hpb=2192a9f58aae466a42d60279fb34ee3c5d2950a1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index cc8c7846b..1f142014e 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
@@ -21,13 +20,13 @@
 class CommandCheck : public Command
 {
  public:
- 	CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
+ 	CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", "o", 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		User *targuser;
 		Channel *targchan;
@@ -71,7 +70,7 @@ class CommandCheck : public Command
 			if (IS_OPER(targuser))
 			{
 				/* user is an oper of type ____ */
-				user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
+				user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
 			}
 
 			if (IS_LOCAL(targuser))
@@ -107,7 +106,7 @@ class CommandCheck : public Command
 
 			user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
 			user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
-			
+
 			/* now the ugly bit, spool current members of a channel. :| */
 
 			CUList *ulist= targchan->GetUsers();
@@ -119,7 +118,7 @@ class CommandCheck : public Command
 				/*
 				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 				 */
-				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
+				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
 				user->WriteServ(checkstr + " member " + tmpbuf);
 			}
 		}
@@ -129,15 +128,15 @@ class CommandCheck : public Command
 			long x = 0;
 
 			/* hostname or other */
-			for (user_hash::const_iterator a = ServerInstance->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
+			for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
 			{
-				if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
+				if (InspIRCd::Match(a->second->host, parameters[0]) || InspIRCd::Match(a->second->dhost, parameters[0]))
 				{
 					/* host or vhost matches mask */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 				/* IP address */
-				else if (match(a->second->GetIPString(), parameters[0], true))
+				else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
 				{
 					/* same IP. */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -147,7 +146,7 @@ class CommandCheck : public Command
 			user->WriteServ(checkstr + " matches " + ConvToStr(x));
 		}
 
-		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+		user->WriteServ(checkstr + " END " + parameters[0]);
 
 		return CMD_LOCALONLY;
 	}
@@ -161,22 +160,22 @@ class ModuleCheck : public Module
  public:
 	ModuleCheck(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		mycommand = new CommandCheck(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
 	}
-	
+
 	virtual ~ModuleCheck()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
-	
+
 };
 
 MODULE_INIT(ModuleCheck)