Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 6021d70589ffd4db3d3f5842c3dfdf8978d594cc..1806a988f68a4260a00f4d004b2895bcf4bea41f 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -4,11 +4,13 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
+
+
 char* RandString(unsigned int length)
 {
        unsigned char* tmp = new unsigned char[(length/4)*3];
@@ -29,23 +31,23 @@ char* RandString(unsigned int length)
 
 class ModuleWaitPong : public Module
 {
-       Server* Srv;
+       
        ConfigReader* Conf;
        
        bool sendsnotice;
        bool killonbadreply;
 
  public:
-       ModuleWaitPong(Server* Me)
+       ModuleWaitPong(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
                OnRehash("");
        }
        
        virtual void OnRehash(const std::string &param)
        {
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
                
                sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -77,7 +79,7 @@ class ModuleWaitPong : public Module
                user->Extend("waitpong_pingstr", pingrpl);
        }
        
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
        {
                if(command == "PONG")
                {
@@ -95,7 +97,7 @@ class ModuleWaitPong : public Module
                                else
                                {
                                        if(killonbadreply)
-                                               userrec::QuitUser(user, "Incorrect ping reply for registration");
+                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
@@ -144,7 +146,7 @@ class ModuleWaitPong : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 1, VF_VENDOR);
+               return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
        }
        
 };
@@ -160,7 +162,7 @@ class ModuleWaitPongFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleWaitPong(Me);
        }