X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=0acf841187a7f3e91c0e4039fd377b25ed9040e1;hb=90abe2cd475c8ca2e81626f565d173e9f56d1251;hp=216fa3ae21791a3114c709afa7c39ec6a118c39b;hpb=3f546994609ed717a63222cb16c5359a09ebff35;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 216fa3ae2..0acf84118 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,105 +1,63 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
+#include "inspircd.h"
 
-class NoKicks : public ModeHandler
+class NoKicks : public SimpleChannelModeHandler
 {
  public:
-	NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('Q'))
-			{
-				channel->SetMode('Q',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('Q'))
-			{
-				channel->SetMode('Q',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
 };
 
 class ModuleNoKicks : public Module
 {
-	
-	NoKicks* nk;
-	
+	NoKicks nk;
+
  public:
- 
-	ModuleNoKicks(InspIRCd* Me)
-		: Module(Me)
+	ModuleNoKicks()
+		: nk(this)
 	{
-		
-		nk = new NoKicks(ServerInstance);
-		if (!ServerInstance->AddMode(nk, 'Q'))
-			throw ModuleException("Could not add new modes!");
 	}
 
-	void Implements(char* List)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		List[I_OnAccessCheck] = 1;
+		tokens["EXTBAN"].push_back('Q');
 	}
 
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
-		if (access_type == AC_KICK)
+		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet(nk)))
 		{
-			if (channel->IsModeSet('Q'))
-			{
-				if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
-				{
-					// ulines can still kick with +Q in place
-					return ACR_ALLOW;
-				}
-				else
-				{
-					// nobody else can (not even opers with override, and founders)
-					source->WriteServ("484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
-					return ACR_DENY;
-				}
-			}
+			// Can't kick with Q in place, not even opers with override, and founders
+			source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :Can't kick user %s from channel (+Q set)", memb->chan->name.c_str(), memb->user->nick.c_str());
+			return MOD_RES_DENY;
 		}
-		return ACR_DEFAULT;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoKicks()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(nk);
-		DELETE(nk);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
 };
 
-
-MODULE_INIT(ModuleNoKicks);
+MODULE_INIT(ModuleNoKicks)