X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=1be389bf767ab53c044393ac885b5a866f883876;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=58e6fbea134564e5a6234568dae8dc365ab14885;hpb=388e4ff40931dda5870ddef149e54bdcc6c5a711;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 58e6fbea1..1be389bf7 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -38,45 +38,35 @@ class ModuleNoKicks : public Module
 	ModuleNoKicks()
 		: nk(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&nk))
-			throw ModuleException("Could not add new modes!");
+	}
+
+	void init()
+	{
+		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)
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		ServerInstance->AddExtBanChar('Q');
+		tokens["EXTBAN"].push_back('Q');
 	}
 
 	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
 	{
 		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
 		{
-			if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(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()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleNoKicks)