X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_nokicks.cpp;h=dbfa0c2eab71fcd1af25835fb3dbff40b8d3fc3a;hb=77bb8528a69735ba59e0cd1ac2801063343a6187;hp=07b26d8e7e66bdab5f6bbdba546cd30138b6bce5;hpb=5b949866d429203ae48f2088e4f97592755592c6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 07b26d8e7..dbfa0c2ea 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,32 +1,52 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
+class NoKicks : public SimpleChannelModeHandler
+{
+ public:
+	NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
+};
+
 class ModuleNoKicks : public Module
 {
-	Server *Srv;
-	bool NoisyNoKicks;
-	ConfigReader *Conf;
+	
+	NoKicks* nk;
 	
  public:
  
-	ModuleNoKicks()
+	ModuleNoKicks(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
+		
+		nk = new NoKicks(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(nk))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnAccessCheck };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
-	
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+
+
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
 		if (access_type == AC_KICK)
 		{
-			if (channel->IsCustomModeSet('Q'))
+			if (channel->IsModeSet('Q'))
 			{
-				if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
+				if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
 				{
 					// ulines can still kick with +Q in place
 					return ACR_ALLOW;
@@ -34,46 +54,25 @@ class ModuleNoKicks : public Module
 				else
 				{
 					// nobody else can (not even opers with override, and founders)
+					source->WriteNumeric(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name,dest->nick.c_str());
 					return ACR_DENY;
 				}
 			}
 		}
 		return ACR_DEFAULT;
 	}
-	
+
 	virtual ~ModuleNoKicks()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nk);
+		delete nk;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
-	}
-};
-
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
-	{
-	}
-	
-	~ModuleNoKicksFactory()
-	{
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoKicks;
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)