X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=5e58f002c502984c0f164722407bc5b6184586e3;hb=67de413cad88194972d55a8ff88464370890c5a9;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..5e58f002c 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,78 +1,68 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
+#include "inspircd.h"
+
+class NoKicks : public SimpleChannelModeHandler
+{
+ public:
+	NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
+};
 
 class ModuleNoKicks : public Module
 {
-	ConfigReader *Conf;
-	
+	NoKicks nk;
+
  public:
- 
 	ModuleNoKicks()
+		: nk(this)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
-	{
-		if (access_type == AC_KICK)
-		{
-			if (channel->IsCustomModeSet('Q'))
-			{
-				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;
-				}
-			}
-		}
-		return ACR_DEFAULT;
-	}
-	
-	virtual ~ModuleNoKicks()
-	{
-		delete Srv;
 	}
-	
-	virtual Version GetVersion()
+
+	void init() CXX11_OVERRIDE
 	{
-		return Version(1,0,0,0);
+		ServerInstance->Modules->AddService(nk);
 	}
-};
-
 
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('Q');
 	}
-	
-	~ModuleNoKicksFactory()
+
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
+		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet(nk)))
+		{
+			// Can't kick with Q in place, 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 MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleNoKicks;
+		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)