X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=3a1096650137a04195865beb7a166ada6c49bc18;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=7120c36c714e64041cf666c1c2ac3a0a301ddf3e;hpb=e997de794f6671ebda5a58b4452657182a742073;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 7120c36c7..3a1096650 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,16 +21,24 @@ using namespace std;
 #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() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
+	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)
 	{
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
+
 		if (adding)
 		{
 			if (!dest->IsModeSet('B'))
@@ -54,15 +62,15 @@ 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();
-		Srv->AddMode(bm, 'B');
+		
+		bm = new BotMode(ServerInstance);
+		ServerInstance->AddMode(bm, 'B');
 	}
 
 	void Implements(char* List)
@@ -72,18 +80,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,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* src, userrec* dst)
 	{
 		if (dst->IsModeSet('B'))
 		{
-			Srv->SendTo(NULL,src,"335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+Srv->GetNetworkName());
+			src->WriteServ("335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+ServerInstance->Config->Network);
 		}
 	}
 
@@ -102,7 +112,7 @@ class ModuleBotModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBotMode(Me);
 	}