X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=861d5a0e529790a60108b89c458bc4f3ed6fc456;hb=b37a253d962ed7af1ea7a328abf2a1af74f30759;hp=55101705ed80b439d9cfa7530d8e567abc840143;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 55101705e..861d5a0e5 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -22,10 +22,12 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
 static Server *Srv;
+extern InspIRCd* ServerInstance;
 
 class cmd_userip : public command_t
 {
@@ -33,22 +35,23 @@ class cmd_userip : public command_t
 	cmd_userip () : command_t("USERIP", 'o', 1)
 	{
 		this->source = "m_userip.so";
+		syntax = "<nick>{,<nick>}";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	void 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]);
+			userrec *u = ServerInstance->FindNick(parameters[i]);
 			if (u)
 			{
-				snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,(char*)inet_ntoa(u->ip4));
+				snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,u->GetIPString());
 				strlcat(Return,junk,MAXBUF);
 			}
 		}
-		WriteServ(user->fd,Return);
+		user->WriteServ(Return);
 	}
 };
 
@@ -56,10 +59,10 @@ class ModuleUserIP : public Module
 {
 	cmd_userip* mycommand;
  public:
-	ModuleUserIP(Server* Me)
+	ModuleUserIP(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		mycommand = new cmd_userip();
 		Srv->AddCommand(mycommand);
 	}
@@ -98,7 +101,7 @@ class ModuleUserIPFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleUserIP(Me);
 	}