X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=a6cad9577c3b8328cf0a6ff03cf5f1406f4ebf21;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=2aa5047bf63ab7ba47b63aaaa7e054c6848450a1;hpb=40e990ed06126c1ba6164738527127d1f58fc032;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 2aa5047bf..a6cad9577 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 "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 */
 
-
-
+/** Handles user mode +B
+ */
 class BotMode : public ModeHandler
 {
  public:
@@ -36,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'))
@@ -67,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)
@@ -87,41 +78,18 @@ class ModuleBotMode : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|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);
 		}
 	}
 
 };
 
-// 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)