X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=35c439a10d6febe67eadc800fdedb3415b3624ed;hb=2a56c8f4ecf4b1a3cd82659d6a6d90068200f82e;hp=6a08aaec604cac96e39b4307c37afaa0f13da508;hpb=bfaf7e3b27981a5144faba6d17c6e29fac735dbb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index 6a08aaec6..35c439a10 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -135,7 +135,7 @@ typedef std::map<std::string, std::pair<int, modulelist> > interfacelist;
 		} \
 		catch (CoreException& modexcept) \
 		{ \
-			ServerInstance->Log(DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
+			ServerInstance->Logs->Log("MODULE",DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
 		} \
 		_i = safei; \
 	} \
@@ -159,7 +159,7 @@ typedef std::map<std::string, std::pair<int, modulelist> > interfacelist;
 		} \
 		catch (CoreException& modexcept) \
 		{ \
-			z->Log(DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
+			z->Logs->Log("MODULE",DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
 		} \
 		_i = safei; \
 	} \
@@ -188,7 +188,7 @@ do { \
 		} \
 		catch (CoreException& modexcept) \
 		{ \
-			ServerInstance->Log(DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
+			ServerInstance->Logs->Log("MODULE",DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
 		} \
 		_i = safei; \
 	} \
@@ -218,7 +218,7 @@ do { \
 		} \
 		catch (CoreException& modexcept) \
 		{ \
-			z->Log(DEBUG,"Exception caught: %s",modexcept.GetReason()); \
+			z->Logs->Log("MODULE",DEBUG,"Exception caught: %s",modexcept.GetReason()); \
 		} \
 		_i = safei; \
 	} \
@@ -401,7 +401,7 @@ enum Implementation
 	I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketWrite, I_OnRawSocketRead, I_OnChangeLocalUserGECOS, I_OnUserRegister,
 	I_OnChannelPreDelete, I_OnChannelDelete, I_OnPostOper, I_OnSyncOtherMetaData, I_OnSetAway, I_OnCancelAway, I_OnUserList,
 	I_OnPostCommand, I_OnPostJoin, I_OnWhoisLine, I_OnBuildExemptList, I_OnRawSocketConnect, I_OnGarbageCollect, I_OnBufferFlushed,
-	I_OnText, I_OnReadConfig, I_OnDownloadFile, I_OnPassCompare,
+	I_OnText, I_OnReadConfig, I_OnDownloadFile, I_OnPassCompare, I_OnRunTestSuite,
 	I_END
 };
 
@@ -1044,7 +1044,7 @@ class CoreExport Module : public Extensible
 	 * @param original_line The entire original line as passed to the parser from the user
 	 * @return 1 to block the command, 0 to allow
 	 */
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
+	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line);
 
 	/** Called after any command has been executed.
 	 * This event occurs for all registered commands, wether they are registered in the core,
@@ -1058,7 +1058,7 @@ class CoreExport Module : public Extensible
 	 * @param result The return code given by the command handler, one of CMD_SUCCESS or CMD_FAILURE
 	 * @param original_line The entire original line as passed to the parser from the user
 	 */
-	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
+	virtual void OnPostCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
 
 	/** Called to check if a user who is connecting can now be allowed to register
 	 * If any modules return false for this function, the user is held in the waiting
@@ -1101,9 +1101,11 @@ class CoreExport Module : public Extensible
 	 * @param param The parameter for the mode or an empty string
 	 * @param adding true of the mode is being added, false if it is being removed
 	 * @param pcnt The parameter count for the mode (0 or 1)
-	 * @return 1 to deny the mode, 0 to allow
+	 * @return ACR_DENY to deny the mode, ACR_DEFAULT to do standard mode checking, and ACR_ALLOW
+	 * to skip all permission checking. Please note that for remote mode changes, your return value
+	 * will be ignored!
 	 */
-	virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt);
+	virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode = true);
 
 	/** Called whenever a user joins a channel, to determine if key checks should go ahead or not.
 	 * This method will always be called for each join, wether or not the channel is actually +k, and
@@ -1350,6 +1352,11 @@ class CoreExport Module : public Extensible
 	 * @param user The user who's buffer is now empty.
 	 */
 	virtual void OnBufferFlushed(User* user);
+
+	/** Add test suite hooks here. These are used for testing functionality of a module
+	 * via the --testsuite debugging parameter.
+	 */
+	virtual void OnRunTestSuite();
 };