Add VF_COMMON to a lot modules which require it. Reported by danielg in bug #369...

[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 9c0aa12a85b51c7e8ad68063213a0285246cb1ff..5223a1af1b9194b7f6a79ea86fe39db010d232c3 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
@@ -33,21 +31,21 @@ class cmd_userip : public command_t
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *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 = ServerInstance->FindNick(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
-                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,IS_OPER(u) ? "*" : "",u->ident,u->GetIPString());
-                               strlcat(Return,junk,MAXBUF);
+                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
                        }
                }
-               user->WriteServ(Return);
+
+               user->WriteServ(retbuf);
 
                /* Dont send to the network */
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
@@ -56,7 +54,7 @@ class ModuleUserIP : public Module
        cmd_userip* mycommand;
  public:
        ModuleUserIP(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_userip(ServerInstance);
@@ -84,29 +82,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" void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)