X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=00db26595490d6e7bdda2ca71719e01cc932955e;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=9c0aa12a85b51c7e8ad68063213a0285246cb1ff;hpb=ec2106579c77a98dfdb209864a1e1b5ae1f07e7f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 9c0aa12a8..00db26595 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,102 +11,79 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.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)
 	{
-		char Return[MAXBUF],junk[MAXBUF];
-		snprintf(Return,MAXBUF,"340 %s :",user->nick);
-		for (int i = 0; i < pcnt; i++)
+		std::string retbuf = std::string("340 ") + user->nick + " :";
+		int nicks = 0;
+
+		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))
 			{
-				snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,IS_OPER(u) ? "*" : "",u->ident,u->GetIPString());
-				strlcat(Return,junk,MAXBUF);
+				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
+				if (IS_AWAY(u))
+					retbuf += "-";
+				else
+					retbuf += "+";
+				retbuf += u->ident + "@" + u->GetIPString() + " ";
+				nicks++;
 			}
 		}
-		user->WriteServ(Return);
+
+		if (nicks != 0)
+			user->WriteServ(retbuf);
 
 		/* Dont send to the network */
-		return CMD_FAILURE;
+		return CMD_LOCALONLY;
 	}
 };
 
 class ModuleUserIP : public Module
 {
-	cmd_userip* mycommand;
+	CommandUserip* mycommand;
  public:
 	ModuleUserIP(InspIRCd* Me)
-		: Module::Module(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)
 	{
 		output = output + std::string(" USERIP");
 	}
-	
+
 	virtual ~ModuleUserIP()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
-	
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
-{
- public:
-	ModuleUserIPFactory()
-	{
-	}
-	
-	~ModuleUserIPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUserIP(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)