X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=0d5a012ef214ef6aa888784bb8a0ff2e5f6c59ed;hb=1bfa48143c04504181d1b194af151fae2dac1eb1;hp=61ab868a5a08114d80202a84cc34960e90828fe0;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 61ab868a5..0d5a012ef 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,60 +18,54 @@
 class NoKicks : public SimpleChannelModeHandler
 {
  public:
-	NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
+	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->Modes->AddMode(nk))
+		if (!ServerInstance->Modes->AddMode(&nk))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnAccessCheck, I_On005Numeric };
+		Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('Q');
 	}
 
-	virtual int OnAccessCheck(User* source,User* dest,Channel* 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') || channel->GetExtBanStatus(source, 'Q') < 0)
+			if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
 			{
-				if ((ServerInstance->ULine(source->nick.c_str())) || (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->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name.c_str(), dest->nick.c_str());
-					return ACR_DENY;
-				}
+				// 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;
 			}
 		}
-		return ACR_DEFAULT;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoKicks()
+	~ModuleNoKicks()
 	{
-		ServerInstance->Modes->DelMode(nk);
-		delete nk;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +Q", VF_VENDOR);
 	}
 };