This one too, grr

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

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 20d20bd7c900ec8b96d8b5e1f2f2416ceebe077d..4ab3ed793de1ddc5f04a23aa7aba63455f6f7307 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -12,29 +12,25 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
 class ModuleWaitPong : public Module
 {
-       InspIRCd* Instance;
        bool sendsnotice;
        bool killonbadreply;
        const char* extenstr;
 
  public:
        ModuleWaitPong(InspIRCd* Me)
-        : Module(Me), Instance(Me), extenstr("waitpong_pingstr")
+        : Module(Me), extenstr("waitpong_pingstr")
        {
                OnRehash(NULL,"");
        }
        
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
-               ConfigReader Conf(Instance);
+               ConfigReader Conf(ServerInstance);
                
                sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -62,7 +58,7 @@ class ModuleWaitPong : public Module
                return (char*)out;
        }
        
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                char* pingrpl = RandString(10);
                
@@ -75,25 +71,25 @@ class ModuleWaitPong : public Module
                return 0;
        }
        
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User* user, bool validated, const std::string &original_line)
        {
-               if(command == "PONG")
+               if (command == "PONG")
                {
                        char* pingrpl;
                        user->GetExt(extenstr, pingrpl);
                        
-                       if(pingrpl)
+                       if (pingrpl)
                        {
-                               if(strcmp(pingrpl, parameters[0]) == 0)
+                               if (strcmp(pingrpl, parameters[0]) == 0)
                                {
-                                       DELETE(pingrpl);
+                                       delete[] pingrpl;
                                        user->Shrink(extenstr);
                                        return 1;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+                                               User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
@@ -101,35 +97,35 @@ class ModuleWaitPong : public Module
                return 0;
        }
 
-       virtual bool OnCheckReady(userrec* user)
+       virtual bool OnCheckReady(User* user)
        {
                char* pingrpl;
                return (!user->GetExt(extenstr, pingrpl));
        }
        
-       virtual void OnUserDisconnect(userrec* user)
+       virtual void OnUserDisconnect(User* user)
        {
                char* pingrpl;
                user->GetExt(extenstr, pingrpl);
 
-               if(pingrpl)
+               if (pingrpl)
                {
-                       DELETE(pingrpl);
+                       delete[] pingrpl;
                        user->Shrink(extenstr);
                }
        }
        
        virtual void OnCleanup(int target_type, void* item)
        {
-               if(target_type == TYPE_USER)
+               if (target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        char* pingrpl;
                        user->GetExt(extenstr, pingrpl);
                        
-                       if(pingrpl)
+                       if (pingrpl)
                        {
-                               DELETE(pingrpl);
+                               delete[] pingrpl;
                                user->Shrink(extenstr);
                        } 
                }
@@ -146,25 +142,4 @@ class ModuleWaitPong : public Module
        
 };
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-       ModuleWaitPongFactory()
-       {
-       }
-       
-       ~ModuleWaitPongFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleWaitPong(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)