Note: FOR THE MOMENT, this is BROKEN. It wont run right until im done.

[user/henk/code/inspircd.git] / src / modules / m_userip.cpp

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 4ffeca3d5a39a3f28b884519f418f70e749e0f26..861d5a0e529790a60108b89c458bc4f3ed6fc456 100644 (file)
--- 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 */
 
-Server *Srv;
+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]);
-                       if (u)
-                       {
-                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,(char*)inet_ntoa(u->ip4));
-                               strlcat(Return,junk,MAXBUF);
-                       }
-               }
-               WriteServ(user->fd,Return);
+               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)
+                       {
+                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,u->GetIPString());
+                               strlcat(Return,junk,MAXBUF);
+                       }
+               }
+               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);
        }
@@ -69,10 +72,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()
        {
@@ -98,7 +101,7 @@ class ModuleUserIPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleUserIP(Me);
        }