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 0156775369a082cb33d1e8308433e24c9c42c425..2bf683fa999b8c5449f3515c9c1accbf3f1c9b70 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,99 +2,86 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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 "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
-class ModuleBotMode : public Module
+/** Handles user mode +B
+ */
+class BotMode : public ModeHandler
 {
-       Server *Srv; 
  public:
-       ModuleBotMode()
+       BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
-               Srv = new Server;
-               
-               if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
+               if (adding)
                {
-                       Srv->Log(DEFAULT,"*** m_botmode: ERROR, failed to allocate user mode +B!");
-                       printf("Could not claim usermode +B for this module!");
-                       return;
-               }
-       }
-       
-       virtual ~ModuleBotMode()
-       {
-               delete Srv;
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-       }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               if ((modechar == 'B') && (type == MT_CLIENT))
-               {
-                       return 1;
+                       if (!dest->IsModeSet('B'))
+                       {
+                               dest->SetMode('B',true);
+                               return MODEACTION_ALLOW;
+                       }
                }
                else
                {
-                       return 0;
-               }
-       }
-
-       virtual void OnWhois(userrec* src, userrec* dst)
-       {
-               if (strchr(dst->modes,'B'))
-               {
-                       Srv->SendTo(NULL,src,"335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+Srv->GetNetworkName());
+                       if (dest->IsModeSet('B'))
+                       {
+                               dest->SetMode('B',false);
+                               return MODEACTION_ALLOW;
+                       }
                }
+               
+               return MODEACTION_DENY;
        }
-
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleBotModeFactory : public ModuleFactory
+class ModuleBotMode : public Module
 {
+       
+       BotMode* bm;
  public:
-       ModuleBotModeFactory()
+       ModuleBotMode(InspIRCd* Me)
+               : Module(Me)
        {
+               
+               bm = new BotMode(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(bm))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
+
        
-       ~ModuleBotModeFactory()
+       virtual ~ModuleBotMode()
        {
+               ServerInstance->Modes->DelMode(bm);
+               delete bm;
        }
        
-       virtual Module * CreateModule()
+       virtual Version GetVersion()
        {
-               return new ModuleBotMode;
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+       }
+
+       virtual void OnWhois(User* src, User* dst)
+       {
+               if (dst->IsModeSet('B'))
+               {
+                       ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
+               }
        }
-       
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-       return new ModuleBotModeFactory;
-}
 
+MODULE_INIT(ModuleBotMode)