X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=7b1ee43b480721aa733f4d0d88e685962fe8d3f3;hb=3039e0663f7e45a45e9574a6aa7463bbe77e849f;hp=48d063455d73a42f71f5e66bedd7541fdf871120;hpb=43d1577839df81d3746092f11ebd1280ca2f85c1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index 48d063455..7b1ee43b4 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -230,13 +230,9 @@ do { \
 #define FD_MAGIC_NUMBER -42
 
 /* Useful macros */
-#ifdef WINDOWS
+
 /** Is a local user */
 #define IS_LOCAL(x) ((x->GetFd() > -1))
-#else
-/** Is a local user */
-#define IS_LOCAL(x) ((x->GetFd() > -1) && (x->GetFd() <= MAX_DESCRIPTORS))
-#endif
 /** Is a remote user */
 #define IS_REMOTE(x) (x->GetFd() < 0)
 /** Is a module created user */
@@ -399,9 +395,9 @@ enum Implementation
 	I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, 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_OnCancelAway, I_OnUserList,
+	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,
-	I_OnText, I_OnReadConfig, I_OnDownloadFile, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookUserIO,
+	I_OnText, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookUserIO,
 	I_END
 };
 
@@ -436,10 +432,6 @@ class CoreExport Module : public Extensible
 	{
 	}
 
-	virtual void OnReadConfig(ServerConfig* config, ConfigReader* coreconf);
-
-	virtual int OnDownloadFile(const std::string &filename, std::istream* &filedata);
-
 	/** Returns the version number of a Module.
 	 * The method should return a Version object with its version information assigned via
 	 * Version::Version
@@ -553,9 +545,10 @@ class CoreExport Module : public Extensible
 	 * @param cname The channel name being joined. For new channels this is valid where chan is not.
 	 * @param privs A string containing the users privilages when joining the channel. For new channels this will contain "@".
 	 * You may alter this string to alter the user's modes on the channel.
+	 * @param keygiven The key given to join the channel, or an empty string if none was provided
 	 * @return 1 To prevent the join, 0 to allow it.
 	 */
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs);
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven);
 	
 	/** Called whenever a user is about to be kicked.
 	 * Returning a value of 1 from this function stops the process immediately, causing no
@@ -1134,7 +1127,8 @@ class CoreExport Module : public Extensible
 	 * return 1 to explicitly allow the join to go ahead or 0 to ignore the event.
 	 * @param user The user joining the channel
 	 * @param chan The channel being joined
-	 * @return 1 to explicitly allow the join, 0 to proceed as normal
+	 * @return 1 to explicitly allow the join, 0 to proceed as normal. Return -1 to explicitly deny the
+	 * join to the channel.
 	 */
 	virtual int OnCheckBan(User* user, Channel* chan);
 
@@ -1299,17 +1293,15 @@ class CoreExport Module : public Extensible
 	 */
 	virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult);
 
-	/** Called whenever a user sets away.
-	 * This method has no parameter for the away message, as it is available in the
-	 * user record as User::awaymsg.
+	/** Called whenever a user sets away or returns from being away.
+	 * The away message is available as a parameter, but should not be modified.
+	 * At this stage, it has already been copied into the user record.
+	 * If awaymsg is empty, the user is returning from away.
 	 * @param user The user setting away
+	 * @param awaymsg The away message of the user, or empty if returning from away
+	 * @return nonzero if the away message should be blocked - should ONLY be nonzero for LOCAL users (IS_LOCAL) (no output is returned by core)
 	 */
-	virtual void OnSetAway(User* user);
-
-	/** Called when a user cancels their away state.
-	 * @param user The user returning from away
-	 */
-	virtual void OnCancelAway(User* user);
+	virtual int OnSetAway(User* user, const std::string &awaymsg);
 
 	/** Called whenever a NAMES list is requested.
 	 * You can produce the nameslist yourself, overriding the current list,