X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=1f58a2e08b71a7663ef052acd14b89e92a2610b4;hb=64faca29b377185c4615c8f2e4eecedc7ad045d1;hp=be06cd79cbcdfddb9b03df3fd1c5d1cddc622adb;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index be06cd79c..1f58a2e08 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,140 +1,77 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
-
-extern InspIRCd* ServerInstance;
+/* $ModDesc: Provides channel mode +Q to prevent kicks on the channel. */
 
-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
 {
-	Server *Srv;
-	NoKicks* nk;
-	
+	NoKicks nk;
+
  public:
- 
-	ModuleNoKicks(Server* Me)
-		: Module::Module(Me)
+	ModuleNoKicks()
+		: nk(this)
 	{
-		Srv = Me;
-		nk = new NoKicks(ServerInstance);
-		Srv->AddMode(nk, 'Q');
 	}
 
-	void Implements(char* List)
+	void init()
 	{
-		List[I_On005Numeric] = List[I_OnAccessCheck] = 1;
+		ServerInstance->Modules->AddService(nk);
+		Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
-		ServerInstance->ModeGrok->InsertMode(output,"Q",4);
+		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->IsModeSet('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)
-					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 %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;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoKicks()
+	~ModuleNoKicks()
 	{
-		DELETE(nk);
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
 
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
+	Version GetVersion()
 	{
+		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
-	
-	~ModuleNoKicksFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleNoKicks(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)