X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=de0e0d7feb8fe2298313d18925901a66ce8b3232;hb=343f12b9b2d4e519b09877f76a00f6a0714509f2;hp=14a0186cb78b042e1e31dd47a9c4c573bda46675;hpb=32a26fa539242d009ffab01e09cafdaba9270dac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index 14a0186cb..de0e0d7fe 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_OnNamesListItem, I_OnNumeric, I_OnHookUserIO,
 	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
@@ -1245,6 +1245,8 @@ class CoreExport Module : public Extensible
 	 */
 	virtual int OnDelBan(User* source, Channel* channel,const std::string &banmask);
 
+	virtual void OnHookUserIO(User* user);
+
 	/** Called immediately after any  connection is accepted. This is intended for raw socket
 	 * processing (e.g. modules which wrap the tcp connection within another library) and provides
 	 * no information relating to a user record as the connection has not been assigned yet.
@@ -1352,6 +1354,19 @@ 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();
+
+	/** Called for every item in a NAMES list, so that modules may reformat portions of it as they see fit.
+	 * For example NAMESX, channel mode +u and +I, and UHNAMES. If the nick is set to an empty string by any
+	 * module, then this will cause the nickname not to be displayed at all.
+	 */
+	virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick);
+
+	virtual int OnNumeric(User* user, unsigned int numeric, const std::string &text);
 };