X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=86b3cd02ee8ed9951135f6bd06555d7d46734114;hb=7c197db72eab03321e4f3e847054e13126520504;hp=9e5b33d4e3befb498ed03de5b21b4bfc9f13c566;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 9e5b33d4e..86b3cd02e 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,62 +2,76 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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;
-	 
-void handle_userip(char **parameters, int pcnt, userrec *user)
+/** Handle /USERIP
+ */
+class cmd_userip : public command_t
 {
-        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);
-}
+ public:
+	cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
+	{
+		this->source = "m_userip.so";
+		syntax = "<nick>{,<nick>}";
+	}
+
+	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 = ServerInstance->FindNick(parameters[i]);
+			if ((u) && (u->registered == REG_ALL))
+			{
+				snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,u->GetIPString());
+				strlcat(Return,junk,MAXBUF);
+			}
+		}
+		user->WriteServ(Return);
 
+		/* Dont send to the network */
+		return CMD_FAILURE;
+	}
+};
 
 class ModuleUserIP : public Module
 {
+	cmd_userip* mycommand;
  public:
-	ModuleUserIP(Server* Me)
+	ModuleUserIP(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		Srv->AddCommand("USERIP",handle_userip,'o',1,"m_userip.so");
+		
+		mycommand = new cmd_userip(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+	}
+
+	void Implements(char* List)
+	{
+		List[I_On005Numeric] = 1;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
+	virtual void On005Numeric(std::string &output)
+	{
 		output = output + std::string(" USERIP");
-        }
+	}
 	
 	virtual ~ModuleUserIP()
 	{
@@ -65,7 +79,7 @@ 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);
 	}
 	
 };
@@ -83,7 +97,7 @@ class ModuleUserIPFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleUserIP(Me);
 	}