Restore <options:exemptchanops> with long names

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12502 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 10 insertions, 8 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index a9a1af482..d973fb66c 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -77,7 +77,6 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "socketengine.h"
 #include "snomasks.h"
 #include "filelogger.h"
-#include "caller.h"
 #include "modules.h"
 #include "threadengine.h"
 #include "configreader.h"
@@ -240,6 +239,7 @@ DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
 DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
 DEFINE_HANDLER1(RehashHandler, void, const std::string&);
+DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
 /** The main class of the irc server.
  * This class contains instances of all the other classes in this software.
@@ -308,6 +308,7 @@ class CoreExport InspIRCd
 	IsNickHandler HandleIsNick;
 	IsIdentHandler HandleIsIdent;
 	FloodQuitUserHandler HandleFloodQuitUser;
+	OnCheckExemptionHandler HandleOnCheckExemption;
 	IsChannelHandler HandleIsChannel;
 	IsSIDHandler HandleIsSID;
 	RehashHandler HandleRehash;
@@ -782,6 +783,13 @@ class CoreExport InspIRCd
 	 */
 	caller1<void, User*> FloodQuitUser;
 
+	/** Called to check whether a channel restriction mode applies to a user
+	 * @param User that is attempting some action
+	 * @param Channel that the action is being performed on
+	 * @param Action name
+	 */
+	caller3<ModResult, User*, Channel*, const std::string&> OnCheckExemption;
+
 	/** Restart the server.
 	 * This function will not return. If an error occurs,
 	 * it will throw an instance of CoreException.
diff --git a/include/modules.h b/include/modules.h
index 4f60d55e4..71cbc8480 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -327,7 +327,7 @@ enum Implementation
 	I_OnPostOper, I_OnSyncNetwork, I_OnSetAway, I_OnPostCommand, I_OnPostJoin,
 	I_OnWhoisLine, I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
 	I_OnText, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookIO,
-	I_OnPreRehash, I_OnModuleRehash, I_OnSendWhoLine, I_OnChangeIdent, I_OnChannelRestrictionApply,
+	I_OnPreRehash, I_OnModuleRehash, I_OnSendWhoLine, I_OnChangeIdent,
 	I_END
 };
 
@@ -1278,12 +1278,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 * @param line The raw line to send; modifiable, if empty no line will be returned.
 	 */
 	virtual void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* channel, std::string& line);
-
-	/** Called to check whether a channel restriction mode applies to a user on it
-	 * @return MOD_RES_DENY to apply the restriction, MOD_RES_ALLOW to bypass
-	 * the restriction, or MOD_RES_PASSTHRU to check restriction status normally
-	 */
-	virtual ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction);
 };