In the grand tradition of huge fucking commits:

[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 0b62df0a143a75efcec05ecc90dfb8a91e84308f..829a535e383541d1147bbbabdc74aa1079bf7957 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -2,53 +2,47 @@
  *       | 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;
-
-class cmd_userip : public command_t
+/** Handle /USERIP
+ */
+class cmd_userip : public Command
 {
  public:
-       cmd_userip () : command_t("USERIP", 'o', 1)
+       cmd_userip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1)
        {
                this->source = "m_userip.so";
+               syntax = "<nick>{,<nick>}";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               char Return[MAXBUF],junk[MAXBUF];
-               snprintf(Return,MAXBUF,"340 %s :",user->nick);
+               std::string retbuf = std::string("340 ") + user->nick + " :";
+
                for (int i = 0; i < pcnt; i++)
                {
-                       userrec *u = Find(parameters[i]);
-                       if (u)
+                       User *u = ServerInstance->FindNick(parameters[i]);
+                       if ((u) && (u->registered == REG_ALL))
                        {
-                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,(char*)inet_ntoa(u->ip4));
-                               strlcat(Return,junk,MAXBUF);
+                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
                        }
                }
-               WriteServ(user->fd,Return);
+
+               user->WriteServ(retbuf);
+
+               /* Dont send to the network */
+               return CMD_LOCALONLY;
        }
 };
 
@@ -56,12 +50,12 @@ class ModuleUserIP : public Module
 {
        cmd_userip* mycommand;
  public:
-       ModuleUserIP(Server* Me)
-               : Module::Module(Me)
+       ModuleUserIP(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_userip();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_userip(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void Implements(char* List)
@@ -80,34 +74,10 @@ 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);
        }
        
 };
 
-// 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(Server* Me)
-       {
-               return new ModuleUserIP(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)