X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=d7c5792e8f066262ed4f75a38d3d75524b2c3ebd;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=5223a1af1b9194b7f6a79ea86fe39db010d232c3;hpb=31e2d052252c4113ae9ea63844f60df7759a03be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 5223a1af1..d7c5792e8 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.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
@@ -12,30 +12,27 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
 /** Handle /USERIP
  */
-class cmd_userip : public command_t
+class CommandUserip : public Command
 {
  public:
-	cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
+	CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", "o", 1)
 	{
 		this->source = "m_userip.so";
 		syntax = "<nick>{,<nick>}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		std::string retbuf = std::string("340 ") + user->nick + " :";
 
-		for (int i = 0; i < pcnt; i++)
+		for (int i = 0; i < (int)parameters.size(); i++)
 		{
-			userrec *u = ServerInstance->FindNick(parameters[i]);
+			User *u = ServerInstance->FindNick(parameters[i]);
 			if ((u) && (u->registered == REG_ALL))
 			{
 				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
@@ -51,20 +48,18 @@ class cmd_userip : public command_t
 
 class ModuleUserIP : public Module
 {
-	cmd_userip* mycommand;
+	CommandUserip* mycommand;
  public:
 	ModuleUserIP(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_userip(ServerInstance);
+		mycommand = new CommandUserip(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_On005Numeric] = 1;
-	}
 
 	virtual void On005Numeric(std::string &output)
 	{
@@ -77,7 +72,7 @@ class ModuleUserIP : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };