DOH! Fix my muppetry of a segfault, and fix some warnings

[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 2aa5047bf63ab7ba47b63aaaa7e054c6848450a1..2bf683fa999b8c5449f3515c9c1accbf3f1c9b70 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,44 +2,28 @@
  *       | 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-2008 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 <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 */
 
-
-
+/** Handles user mode +B
+ */
 class BotMode : public ModeHandler
 {
  public:
        BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
-               /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('B'))
@@ -67,61 +51,37 @@ 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->Modes->AddMode(bm))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = 1;
-       }
        
        virtual ~ModuleBotMode()
        {
                ServerInstance->Modes->DelMode(bm);
-               DELETE(bm);
+               delete bm;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnWhois(userrec* src, userrec* dst)
+       virtual void OnWhois(User* src, User* dst)
        {
                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)