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

diff --git a/include/modules.h b/include/modules.h
index efb9113aa..7b1ee43b4 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -397,7 +397,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_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
 };
 
@@ -432,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
@@ -549,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
@@ -1130,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);