X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=e9ada30ff367aab31e1a477810c3a2d71ad1f42a;hb=74f401f1997b89783217cd636f396e35f5c2a9d0;hp=168bc6c067e3cf64ae3e05084767832f09e48ed8;hpb=bd2782b9e80f10f91810fcc819bd6d77f1c991a0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index 168bc6c06..e9ada30ff 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -14,7 +14,6 @@
 #ifndef __MODULES_H
 #define __MODULES_H
 
-#include "globals.h"
 #include "dynamic.h"
 #include "base.h"
 #include "ctables.h"
@@ -252,13 +251,17 @@ do { \
 class CoreExport Version : public classbase
 {
  public:
-	 /** Version numbers, build number, flags and API version
-	  */
-	 const int Major, Minor, Revision, Build, Flags, API;
+	/** Version information.
+	 */
+	std::string version;
+
+	/** Flags and API version
+	 */
+	const int Flags, API;
 
-	 /** Initialize version class
-	  */
-	 Version(int major, int minor, int revision, int build, int flags, int api_ver);
+	/** Initialize version class
+	 */
+	Version(const std::string &sversion, int flags, int api_ver);
 };
 
 /** The ModuleMessage class is the base class of Request and Event
@@ -385,15 +388,15 @@ enum Priority { PRIORITY_FIRST, PRIORITY_DONTCARE, PRIORITY_LAST, PRIORITY_BEFOR
 enum Implementation
 {
 	I_BEGIN,
-	I_OnUserConnect, I_OnUserQuit, I_OnUserDisconnect, I_OnUserJoin, I_OnUserPart, I_OnRehash, I_OnServerRaw, 
+	I_OnUserConnect, I_OnUserQuit, I_OnUserDisconnect, I_OnUserJoin, I_OnUserPart, I_OnRehash, I_OnServerRaw, I_OnSendSnotice,
 	I_OnUserPreJoin, I_OnUserPreKick, I_OnUserKick, I_OnOper, I_OnInfo, I_OnWhois, I_OnUserPreInvite,
 	I_OnUserInvite, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreNick, I_OnUserMessage, I_OnUserNotice, I_OnMode,
 	I_OnGetServerDescription, I_OnSyncUser, I_OnSyncChannel, I_OnSyncChannelMetaData, I_OnSyncUserMetaData,
 	I_OnDecodeMetaData, I_ProtoSendMode, I_ProtoSendMetaData, I_OnWallops, I_OnChangeHost, I_OnChangeName, I_OnAddLine,
 	I_OnDelLine, I_OnExpireLine, I_OnCleanup, I_OnUserPostNick, I_OnAccessCheck, I_On005Numeric, I_OnKill, I_OnRemoteKill, I_OnLoadModule, I_OnUnloadModule,
 	I_OnBackgroundTimer, I_OnPreCommand, I_OnCheckReady, I_OnCheckInvite, I_OnRawMode,
-	I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckExtBan, I_OnStats, I_OnChangeLocalUserHost, I_OnChangeLocalUserGecos, I_OnLocalTopicChange,
-	I_OnPostLocalTopicChange, I_OnEvent, I_OnRequest, I_OnGlobalOper, I_OnPostConnect, I_OnAddBan, I_OnDelBan,
+	I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan, I_OnStats, I_OnChangeLocalUserHost, I_OnChangeLocalUserGecos, 
+	I_OnLocalTopicChange, I_OnPostLocalTopicChange, I_OnEvent, I_OnRequest, I_OnGlobalOper, I_OnPostConnect, I_OnAddBan, I_OnDelBan,
 	I_OnRawSocketAccept, I_OnRawSocketClose, I_OnRawSocketWrite, I_OnRawSocketRead, I_OnChangeLocalUserGECOS, I_OnUserRegister,
 	I_OnChannelPreDelete, I_OnChannelDelete, I_OnPostOper, I_OnSyncOtherMetaData, I_OnSetAway, I_OnUserList,
 	I_OnPostCommand, I_OnPostJoin, I_OnWhoisLine, I_OnBuildExemptList, I_OnRawSocketConnect, I_OnGarbageCollect, I_OnBufferFlushed,
@@ -528,6 +531,15 @@ class CoreExport Module : public Extensible
 	 */
  	virtual void OnServerRaw(std::string &raw, bool inbound, User* user);
 
+	/** Called whenever a snotice is about to be sent to a snomask.
+	 * snomask and type may both be modified; the message may not.
+	 * @param snomask The snomask the message is going to (e.g. 'A')
+	 * @param type The textual description the snomask will go to (e.g. 'OPER')
+	 * @param message The text message to be sent via snotice
+	 * @return 1 to block the snotice from being sent entirely, 0 else.
+	 */
+	virtual int OnSendSnotice(char &snomask, std::string &type, const std::string &message);
+
 	/** Called whenever a user is about to join a channel, before any processing is done.
 	 * Returning a value of 1 from this function stops the process immediately, causing no
 	 * output to be sent to the user by the core. If you do this you must produce your own numerics,
@@ -620,7 +632,7 @@ class CoreExport Module : public Extensible
 	 * @param dest The user being invited
 	 * @param channel The channel the user is being invited to
 	 * @param timeout The time the invite will expire (0 == never)
-	 * @return 1 to deny the invite, 0 to allow
+	 * @return 1 to deny the invite, 0 to check whether or not the user has permission to invite, -1 to explicitly allow the invite
 	 */
 	virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout);
 	
@@ -1134,12 +1146,18 @@ class CoreExport Module : public Extensible
 	virtual int OnCheckBan(User* user, Channel* chan);
 
 	/* Called whenever checking whether or not a user is matched by an applicable extended bantype.
+	 * NOTE: may also trigger extra OnCheckStringExtBan events!
 	 * @param u The user to check
 	 * @param c The channel the user is on
 	 * @param type The type of extended ban to check for.
 	 */
 	virtual int OnCheckExtBan(User *u, Channel *c, char type);
 
+	/** Called whenever checking whether or not a string is extbanned. NOTE: one OnCheckExtBan will also trigger a number of
+	 * OnCheckStringExtBan events for seperate host/IP comnbinations.
+	 */
+	virtual int OnCheckStringExtBan(const std::string &s, Channel *c, char type);
+
 	/** Called on all /STATS commands
 	 * This method is triggered for all /STATS use, including stats symbols handled by the core.
 	 * @param symbol the symbol provided to /STATS
@@ -1168,7 +1186,7 @@ class CoreExport Module : public Extensible
 	virtual int OnChangeLocalUserGECOS(User* user, const std::string &newhost); 
 
 	/** Called whenever a topic is changed by a local user.
-	 * Return 1 to deny the topic change, or 0 to allow it.
+	 * Return 1 to deny the topic change, 0 to check details on the change, -1 to let it through with no checks
 	 * @param user The user changing the topic
 	 * @param chan The channels who's topic is being changed
 	 * @param topic The actual topic text