Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 8df8ecefcec57ea7813ab2ed0a1509f4cb9deca5..6a0ee948ab279efdfeebf5f4d41ccced5f10d2d9 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -21,10 +21,11 @@ using namespace std;
 #include "users.h"
 #include "modules.h"
 
+#include "inspircd.h"
+
 /* $ModDesc: Connection throttle */
 
 int conns = 0, throttled = 0;
-extern time_t TIME;
 
 class ModuleConnFlood : public Module
 {
@@ -34,12 +35,12 @@ private:
        std::string quitmsg;
 
        ConfigReader* conf;
-       Server *Srv;
+       
 
 public:
-       ModuleConnFlood(Server* Me) : Module::Module(Me)
+       ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
+               
                InitConf();
        }
 
@@ -60,7 +61,7 @@ public:
        void InitConf()
        {
                /* read configuration variables */
-               conf = new ConfigReader;
+               conf = new ConfigReader(ServerInstance);
                /* throttle configuration */
                seconds = conf->ReadInteger("connflood", "seconds", 0, true);
                maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
@@ -70,12 +71,12 @@ public:
                /* seconds to wait when the server just booted */
                boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
 
-               first = TIME;
+               first = ServerInstance->Time();
        }
  
        virtual void OnUserRegister(userrec* user)
        {
-               time_t next = TIME;
+               time_t next = ServerInstance->Time();
                if (!first)
                        first = next - boot_wait;
 
@@ -91,10 +92,10 @@ public:
                        {
                                /* expire throttle */
                                throttled = 0;
-                               Srv->SendOpers("*** Connection throttle deactivated");
+                               ServerInstance->WriteOpers("*** Connection throttle deactivated");
                                return;
                        }
-                       Srv->QuitUser(user, quitmsg);
+                       userrec::QuitUser(ServerInstance, user, quitmsg);
                        return;
                }
 
@@ -103,8 +104,8 @@ public:
                        if (conns >= maxconns)
                        {
                                throttled = 1;
-                               Srv->SendOpers("*** Connection throttle activated");
-                               Srv->QuitUser(user, quitmsg);
+                               ServerInstance->WriteOpers("*** Connection throttle activated");
+                               userrec::QuitUser(ServerInstance, user, quitmsg);
                                return;
                        }
                }
@@ -134,7 +135,7 @@ public:
        {
        }
     
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleConnFlood(Me);
        }