X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=643af8e15d0d955713d2444acda716fe1944e554;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=3a8b8dd92f1b53c53f2dffed8d45ee5997358cfb;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 3a8b8dd92..643af8e15 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,24 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
@@ -67,17 +62,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! */
@@ -123,7 +122,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 ", i->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
 				user->WriteServ(checkstr + " member " + tmpbuf);
 			}
 		}
@@ -133,7 +132,7 @@ 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->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
 			{
 				if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
 				{
@@ -141,7 +140,7 @@ class cmd_check : public command_t
 					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], true))
 				{
 					/* same IP. */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -153,7 +152,7 @@ class cmd_check : public command_t
 
 		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
 
-		return CMD_SUCCESS;
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -163,7 +162,7 @@ class ModuleCheck : public Module
  private:
 	cmd_check *mycommand;
  public:
-	ModuleCheck(InspIRCd* Me) : Module::Module(Me)
+	ModuleCheck(InspIRCd* Me) : Module(Me)
 	{
 		
 		mycommand = new cmd_check(ServerInstance);
@@ -186,28 +185,4 @@ class ModuleCheck : public Module
 	
 };
 
-
-
-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)