dz is determined to crash your ircd :P

[user/henk/code/inspircd.git] / src / modules / m_sajoin.cpp

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index b91b1a2f00063deac016c562b373840b04543752..d0567cb166d1c2f9554ec8f20ca447c35f1ff0b4 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
@@ -30,6 +24,7 @@ class cmd_sajoin : public command_t
        {
                this->source = "m_sajoin.so";
                syntax = "<nick> <channel>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -50,13 +45,13 @@ class cmd_sajoin : public command_t
                        }
 
                        /* For local users, we send the JoinUser which may create a channel and set its TS.
-                        * For non-local users, we just return CMD_SUCCESS, knowing this will propogate it where it needs to be
+                        * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
                         * and then that server will generate the users JOIN or FJOIN instead.
                         */
                        if (IS_LOCAL(dest))
                        {
                                chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
-                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */
+                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
                                chanrec* n = ServerInstance->FindChan(parameters[1]);
                                if (n)
                                {
@@ -96,7 +91,7 @@ class ModuleSajoin : public Module
        cmd_sajoin*     mycommand;
  public:
        ModuleSajoin(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_sajoin(ServerInstance);
@@ -109,34 +104,9 @@ class ModuleSajoin : public Module
        
        virtual Version GetVersion()
        {
-               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 ModuleSajoinFactory : public ModuleFactory
-{
- public:
-       ModuleSajoinFactory()
-       {
-       }
-       
-       ~ModuleSajoinFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSajoin(Me);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)