X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=6e53273aca14d6191f260239202fc372f6962992;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=612eb3b9c0af5bd5a9ad22d1c10111d18feb75fb;hpb=33ed72a1dfae595132dd50c760b6a312ef2ce8fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 612eb3b9c..6e53273ac 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -2,75 +2,90 @@
  *       | 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"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
-class ModuleBotMode : public Module
+/** Handles user mode +B
+ */
+class BotMode : public ModeHandler
 {
-	Server *Srv; 
  public:
-	ModuleBotMode(Server* Me)
-		: Module::Module(Me)
+	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)
 	{
-		Srv = Me;
-		
-		if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
+		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!");
-			return;
+			if (dest->IsModeSet('B'))
+			{
+				dest->SetMode('B',false);
+				return MODEACTION_ALLOW;
+			}
 		}
+		
+		return MODEACTION_DENY;
+	}
+};
+
+class ModuleBotMode : public Module
+{
+	
+	BotMode* bm;
+ public:
+	ModuleBotMode(InspIRCd* Me)
+		: Module(Me)
+	{
+		
+		bm = new BotMode(ServerInstance);
+		if (!ServerInstance->AddMode(bm, 'B'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	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,1,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());
+			ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
 		}
 	}
 
@@ -89,7 +104,7 @@ class ModuleBotModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBotMode(Me);
 	}
@@ -97,8 +112,7 @@ class ModuleBotModeFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleBotModeFactory;
 }
-