Only valid targets for encap are now server ids

[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 b623c39bae209a87568cc698d14812fb747954fb..bca1d1acf359ca39335f409061148c02fcf1f420 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,33 +11,28 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
 /** Handle /USERIP
  */
-class cmd_userip : public command_t
+class CommandUserip : public Command
 {
  public:
-       cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
+       CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", "o", 1)
        {
                this->source = "m_userip.so";
                syntax = "<nick>{,<nick>}";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                std::string retbuf = std::string("340 ") + user->nick + " :";
 
                for (int i = 0; i < pcnt; i++)
                {
-                       userrec *u = ServerInstance->FindNick(parameters[i]);
+                       User *u = ServerInstance->FindNick(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
                                retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
@@ -47,26 +42,24 @@ class cmd_userip : public command_t
                user->WriteServ(retbuf);
 
                /* Dont send to the network */
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
 class ModuleUserIP : public Module
 {
-       cmd_userip* mycommand;
+       CommandUserip* mycommand;
  public:
        ModuleUserIP(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_userip(ServerInstance);
+               mycommand = new CommandUserip(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_On005Numeric] = 1;
-       }
 
        virtual void On005Numeric(std::string &output)
        {
@@ -84,29 +77,5 @@ class ModuleUserIP : public Module
        
 };
 
-// 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(InspIRCd* Me)
-       {
-               return new ModuleUserIP(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)