X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=0d5a012ef214ef6aa888784bb8a0ff2e5f6c59ed;hb=1bfa48143c04504181d1b194af151fae2dac1eb1;hp=5050101e006e68f8c03ca5aae73bc55f447f3b45;hpb=765cdd25cb1e3ad1b38a11865a9730e65be4b4e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 5050101e0..0d5a012ef 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,78 +1,73 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
+};
+
 class ModuleNoKicks : public Module
 {
-	ConfigReader *Conf;
-	
+	NoKicks nk;
+
  public:
- 
 	ModuleNoKicks()
+		: nk(this)
+	{
+		if (!ServerInstance->Modes->AddMode(&nk))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	void On005Numeric(std::string &output)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
+		ServerInstance->AddExtBanChar('Q');
 	}
-	
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
 	{
-		if (access_type == AC_KICK)
+		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
 		{
-			if (channel->IsCustomModeSet('Q'))
+			if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
 			{
-				if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
-				{
-					// ulines can still kick with +Q in place
-					return ACR_ALLOW;
-				}
-				else
-				{
-					// nobody else can (not even opers with override, and founders)
-					WriteServ(source->fd,"484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, c->name,dest->nick);
-					return ACR_DENY;
-				}
+				// ulines can still kick with +Q in place
+				return MOD_RES_PASSTHRU;
+			}
+			else
+			{
+				// nobody else can (not even opers with override, and founders)
+				source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), memb->chan->name.c_str(), memb->user->nick.c_str());
+				return MOD_RES_DENY;
 			}
 		}
-		return ACR_DEFAULT;
-	}
-	
-	virtual ~ModuleNoKicks()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
+		return MOD_RES_PASSTHRU;
 	}
-};
-
 
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
-	{
-	}
-	
-	~ModuleNoKicksFactory()
+	~ModuleNoKicks()
 	{
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion()
 	{
-		return new ModuleNoKicks;
+		return Version("Provides support for unreal-style channel mode +Q", VF_VENDOR);
 	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)