This will royally fuck 1.2's linking right now, but..

[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 9ed7ef2ee2e1ade96fed0b2f95cab0dfd883c8d2..a6cad9577c3b8328cf0a6ff03cf5f1406f4ebf21 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -11,13 +11,13 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #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 +30,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 +57,7 @@ class ModuleBotMode : public Module
        BotMode* bm;
  public:
        ModuleBotMode(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                bm = new BotMode(ServerInstance);
@@ -89,34 +85,11 @@ class ModuleBotMode : public Module
        {
                if (dst->IsModeSet('B'))
                {
-                       ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+ServerInstance->Config->Network);
+                       ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
                }
        }
 
 };
 
-// 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)