X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=1d3d225750d6445d4bd57c0f8e1eca977a052102;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=69a9495a5d71650cd2f4c4ff8bd2bb199335b4ae;hpb=4efba4dad4b21f8ae2357a473b335e147b83a7c7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 69a9495a5..1d3d22575 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,57 +14,82 @@
  * ---------------------------------------------------
  */
 
+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
+class BotMode : public ModeHandler
 {
-	Server *Srv; 
  public:
-	ModuleBotMode()
+	BotMode() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		Srv = new Server;
-		
-		if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
+		/* Only opers can change other users modes */
+		if ((source != dest) && (!*source->oper))
+			return MODEACTION_DENY;
+
+		if (adding)
+		{
+			if (!dest->IsModeSet('B'))
+			{
+				dest->SetMode('B',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
 		{
-			Srv->Log(DEFAULT,"*** m_botmode: ERROR, failed to allocate user mode +B!");
-			printf("Could not claim usermode +B for this module!");
-			return;
+			if (dest->IsModeSet('B'))
+			{
+				dest->SetMode('B',false);
+				return MODEACTION_ALLOW;
+			}
 		}
+		
+		return MODEACTION_DENY;
+	}
+};
+
+class ModuleBotMode : public Module
+{
+	Server *Srv;
+	BotMode* bm;
+ public:
+	ModuleBotMode(Server* Me)
+		: Module::Module(Me)
+	{
+		Srv = Me;
+		bm = new BotMode();
+		Srv->AddMode(bm, 'B');
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnWhois] = 1;
 	}
 	
 	virtual ~ModuleBotMode()
 	{
-		delete Srv;
+		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;
-		}
-	}
 
 	virtual void OnWhois(userrec* src, userrec* dst)
 	{
-		if (strchr(dst->modes,'B'))
+		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 "+Srv->GetNetworkName());
 		}
 	}
 
@@ -83,9 +108,9 @@ class ModuleBotModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleBotMode;
+		return new ModuleBotMode(Me);
 	}
 	
 };
@@ -95,4 +120,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleBotModeFactory;
 }
-