X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=48b477658b99382180fcf71daf0bcbde63396f12;hb=2d732f4d;hp=d04b0e243eba68e4fe8a1b86ed6cbfddd7d648b1;hpb=d1323ef03f90dc0a4b82137f2573b60a85cc965c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index d04b0e243..48b477658 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDmodules */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "socket.h"
 #include "socketengine.h"
@@ -26,9 +25,10 @@
 	#include <dirent.h>
 #endif
 
+
 // version is a simple class for holding a modules version number
-Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
+Version::Version(const std::string &modv, int flags, int api_ver, const std::string& rev)
+: version(modv + " - " + rev), Flags(flags), API(api_ver)
 {
 }
 
@@ -66,7 +66,7 @@ Module* Request::GetDest()
 	return this->dest;
 }
 
-char* Request::Send()
+const char* Request::Send()
 {
 	if (this->dest)
 	{
@@ -82,7 +82,7 @@ Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anyd
 
 char* Event::GetData()
 {
-	return (char*)this->data;
+	return this->data;
 }
 
 Module* Event::GetSource()
@@ -90,7 +90,7 @@ Module* Event::GetSource()
 	return this->source;
 }
 
-char* Event::Send(InspIRCd* ServerInstance)
+char* Event::Send(InspIRCd* SI)
 {
 	FOREACH_MOD(I_OnEvent,OnEvent(this));
 	return NULL;
@@ -104,58 +104,62 @@ std::string Event::GetEventID()
 
 // These declarations define the behavours of the base class Module (which does nothing at all)
 
-		Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
-		Module::~Module() { }
-void		Module::OnReadConfig(ServerConfig*, ConfigReader*) { }
-int		Module::OnDownloadFile(const std::string&, std::stringstream&) { return 0; }
+Module::Module(InspIRCd*) { }
+Module::~Module() { }
+
+ModResult	Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; }
 void		Module::OnUserConnect(User*) { }
 void		Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void		Module::OnUserDisconnect(User*) { }
-void		Module::OnUserJoin(User*, Channel*, bool, bool&) { }
-void		Module::OnPostJoin(User*, Channel*) { }
-void		Module::OnUserPart(User*, Channel*, const std::string&, bool&) { }
-void		Module::OnRehash(User*, const std::string&) { }
-void		Module::OnServerRaw(std::string&, bool, User*) { }
-int		Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; }
-void		Module::OnMode(User*, void*, int, const std::string&) { }
-Version		Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
+void		Module::OnUserJoin(Membership*, bool, bool, CUList&) { }
+void		Module::OnPostJoin(Membership*) { }
+void		Module::OnUserPart(Membership*, std::string&, CUList&) { }
+void		Module::OnPreRehash(User*, const std::string&) { }
+void		Module::OnModuleRehash(User*, const std::string&) { }
+void		Module::OnRehash(User*) { }
+ModResult	Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnMode(User*, void*, int, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
+Version		Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); }
 void		Module::OnOper(User*, const std::string&) { }
-void		Module::OnPostOper(User*, const std::string&) { }
+void		Module::OnPostOper(User*, const std::string&, const std::string &) { }
 void		Module::OnInfo(User*) { }
 void		Module::OnWhois(User*, User*) { }
-int		Module::OnUserPreInvite(User*, User*, Channel*) { return 0; }
-int		Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; }
-int		Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; }
-int		Module::OnUserPreNick(User*, const std::string&) { return 0; }
+ModResult	Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreNick(User*, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnUserPostNick(User*, const std::string&) { }
-int		Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; }
+ModResult	Module::OnPreMode(User*, User*, Channel*, const std::vector<std::string>&) { return MOD_RES_PASSTHRU; }
 void		Module::On005Numeric(std::string&) { }
-int		Module::OnKill(User*, User*, const std::string&) { return 0; }
+ModResult	Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnLoadModule(Module*, const std::string&) { }
 void		Module::OnUnloadModule(Module*, const std::string&) { }
 void		Module::OnBackgroundTimer(time_t) { }
