Someone is getting slapped for this; the new hidesplits/hidebans behavior doesn't...

[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 fe6435b9d404a5814fee6191a88fa2de78b7eaba..86b3cd02ee8ed9951135f6bd06555d7d46734114 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,53 +2,52 @@
  *       | 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 */
 
-static 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,*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) && (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;
        }
 };
 
@@ -56,12 +55,12 @@ 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);
+               
+               mycommand = new cmd_userip(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void Implements(char* List)
@@ -69,10 +68,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,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);
        }
        
 };
@@ -98,7 +97,7 @@ class ModuleUserIPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleUserIP(Me);
        }