X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=a7f86cdb5440c25c6769b37a3688823f9d977eea;hb=d4a1ea70451abb333e71f9cff09b624db59531a0;hp=2d06b73a0b64169c6ab707e51351e6ccd8ee4176;hpb=0b1c84c54185545b62673ad098fe0d3d19c22570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 2d06b73a0..a7f86cdb5 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -19,24 +19,28 @@
 
 #include "inspircd.h"
 #include "listmode.h"
+#include "modules/exemption.h"
 
 /** Handles channel mode +X
  */
 class ExemptChanOps : public ListModeBase
 {
  public:
-	ExemptChanOps(Module* Creator) : ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", 954, 953, false, "exemptchanops") { }
+	ExemptChanOps(Module* Creator)
+		: ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", 954, 953, false)
+	{
+	}
 
-	bool ValidateParam(User* user, Channel* chan, std::string &word)
+	bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
 		std::string::size_type p = word.find(':');
 		if (p == std::string::npos)
 		{
-			user->WriteNumeric(955, "%s %s :Invalid exemptchanops entry, format is <restriction>:<prefix>", chan->name.c_str(), word.c_str());
+			user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Invalid exemptchanops entry, format is <restriction>:<prefix>"));
 			return false;
 		}
 
-		std::string restriction = word.substr(0, p);
+		std::string restriction(word, 0, p);
 		// If there is a '-' in the restriction string ignore it and everything after it
 		// to support "auditorium-vis" and "auditorium-see" in m_auditorium
 		p = restriction.find('-');
@@ -45,34 +49,23 @@ class ExemptChanOps : public ListModeBase
 
 		if (!ServerInstance->Modes->FindMode(restriction, MODETYPE_CHANNEL))
 		{
-			user->WriteNumeric(955, "%s %s :Unknown restriction", chan->name.c_str(), restriction.c_str());
+			user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Unknown restriction"));
 			return false;
 		}
 
 		return true;
 	}
-
-	void TellListTooLong(User* user, Channel* chan, std::string &word)
-	{
-		user->WriteNumeric(959, "%s %s :Channel exemptchanops list is full", chan->name.c_str(), word.c_str());
-	}
-
-	void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
-	{
-		user->WriteNumeric(957, "%s :The word %s is already on the exemptchanops list", chan->name.c_str(), word.c_str());
-	}
-
-	void TellNotSet(User* user, Channel* chan, std::string &word)
-	{
-		user->WriteNumeric(958, "%s :No such exemptchanops word is set", chan->name.c_str());
-	}
 };
 
-class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std::string&>
+class ExemptHandler : public CheckExemption::EventListener
 {
  public:
 	ExemptChanOps ec;
-	ExemptHandler(Module* me) : ec(me) {}
+	ExemptHandler(Module* me)
+		: CheckExemption::EventListener(me)
+		, ec(me)
+	{
+	}
 
 	PrefixMode* FindMode(const std::string& mid)
 	{
@@ -83,7 +76,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 		return mh ? mh->IsPrefixMode() : NULL;
 	}
 
-	ModResult Call(User* user, Channel* chan, const std::string& restriction)
+	ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE
 	{
 		unsigned int mypfx = chan->GetPrefixValue(user);
 		std::string minmode;
@@ -98,7 +91,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 				if (pos == std::string::npos)
 					continue;
 				if (!i->mask.compare(0, pos, restriction))
-					minmode = (*i).mask.substr(pos + 1);
+					minmode.assign(i->mask, pos + 1, std::string::npos);
 			}
 		}
 
@@ -108,7 +101,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 		if (mh || minmode == "*")
 			return MOD_RES_DENY;
 
-		return ServerInstance->HandleOnCheckExemption.Call(user, chan, restriction);
+		return MOD_RES_PASSTHRU;
 	}
 };
 
@@ -121,16 +114,6 @@ class ModuleExemptChanOps : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->OnCheckExemption = &eh;
-	}
-
-	~ModuleExemptChanOps()
-	{
-		ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption;
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);