-int		Module::OnPreCommand(const std::string&, const char**, int, User *, bool, const std::string&) { return 0; }
-void		Module::OnPostCommand(const std::string&, const char**, int, User *, CmdResult, const std::string&) { }
-bool		Module::OnCheckReady(User*) { return true; }
-int		Module::OnUserRegister(User*) { return 0; }
-int		Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; }
-void		Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { }
-int		Module::OnCheckInvite(User*, Channel*) { return 0; }
-int		Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; }
-int		Module::OnCheckLimit(User*, Channel*) { return 0; }
-int		Module::OnCheckBan(User*, Channel*) { return 0; }
-int		Module::OnStats(char, User*, string_list&) { return 0; }
-int		Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; }
-int		Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; }
-int		Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; }
+ModResult	Module::OnPreCommand(std::string&, std::vector<std::string>&, User *, bool, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnPostCommand(const std::string&, const std::vector<std::string>&, User *, CmdResult, const std::string&) { }
+ModResult	Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { }
+ModResult	Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckInvite(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckKey(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckLimit(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckChannelBan(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckBan(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnExtBanCheck(User*, Channel*, char) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnStats(char, User*, string_list&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnChangeLocalUserHost(User*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnChangeLocalUserGECOS(User*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnPreTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnEvent(Event*) { return; }
-char*		Module::OnRequest(Request*) { return NULL; }
-int		Module::OnOperCompare(const std::string&, const std::string&, int) { return 0; }
+const char*		Module::OnRequest(Request*) { return NULL; }
+ModResult	Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; }
 void		Module::OnGlobalOper(User*) { }
 void		Module::OnPostConnect(User*) { }
-int		Module::OnAddBan(User*, Channel*, const std::string &) { return 0; }
-int		Module::OnDelBan(User*, Channel*, const std::string &) { return 0; }
-void		Module::OnRawSocketAccept(int, const std::string&, int) { }
+ModResult	Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
+void		Module::OnRawSocketAccept(int, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
 int		Module::OnRawSocketWrite(int, const char*, int) { return 0; }
 void		Module::OnRawSocketClose(int) { }
 void		Module::OnRawSocketConnect(int) { }
@@ -163,35 +167,40 @@ int		Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; }
 void		Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { }
 void		Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { }
 void 		Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { }
-void		Module::OnUserInvite(User*, User*, Channel*) { }
-void		Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { }
+void		Module::OnUserInvite(User*, User*, Channel*, time_t) { }
+void		Module::OnPostTopicChange(User*, Channel*, const std::string&) { }
 void		Module::OnGetServerDescription(const std::string&, std::string&) { }
 void		Module::OnSyncUser(User*, Module*, void*) { }
 void		Module::OnSyncChannel(Channel*, Module*, void*) { }
-void		Module::ProtoSendMode(void*, int, void*, const std::string&) { }
-void		Module::OnSyncChannelMetaData(Channel*, Module*, void*, const std::string&, bool) { }
-void		Module::OnSyncUserMetaData(User*, Module*, void*, const std::string&, bool) { }
-void		Module::OnSyncOtherMetaData(Module*, void*, bool) { }
-void		Module::OnDecodeMetaData(int, void*, const std::string&, const std::string&) { }
-void		Module::ProtoSendMetaData(void*, int, void*, const std::string&, const std::string&) { }
+void		Module::OnSyncNetwork(Module*, void*) { }
+void		Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
+void		Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { }
+void		Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { }
 void		Module::OnWallops(User*, const std::string&) { }
 void		Module::OnChangeHost(User*, const std::string&) { }
 void		Module::OnChangeName(User*, const std::string&) { }
+void		Module::OnChangeIdent(User*, const std::string&) { }
 void		Module::OnAddLine(User*, XLine*) { }
 void		Module::OnDelLine(User*, XLine*) { }
+void		Module::OnExpireLine(XLine*) { }
 void 		Module::OnCleanup(int, void*) { }
+ModResult	Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; }
 void		Module::OnChannelDelete(Channel*) { }
-void		Module::OnSetAway(User*) { }
-void		Module::OnCancelAway(User*) { }
-int		Module::OnUserList(User*, Channel*, CUList*&) { return 0; }
-int		Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; }
+ModResult	Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
 void		Module::OnGarbageCollect() { }
 void		Module::OnBufferFlushed(User*) { }
 void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
+void		Module::OnRunTestSuite() { }
+void		Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { }
+ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnHookIO(EventHandler*, ListenSocketBase*) { }
+ModResult	Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; }
+void		Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { }
 
-
-ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
+ModuleManager::ModuleManager() : ModCount(0)
 {
 }
 
@@ -231,7 +240,7 @@ void ModuleManager::DetachAll(Module* mod)
 		Detach((Implementation)n, mod);
 }
 
-bool ModuleManager::SetPriority(Module* mod, PriorityState s)
+bool ModuleManager::SetPriority(Module* mod, Priority s)
 {
 	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
 		SetPriority(mod, (Implementation)n, s);
@@ -239,7 +248,7 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s)
 	return true;
 }
 
-bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
 {
 	/** To change the priority of a module, we first find its position in the vector,
 	 * then we find the position of the other modules in the vector that this module
@@ -247,7 +256,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	 * on which they want, and we make sure our module is *at least* before or after
 	 * the first or last of this subset, depending again on the type of priority.
 	 */
-	size_t swap_pos;
+	size_t swap_pos = 0;
 	size_t source = 0;
 	bool swap = true;
 	bool found = false;
@@ -274,22 +283,27 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	switch (s)
 	{
 		/* Dummy value */
-		case PRIO_DONTCARE:
+		case PRIORITY_DONTCARE:
 			swap = false;
 		break;
 		/* Module wants to be first, sod everything else */
-		case PRIO_FIRST:
-			swap_pos = 0;
+		case PRIORITY_FIRST:
+			if (prioritizationState != PRIO_STATE_FIRST)
+				swap = false;
+			else
+				swap_pos = 0;
 		break;
-		/* Module is submissive and wants to be last... awww. */
-		case PRIO_LAST:
-			if (EventHandlers[i].empty())
+		/* Module wants to be last. */
+		case PRIORITY_LAST:
+			if (prioritizationState != PRIO_STATE_FIRST)
+				swap = false;
+			else if (EventHandlers[i].empty())
 				swap_pos = 0;
 			else
 				swap_pos = EventHandlers[i].size() - 1;
 		break;
 		/* Place this module after a set of other modules */
-		case PRIO_AFTER:
+		case PRIORITY_AFTER:
 		{
 			/* Find the latest possible position */
 			swap_pos = 0;
@@ -308,7 +322,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 		}
 		break;
 		/* Place this module before a set of other modules */
-		case PRIO_BEFORE:
+		case PRIORITY_BEFORE:
 		{
 			swap_pos = EventHandlers[i].size() - 1;
 			swap = false;
@@ -329,7 +343,24 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 
 	/* Do we need to swap? */
 	if (swap && (swap_pos != source))
-		std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]);
+	{
+		// We are going to change positions; we'll need to run again to verify all requirements
+		if (prioritizationState == PRIO_STATE_LAST)
+			prioritizationState = PRIO_STATE_AGAIN;
+		/* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
+		int incrmnt = 1;
+
+		if (source > swap_pos)
+			incrmnt = -1;
+
+		for (unsigned int j = source; j != swap_pos; j += incrmnt)
+		{
+			if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+				continue;
+
+			std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
+		}
+	}
 
 	return true;
 }
@@ -348,14 +379,14 @@ bool ModuleManager::Load(const char* filename)
 	if (strchr(filename,'*') || (strchr(filename,'?')))
 	{
 		int n_match = 0;
-		DIR* library = opendir(Instance->Config->ModPath);
+		DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
 		if (library)
 		{
 			/* Try and locate and load all modules matching the pattern */
 			dirent* entry = NULL;
-			while ((entry = readdir(library)))
+			while (0 != (entry = readdir(library)))
 			{
-				if (Instance->MatchText(entry->d_name, filename))
+				if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
 				{
 					if (!this->Load(entry->d_name))
 						n_match++;
@@ -367,34 +398,27 @@ bool ModuleManager::Load(const char* filename)
 		 * to load (but wont abort when it encounters a bad one) and when 1 or
 		 * more modules were actually loaded.
 		 */
-		return (n_match > 0);
+		return (n_match > 0 ? false : true);
 	}
 
 	char modfile[MAXBUF];
-	snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
+	snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename);
 	std::string filename_str = filename;
 
-	if (!ServerConfig::DirValid(modfile))
-	{
-		LastModuleError = "Module " + filename_str + " is not within the modules directory.";
-		Instance->Log(DEFAULT, LastModuleError);
-		return false;
-	}
-	
 	if (!ServerConfig::FileExists(modfile))
 	{
 		LastModuleError = "Module file could not be found: " + filename_str;
-		Instance->Log(DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
-	
+
 	if (Modules.find(filename_str) != Modules.end())
-	{	
+	{
 		LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
-		Instance->Log(DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
-		
+
 	Module* newmod = NULL;
 	ircd_module* newhandle = NULL;
 
@@ -403,11 +427,12 @@ bool ModuleManager::Load(const char* filename)
 		/* This will throw a CoreException if there's a problem loading
 		 * the module file or getting a pointer to the init_module symbol.
 		 */
-		newhandle = new ircd_module(Instance, modfile, "init_module");
+		newhandle = new ircd_module(ServerInstance, modfile, "init_module");
 		newmod = newhandle->CallInit();
 
 		if (newmod)
 		{
+			newmod->ModuleSourceFile = filename_str;
 			Version v = newmod->GetVersion();
 
 			if (v.API != API_VERSION)
@@ -416,12 +441,12 @@ bool ModuleManager::Load(const char* filename)
 				delete newmod;
 				delete newhandle;
 				LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")";
-				Instance->Log(DEFAULT, LastModuleError);
+				ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 				return false;
 			}
 			else
 			{
-				Instance->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+				ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 			}
 
 			Modules[filename_str] = std::make_pair(newhandle, newmod);
@@ -430,7 +455,7 @@ bool ModuleManager::Load(const char* filename)
 		{
 			delete newhandle;
 			LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
-			Instance->Log(DEFAULT, LastModuleError);
+			ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 	}
@@ -443,7 +468,7 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 	catch (FindSymbolException& modexcept)
@@ -454,7 +479,7 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 	catch (CoreException& modexcept)
@@ -465,21 +490,30 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 
 	this->ModCount++;
-	FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
+	FOREACH_MOD_I(ServerInstance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
 
 	/* We give every module a chance to re-prioritize when we introduce a new one,
 	 * not just the one thats loading, as the new module could affect the preference
 	 * of others
 	 */
-	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
-		n->second.second->Prioritize();
+	for(int tries = 0; tries < 20; tries++)
+	{
+		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
+		for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+			n->second.second->Prioritize();
+
+		if (prioritizationState == PRIO_STATE_LAST)
+			break;
+		if (tries == 19)
+			ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str);
+	}
 
-	Instance->BuildISupport();
+	ServerInstance->BuildISupport();
 	return true;
 }
 
@@ -493,49 +527,50 @@ bool ModuleManager::Unload(const char* filename)
 		if (modfind->second.second->GetVersion().Flags & VF_STATIC)
 		{
 			LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
-			Instance->Log(DEFAULT, LastModuleError);
+			ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 		std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modfind->second.second);
 		if (intercount.first > 0)
 		{
 			LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'";
-			Instance->Log(DEFAULT, LastModuleError);
+			ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 
 		/* Give the module a chance to tidy out all its metadata */
-		for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
+		for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); c++)
 		{
 			modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
 		}
-		for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++)
+		for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
 		{
 			modfind->second.second->OnCleanup(TYPE_USER,u->second);
 		}
 
 		/* Tidy up any dangling resolvers */
-		Instance->Res->CleanResolvers(modfind->second.second);
+		ServerInstance->Res->CleanResolvers(modfind->second.second);
 
 
-		FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
+		FOREACH_MOD_I(ServerInstance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
 
 		this->DetachAll(modfind->second.second);
 
-		Instance->Parser->RemoveCommands(filename);
+		ServerInstance->Parser->RemoveCommands(modfind->second.second);
+		Extensible::UnRegister(modfind->second.second);
 
 		delete modfind->second.second;
 		delete modfind->second.first;
 		Modules.erase(modfind);
 
-		Instance->Log(DEFAULT,"Module %s unloaded",filename);
+		ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
 		this->ModCount--;
-		Instance->BuildISupport();
+		ServerInstance->BuildISupport();
 		return true;
 	}
 
 	LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
-	Instance->Log(DEFAULT, LastModuleError);
+	ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 	return false;
 }
 
@@ -545,16 +580,42 @@ void ModuleManager::LoadAll()
 	char configToken[MAXBUF];
 	ModCount = -1;
 
-	for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
+	printf("\nLoading core commands");
+	fflush(stdout);
+
+	DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
+	if (library)
 	{
-		Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF);
+		dirent* entry = NULL;
+		while (0 != (entry = readdir(library)))
+		{
+			if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
+			{
+				printf(".");
+				fflush(stdout);
+
+				if (!Load(entry->d_name))
+				{
+					ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
+					printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+					ServerInstance->Exit(EXIT_STATUS_MODULE);
+				}
+			}
+		}
+		closedir(library);
+		printf("\n");
+	}
+
+	for(int count = 0; count < ServerInstance->Config->ConfValueEnum("module"); count++)
+	{
+		ServerInstance->Config->ConfValue("module", "name", count, configToken, MAXBUF);
 		printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
-		
-		if (!this->Load(configToken))		
+
+		if (!this->Load(configToken))
 		{
-			Instance->Log(DEFAULT, this->LastError());
+			ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
 			printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
-			Instance->Exit(EXIT_STATUS_MODULE);
+			ServerInstance->Exit(EXIT_STATUS_MODULE);
 		}
 	}
 }
@@ -572,7 +633,7 @@ bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
 bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
-	
+
 	if (iter == Features.end())
 		return false;
 
@@ -599,14 +660,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M
 		modulelist ml;
 		ml.push_back(Mod);
 		Interfaces[InterfaceName] = std::make_pair(0, ml);
-		return true;
 	}
 	else
 	{
 		iter->second.second.push_back(Mod);
-		return true;
 	}
-	return false;
+	return true;
 }
 
 bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
@@ -638,6 +697,19 @@ modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
 		return &(iter->second.second);
 }
 
+bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName)
+{
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+	if (iter == Interfaces.end())
+		return false;
+	else
+	{
+		modulelist& ml = iter->second.second;
+		modulelist::iterator mi = std::find(ml.begin(), ml.end(), mod);
+		return (mi != ml.end());
+	}
+}
+
 void ModuleManager::UseInterface(const std::string &InterfaceName)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
