Remove InspIRCd* parameters and fields

[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 296d523008dd3f41ef09a561e0dd8c67334dbc97..b229aa39b053bbefab620d9f41b3482513776a1b 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -12,74 +12,74 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.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(Module* Creator) : Command(Creator,"USERIP", 1)
        {
-               this->source = "m_userip.so";
-               syntax = "<nick>{,<nick>}";
+               flags_needed = 'o'; syntax = "<nick>{,<nick>}";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       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 < pcnt; i++)
+               for (int i = 0; i < (int)parameters.size(); 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() + " ";
+                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
+                               if (IS_AWAY(u))
+                                       retbuf += "-";
+                               else
+                                       retbuf += "+";
+                               retbuf += u->ident + "@" + u->GetIPString() + " ";
+                               nicks++;
                        }
                }
 
-               user->WriteServ(retbuf);
+               if (nicks != 0)
+                       user->WriteServ(retbuf);
 
                /* Dont send to the network */
-               return CMD_FAILURE;
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleUserIP : public Module
 {
-       cmd_userip* mycommand;
+       CommandUserip cmd;
  public:
-       ModuleUserIP(InspIRCd* Me)
-               : Module(Me)
+       ModuleUserIP()
+               : cmd(this)
        {
-               
-               mycommand = new cmd_userip(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_On005Numeric] = 1;
-       }
 
        virtual void On005Numeric(std::string &output)
        {
                output = output + std::string(" USERIP");
        }
-       
+
        virtual ~ModuleUserIP()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides support for USERIP command",VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleUserIP)