Fix new millisec /map to compile on windows, by ifndef gettimeofday out reverting...

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index e7aa9f7a978b88b44e5317ca303a0daa0bef31a6..fcd6ae9586147aeb117cdb2eb86b19638db27b9e 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -11,12 +11,12 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */
 
@@ -121,44 +121,36 @@ class RemoveBase
                
                if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to U");
                        ulevel = chartolevel("U");
                }
                if (user->GetExt(founderkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to ~");
                        ulevel = chartolevel("~");
                }
                else if (user->GetExt(protectkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to &");
                        ulevel = chartolevel("&");
                }
                else
                {
-                       ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetPrefixChar(user));
                        ulevel = chartolevel(channel->GetPrefixChar(user));
                }
                        
                /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */
                if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to U");
                        tlevel = chartolevel("U");
                }
                else if (target->GetExt(founderkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to ~");
                        tlevel = chartolevel("~");
                }
                else if (target->GetExt(protectkey))
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to &");
                        tlevel = chartolevel("&");
                }
                else
                {
-                       ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target));
                        tlevel = chartolevel(channel->GetPrefixChar(target));
                }
                
@@ -209,6 +201,7 @@ class RemoveBase
                        return CMD_FAILURE;
                }
 
+               /* route me */
                return CMD_SUCCESS;
        }
 };
@@ -256,13 +249,13 @@ class ModuleRemove : public Module
        
  public:
        ModuleRemove(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                mycommand = new cmd_remove(ServerInstance, supportnokicks);
                mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->AddCommand(mycommand2);
-               OnRehash("");
+               OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -275,7 +268,7 @@ class ModuleRemove : public Module
                output.append(" REMOVE");
        }
        
-       virtual void OnRehash(const std::string&)
+       virtual void OnRehash(userrec* user, const std::string&)
        {
                ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
@@ -283,39 +276,13 @@ class ModuleRemove : public Module
        
        virtual ~ModuleRemove()
        {
-               delete mycommand;
-               delete mycommand2;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,1,0,VF_VENDOR,API_VERSION);
-       }
-       
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleRemoveFactory : public ModuleFactory
-{
- public:
-       ModuleRemoveFactory()
-       {
-       }
-       
-       ~ModuleRemoveFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRemove(Me);
+               return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRemoveFactory;
-}
+MODULE_INIT(ModuleRemove)