Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 2f9a3fafdbdb09e22823c4fe505f2438f393d4e7..86dc9ea0055170ded2b67da1e1d022b3a02a266f 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
@@ -30,10 +24,6 @@ class BotMode : public ModeHandler
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('B'))
@@ -61,7 +51,7 @@ class ModuleBotMode : public Module
        BotMode* bm;
  public:
        ModuleBotMode(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                bm = new BotMode(ServerInstance);
@@ -95,28 +85,5 @@ class ModuleBotMode : public Module
 
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleBotModeFactory : public ModuleFactory
-{
- public:
-       ModuleBotModeFactory()
-       {
-       }
-       
-       ~ModuleBotModeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBotMode(Me);
-       }
-       
-};
-
 
-extern "C" void * init_module( void )
-{
-       return new ModuleBotModeFactory;
-}
+MODULE_INIT(ModuleBotMode)