X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=9299254b24017acd17f3766d1be884cabc5f389e;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=b90932e6c189564432fbbacbac4dd4c902c3d1f2;hpb=50460419e6f76eecd57dc72a4f2fcc88dc114a50;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index b90932e6c..9299254b2 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,78 +1,64 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *
+ * 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 ModuleNoKicks : public Module
 {
-	Server *Srv;
-	
+	SimpleChannelModeHandler nk;
+
  public:
- 
 	ModuleNoKicks()
+		: nk(this, "nokick", 'Q')
 	{
-		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, channel->name,dest->nick);
-					return ACR_DENY;
-				}
-			}
-		}
-		return ACR_DEFAULT;
-	}
-	
-	virtual ~ModuleNoKicks()
-	{
-		delete Srv;
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
 
-
-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
 	{
+		bool modeset = memb->chan->IsModeSet(nk);
+		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!modeset))
+		{
+			// Can't kick with Q in place, not even opers with override, and founders
+			source->WriteNumeric(ERR_CHANOPRIVSNEEDED, memb->chan->name, InspIRCd::Format("Can't kick user %s from channel (%s)",
+				memb->user->nick.c_str(), modeset ? "+Q is set" : "you're extbanned"));
+			return MOD_RES_DENY;
+		}
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleNoKicks;
+		return Version("Adds channel mode Q (nokick) which prevents privileged users from using the /KICK command.", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)