X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=36880d5edf2e30b164e68af56af2979056d5e8cd;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=aa4e1f6cd56945bf809370fa5a92058e9e7ebc91;hpb=74c8913f72e6d48c88a01155ef5fe5ca20cc2bb1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index aa4e1f6cd..36880d5ed 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -21,19 +18,19 @@
 
 /** Handle /CHECK
  */
-class cmd_check : public command_t
+class CommandCheck : public Command
 {
  public:
- 	cmd_check (InspIRCd* Instance) : command_t(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, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		userrec *targuser;
-		chanrec *targchan;
+		User *targuser;
+		Channel *targchan;
 		std::string checkstr;
 		std::string chliststr;
 
@@ -62,17 +59,21 @@ class cmd_check : public command_t
 			user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
 			user->WriteServ(checkstr + " realname " + targuser->fullname);
 			user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
+			user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
 			user->WriteServ(checkstr + " server " + targuser->server);
-			if (targuser->awaymsg[0] != 0)
+
+			if (IS_AWAY(targuser))
 			{
 				/* user is away */
 				user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
 			}
-			if (targuser->oper[0] != 0)
+
+			if (IS_OPER(targuser))
 			{
 				/* user is an oper of type ____ */
-				user->WriteServ(checkstr + " opertype " + targuser->oper);
+				user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
 			}
+
 			if (IS_LOCAL(targuser))
 			{
 				/* port information is only held for a local user! */
@@ -118,7 +119,7 @@ class cmd_check : public command_t
 				/*
 				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 				 */
-				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
+				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);
 				user->WriteServ(checkstr + " member " + tmpbuf);
 			}
 		}
@@ -128,15 +129,15 @@ class cmd_check : public command_t
 			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 (match(a->second->host, parameters[0].c_str()) || match(a->second->dhost, parameters[0].c_str()))
 				{
 					/* host or vhost matches mask */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 				/* IP address */
-				else if (match(a->second->GetIPString(), parameters[0]))
+				else if (match(a->second->GetIPString(), parameters[0].c_str(), true))
 				{
 					/* same IP. */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -148,7 +149,7 @@ class cmd_check : public command_t
 
 		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
 
-		return CMD_SUCCESS;
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -156,13 +157,14 @@ class cmd_check : public command_t
 class ModuleCheck : public Module
 {
  private:
-	cmd_check *mycommand;
+	CommandCheck *mycommand;
  public:
-	ModuleCheck(InspIRCd* Me) : Module::Module(Me)
+	ModuleCheck(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_check(ServerInstance);
+		mycommand = new CommandCheck(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleCheck()
@@ -171,38 +173,10 @@ class ModuleCheck : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		/* we don't hook anything, nothing required */
-	}
 	
 };
 
-
-
-class ModuleCheckFactory : public ModuleFactory
-{
- public:
-	ModuleCheckFactory()
-	{
-	}
-	
-	~ModuleCheckFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCheck(Me);
-	}
-	
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleCheckFactory;
-}
-
+MODULE_INIT(ModuleCheck)