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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index d5757c002..3a1096650 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,20 +21,29 @@ 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
 {
-	BotMode() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
+ 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)
 	{
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
+
 		if (adding)
 		{
 			if (!dest->IsModeSet('B'))
 			{
-				user->SetMode('B',true);
+				dest->SetMode('B',true);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -42,60 +51,49 @@ class BotMode : public ModeHandler
 		{
 			if (dest->IsModeSet('B'))
 			{
-				user->SetMode('B',false);
+				dest->SetMode('B',false);
 				return MODEACTION_ALLOW;
 			}
 		}
+		
+		return MODEACTION_DENY;
 	}
 };
 
 class ModuleBotMode : public Module
 {
-	Server *Srv; 
+	
+	BotMode* bm;
  public:
-	ModuleBotMode(Server* Me)
+	ModuleBotMode(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
 		
-		if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
-		{
-			Srv->Log(DEFAULT,"*** m_botmode: ERROR, failed to allocate user mode +B!");
-			return;
-		}
+		bm = new BotMode(ServerInstance);
+		ServerInstance->AddMode(bm, 'B');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnWhois] = List[I_OnExtendedMode] = 1;
+		List[I_OnWhois] = 1;
 	}
 	
 	virtual ~ModuleBotMode()
 	{
+		ServerInstance->Modes->DelMode(bm);
+		DELETE(bm);
 	}
 	
 	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;
-		}
-		else
-		{
-			return 0;
-		}
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* src, userrec* dst)
 	{
-		if (dst->modes['B'-65])
+		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);
 		}
 	}
 
@@ -114,7 +112,7 @@ class ModuleBotModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBotMode(Me);
 	}
@@ -126,4 +124,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleBotModeFactory;
 }
-