X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=2f9a3fafdbdb09e22823c4fe505f2438f393d4e7;hb=be36d92f3dcb0ac3772daebff43a5ecfe0a2d364;hp=b33e63e195d4e52f62799cd1f33b608e01174d89;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index b33e63e19..2f9a3fafd 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,33 +2,27 @@
  *       | 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 <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
-extern InspIRCd* ServerInstance;
-
+/** Handles user mode +B
+ */
 class BotMode : public ModeHandler
 {
  public:
@@ -63,15 +57,16 @@ class BotMode : public ModeHandler
 
 class ModuleBotMode : public Module
 {
-	Server *Srv;
+	
 	BotMode* bm;
  public:
-	ModuleBotMode(Server* Me)
+	ModuleBotMode(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		bm = new BotMode(ServerInstance);
-		Srv->AddMode(bm, 'B');
+		if (!ServerInstance->AddMode(bm, 'B'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
@@ -81,19 +76,20 @@ class ModuleBotMode : public Module
 	
 	virtual ~ModuleBotMode()
 	{
+		ServerInstance->Modes->DelMode(bm);
 		DELETE(bm);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* src, userrec* 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);
 		}
 	}
 
@@ -112,7 +108,7 @@ class ModuleBotModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBotMode(Me);
 	}