When a server sends a SERVER command with <5 params, dont just close the connection...

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

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 424d012561e07122ba9d40e080c1cdf252253c96..40b8d1b0f03f36bf402044d56951054751707868 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -10,11 +10,7 @@
  *
  * ---------------------------------------------------
  */
- 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
+
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -43,7 +39,7 @@ class ModuleSafeList : public Module
        int global_listing;
        int LimitList;
  public:
-       ModuleSafeList(InspIRCd* Me) : Module::Module(Me)
+       ModuleSafeList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL, "");
        }
@@ -96,7 +92,7 @@ class ModuleSafeList : public Module
        {
                int minusers = 0, maxusers = 0;
 
-               if (global_listing >= LimitList)
+               if (global_listing >= LimitList && !IS_OPER(user))
                {
                        user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
                        user->WriteServ("321 %s Channel :Users Name",user->nick);
@@ -143,7 +139,7 @@ class ModuleSafeList : public Module
                                return 1;
                        }
 
-                       DELETE(last_list_time);
+                       delete last_list_time;
                        user->Shrink("safelist_last");
                }
 
@@ -225,7 +221,7 @@ class ModuleSafeList : public Module
                        if (ld->list_ended)
                        {
                                user->Shrink("safelist_cache");
-                               DELETE(ld);
+                               delete ld;
                                global_listing--;
                        }
                }
@@ -241,14 +237,14 @@ class ModuleSafeList : public Module
                        if (ld)
                        {
                                u->Shrink("safelist_cache");
-                               DELETE(ld);
+                               delete ld;
                                global_listing--;
                        }
                        time_t* last_list_time;
                        u->GetExt("safelist_last", last_list_time);
                        if (last_list_time)
                        {
-                               DELETE(last_list_time);
+                               delete last_list_time;
                                u->Shrink("safelist_last");
                        }
                }
@@ -266,26 +262,4 @@ class ModuleSafeList : public Module
 
 };
 
-
-class ModuleSafeListFactory : public ModuleFactory
-{
- public:
-       ModuleSafeListFactory()
-       {
-       }
- 
-       ~ModuleSafeListFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSafeList(Me);
-       }
- 
-};
- 
-extern "C" void * init_module( void )
-{
-       return new ModuleSafeListFactory;
-}
+MODULE_INIT(ModuleSafeList)