More conversions

[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 707a4e10c559ce5a0aa2dbabc15aa78d8dbda511..646df57a010c260c6e849bc7aa6a7d5abb0426f7 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,27 +2,22 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#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 */
 
@@ -35,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'))
@@ -66,11 +57,12 @@ class ModuleBotMode : public Module
        BotMode* bm;
  public:
        ModuleBotMode(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                bm = new BotMode(ServerInstance);
-               ServerInstance->AddMode(bm, 'B');
+               if (!ServerInstance->AddMode(bm, 'B'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
@@ -93,34 +85,11 @@ class ModuleBotMode : public Module
        {
                if (dst->IsModeSet('B'))
                {
-                       src->WriteServ("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);