X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=81e2cf6c8ab956fe8ae4aca03b49b0c9506f4f4e;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=fe37ebc7ff4ffdee14c4f1667a89cabc19fdeb73;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index fe37ebc7f..81e2cf6c8 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,53 +2,47 @@
  *       | 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 <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
-Server *Srv;
-
+/** Handle /USERIP
+ */
 class cmd_userip : public command_t
 {
  public:
-	cmd_userip () : command_t("USERIP", 'o', 1)
+	cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
 	{
 		this->source = "m_userip.so";
+		syntax = "<nick>{,<nick>}";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-	        char Return[MAXBUF],junk[MAXBUF];
-	        snprintf(Return,MAXBUF,"340 %s :",user->nick);
-	        for (int i = 0; i < pcnt; i++)
-	        {
-	                userrec *u = Find(parameters[i]);
-	                if (u)
-	                {
-	                        snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,strchr(u->modes,'o') ? "*" : "",u->ident,u->ip);
-	                        strlcat(Return,junk,MAXBUF);
-	                }
-	        }
-	        WriteServ(user->fd,Return);
+		std::string retbuf = std::string("340 ") + user->nick + " :";
+
+		for (int i = 0; i < pcnt; i++)
+		{
+			userrec *u = ServerInstance->FindNick(parameters[i]);
+			if ((u) && (u->registered == REG_ALL))
+			{
+				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
+			}
+		}
+
+		user->WriteServ(retbuf);
+
+		/* Dont send to the network */
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -56,12 +50,12 @@ class ModuleUserIP : public Module
 {
 	cmd_userip* mycommand;
  public:
-	ModuleUserIP(Server* Me)
-		: Module::Module(Me)
+	ModuleUserIP(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_userip();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_userip(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 
 	void Implements(char* List)
@@ -69,10 +63,10 @@ class ModuleUserIP : public Module
 		List[I_On005Numeric] = 1;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
+	virtual void On005Numeric(std::string &output)
+	{
 		output = output + std::string(" USERIP");
-        }
+	}
 	
 	virtual ~ModuleUserIP()
 	{
@@ -80,34 +74,10 @@ class ModuleUserIP : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,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(Server* Me)
-	{
-		return new ModuleUserIP(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)