X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=b229aa39b053bbefab620d9f41b3482513776a1b;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=fa5fdd5a5237302e0ee01e3b75e1900930a2e3f2;hpb=0bb8699027df93a74ea772bac6c0097da4504ca8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index fa5fdd5a5..b229aa39b 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,97 +2,85 @@
  *       | 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 CommandUserip : public Command
 {
-        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:
+	CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
+	{
+		flags_needed = 'o'; syntax = "<nick>{,<nick>}";
+	}
+
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	{
+		std::string retbuf = std::string("340 ") + user->nick + " :";
+		int nicks = 0;
 
+		for (int i = 0; i < (int)parameters.size(); i++)
+		{
+			User *u = ServerInstance->FindNick(parameters[i]);
+			if ((u) && (u->registered == REG_ALL))
+			{
+				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
+				if (IS_AWAY(u))
+					retbuf += "-";
+				else
+					retbuf += "+";
+				retbuf += u->ident + "@" + u->GetIPString() + " ";
+				nicks++;
+			}
+		}
+
+		if (nicks != 0)
+			user->WriteServ(retbuf);
+
+		/* Dont send to the network */
+		return CMD_SUCCESS;
+	}
+};
 
 class ModuleUserIP : public Module
 {
+	CommandUserip cmd;
  public:
 	ModuleUserIP()
+		: cmd(this)
 	{
-		Srv = new Server;
-		Srv->AddCommand("USERIP",handle_userip,'o',1,"m_userip.so");
+		ServerInstance->AddCommand(&cmd);
+		Implementation eventlist[] = { I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
+
+	virtual void On005Numeric(std::string &output)
+	{
 		output = output + std::string(" USERIP");
-        }
-	
+	}
+
 	virtual ~ModuleUserIP()
 	{
-		delete Srv;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version("Provides support for USERIP command",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()
-	{
-		return new ModuleUserIP;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)