@@ -699,14 +771,9 @@ Channel* InspIRCd::GetChannelIndex(long index)
 	return NULL;
 }
 
-bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
-{
-	return match(sliteral.c_str(),spattern.c_str());
-}
-
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
 {
-	return this->Parser->CallHandler(commandname,parameters,pcnt,user);
+	return this->Parser->CallHandler(commandname, parameters, user);
 }
 
 bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
@@ -723,45 +790,57 @@ void InspIRCd::AddCommand(Command *f)
 	}
 }
 
-void InspIRCd::SendMode(const char** parameters, int pcnt, User *user)
+void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
 {
-	this->Modes->Process(parameters,pcnt,user,true);
+	this->Modes->Process(parameters, user);
 }
 
-void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* user, const std::string &text)
 {
-	std::string CompleteLine = LinePrefix;
-	std::string Word;
-	while (TextStream >> Word)
+	if (IS_LOCAL(user))
 	{
-		if (CompleteLine.length() + Word.length() + 3 > 500)
-		{
-			User->WriteServ(CompleteLine);
-			CompleteLine = LinePrefix;
-		}
-		CompleteLine = CompleteLine + Word + " ";
+		user->Write(text);
+	}
+	else
+	{
+		PI->PushToClient(user, text);
 	}
-	User->WriteServ(CompleteLine);
 }
 
-User* FindDescriptorHandler::Call(int socket)
+void InspIRCd::DumpText(User* user, const char *text, ...)
 {
-	return reinterpret_cast<User*>(Server->SE->GetRef(socket));
-}
+	va_list argsPtr;
+	char line[MAXBUF];
 
-bool InspIRCd::AddMode(ModeHandler* mh)
-{
-	return this->Modes->AddMode(mh);
-}
+	va_start(argsPtr, text);
+	vsnprintf(line, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
 
-bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
-{
-	return this->Modes->AddModeWatcher(mw);
+	DumpText(user, std::string(line));
 }
 
-bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
+void InspIRCd::DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream)
 {
-	return this->Modes->DelModeWatcher(mw);
+	char line[MAXBUF];
+	int start_pos = LinePrefix.length();
+	int pos = start_pos;
+	memcpy(line, LinePrefix.data(), pos);
+	std::string Word;
+	while (TextStream >> Word)
+	{
+		int len = Word.length();
+		if (pos + len + 12 > MAXBUF)
+		{
+			line[pos] = '\0';
+			DumpText(user, std::string(line));
+			pos = start_pos;
+		}
+		line[pos] = ' ';
+		memcpy(line + pos + 1, Word.data(), len);
+		pos += len + 1;
+	}
+	line[pos] = '\0';
+	DumpText(user, std::string(line));
 }
 
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
@@ -795,52 +874,23 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 	return retval;
 }
 
-ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
+ConfigReader::ConfigReader(InspIRCd* Instance)
 {
-	/* Is there any reason to load the entire config file again here?
-	 * it's needed if they specify another config file, but using the
-	 * default one we can just use the global config data - pre-parsed!
-	 */
-	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	this->error = CONF_NO_ERROR;
-	this->data = &ServerInstance->Config->config_data;
-	this->privatehash = false;
+	this->error = 0;
 }
 
 
 ConfigReader::~ConfigReader()
 {
-	if (this->errorlog)
-		delete this->errorlog;
-	if(this->privatehash)
-		delete this->data;
-}
-
-
-ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
-{
-	ServerInstance->Config->ClearStack();
-
-	this->error = CONF_NO_ERROR;
-	this->data = new ConfigDataHash;
-	this->privatehash = true;
-	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	for (int pass = 0; pass < 2; pass++)
-	{
-		/*** XXX: Can return a 'not ready yet!' code! */
-		this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass);
-	}
-	if (!this->readerror)
-		this->error = CONF_FILE_NOT_FOUND;
 }
 
 
 std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
 {
-	/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ 
+	/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
 	std::string result;
-	
-	if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
+
+	if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 	}
@@ -854,7 +904,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
 {
-	return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index);
+	return ServerInstance->Config->ConfValueBool(tag, name, default_value, index);
 }
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
@@ -866,19 +916,19 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int
 int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
 {
 	int result;
-	
-	if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
+
+	if(!ServerInstance->Config->ConfValueInteger(tag, name, default_value, index, result))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 		return 0;
 	}
-	
+
 	if ((need_positive) && (result < 0))
 	{
 		this->error = CONF_INT_NEGATIVE;
 		return 0;
 	}
-	
+
 	return result;
 }
 
@@ -894,34 +944,22 @@ long ConfigReader::GetError()
 	return olderr;
 }
 
-void ConfigReader::DumpErrors(bool bail, User* user)
-{
-	ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
-}
-
-
 int ConfigReader::Enumerate(const std::string &tag)
 {
-	return ServerInstance->Config->ConfValueEnum(*this->data, tag);
+	return ServerInstance->Config->ConfValueEnum(tag);
 }
 
 int ConfigReader::EnumerateValues(const std::string &tag, int index)
 {
-	return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
+	return ServerInstance->Config->ConfVarEnum(tag, index);
 }
 
-bool ConfigReader::Verify()
-{
-	return this->readerror;
-}
-
-
-FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename)
 {
 	LoadFile(filename);
 }
 
-FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
+FileReader::FileReader(InspIRCd* Instance)
 {
 }