X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=c938e6a9d0749f91e44ecb420ede9e40f5a400c9;hb=5544649cd2058ba6d30925e61d20ae4a0245c0fa;hp=fc2aa6324b9dbdf8d0f6a52ec616548b936dcd8e;hpb=bd1471bc08be28bc2554d35fdaeb078338b14266;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index fc2aa6324..c938e6a9d 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -39,7 +39,6 @@
  */
 enum ModuleFlags {
 	VF_NONE = 0,		// module is not special at all
-	VF_STATIC = 1,		// module is static, cannot be /unloadmodule'd
 	VF_VENDOR = 2,		// module is a vendor module (came in the original tarball, not 3rd party)
 	VF_COMMON = 4,		// module needs to be common on all servers in a network to link
 	VF_OPTCOMMON = 8,	// module should be common on all servers for unsurprising behavior
@@ -222,7 +221,7 @@ enum Priority { PRIORITY_FIRST, PRIORITY_LAST, PRIORITY_BEFORE, PRIORITY_AFTER }
 enum Implementation
 {
 	I_OnUserConnect, I_OnUserQuit, I_OnUserDisconnect, I_OnUserJoin, I_OnUserPart,
-	I_OnSendSnotice, I_OnUserPreJoin, I_OnUserPreKick, I_OnUserKick, I_OnOper, I_OnInfo, I_OnWhois,
+	I_OnSendSnotice, I_OnUserPreJoin, I_OnUserPreKick, I_OnUserKick, I_OnOper, I_OnInfo,
 	I_OnUserPreInvite, I_OnUserInvite, I_OnUserPreMessage, I_OnUserPreNick,
 	I_OnUserMessage, I_OnMode, I_OnSyncUser,
 	I_OnSyncChannel, I_OnDecodeMetaData, I_OnAcceptConnection, I_OnUserInit,
@@ -234,7 +233,7 @@ enum Implementation
 	I_OnPostTopicChange, I_OnPostConnect,
 	I_OnChangeLocalUserGECOS, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
 	I_OnPostOper, I_OnSyncNetwork, I_OnSetAway, I_OnPostCommand, I_OnPostJoin,
-	I_OnWhoisLine, I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
+	I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
 	I_OnText, I_OnPassCompare, I_OnNamesListItem, I_OnNumeric,
 	I_OnPreRehash, I_OnModuleRehash, I_OnSendWhoLine, I_OnChangeIdent, I_OnSetUserIP,
 	I_END
@@ -469,14 +468,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual void OnInfo(User* user);
 
-	/** Called whenever a /WHOIS is performed on a local user.
-	 * The source parameter contains the details of the user who issued the WHOIS command, and
-	 * the dest parameter contains the information of the user they are whoising.
-	 * @param source The user issuing the WHOIS command
-	 * @param dest The user who is being WHOISed
-	 */
-	virtual void OnWhois(User* source, User* dest);
-
 	/** Called whenever a user is about to invite another user into a channel, before any processing is done.
 	 * Returning 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,
@@ -962,19 +953,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual ModResult OnSetAway(User* user, const std::string &awaymsg);
 
-	/** Called whenever a line of WHOIS output is sent to a user.
-	 * You may change the numeric and the text of the output by changing
-	 * the values numeric and text, but you cannot change the user the
-	 * numeric is sent to. You may however change the user's User values.
-	 * @param user The user the numeric is being sent to
-	 * @param dest The user being WHOISed
-	 * @param numeric The numeric of the line being sent
-	 * @param text The text of the numeric, including any parameters
-	 * @return nonzero to drop the line completely so that the user does not
-	 * receive it, or zero to allow the line to be sent.
-	 */
-	virtual ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text);
-
 	/** Called at intervals for modules to garbage-collect any hashes etc.
 	 * Certain data types such as hash_map 'leak' buckets, which must be
 	 * tidied up and freed by copying into a new item every so often. This
@@ -1090,6 +1068,13 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
 	 */
 	ServiceList* NewServices;
 
+	/** Expands the name of a module by prepending "m_" and appending ".so".
+	 * No-op if the name already has the ".so" extension.
+	 * @param modname Module name to expand
+	 * @return Module name starting with "m_" and ending with ".so"
+	 */
+	static std::string ExpandModName(const std::string& modname);
+
 	/** Simple, bog-standard, boring constructor.
 	 */
 	ModuleManager();