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

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index b060d87f8..1f58a2e08 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,24 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
+/* $ModDesc: Provides channel mode +Q to prevent kicks on the channel. */
 
 class NoKicks : public SimpleChannelModeHandler
 {
  public:
-	NoKicks(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'Q') { }
+	NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
 };
 
 class ModuleNoKicks : public Module
@@ -26,13 +35,16 @@ class ModuleNoKicks : public Module
 	NoKicks nk;
 
  public:
-	ModuleNoKicks(InspIRCd* Me)
-		: Module(Me), nk(Me, this)
+	ModuleNoKicks()
+		: nk(this)
+	{
+	}
+
+	void init()
 	{
-		if (!ServerInstance->Modes->AddMode(&nk))
-			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->AddService(nk);
 		Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void On005Numeric(std::string &output)
@@ -44,29 +56,20 @@ class ModuleNoKicks : public Module
 	{
 		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
 		{
-			if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
-			{
-				// 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;
-			}
+			// 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;
 	}
 
 	~ModuleNoKicks()
 	{
-		ServerInstance->Modes->DelMode(&nk);
 	}
 
 	Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
 };