X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=0142749cfe7a23806d68d093fc5006d5c3baaef6;hb=f1271614679843191bb247c0db2716acb5ac0e4b;hp=03c951fe74529a0bd7a03842faac68b1250b31b0;hpb=d0a0de4044bf0d48a876189ecefda95141246775;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 03c951fe7..0142749cf 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -2,29 +2,29 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+/* $Core: libIRCDmodules */
+
+#include "inspircd.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "socket.h"
 #include "socketengine.h"
 #include "command_parse.h"
 #include "dns.h"
-#include "inspircd.h"
+#include "exitcodes.h"
+
+#ifndef WIN32
+	#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)
@@ -44,7 +44,7 @@ Request::Request(char* anydata, Module* src, Module* dst)
 Request::Request(Module* src, Module* dst, const char* idstr)
 : id(idstr), source(src), dest(dst)
 {
-};
+}
 
 char* Request::GetData()
 {
@@ -78,7 +78,7 @@ char* Request::Send()
 	}
 }
 
-Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { };
+Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }
 
 char* Event::GetData()
 {
@@ -106,118 +106,463 @@ std::string Event::GetEventID()
 
 		Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
 		Module::~Module() { }
-void		Module::OnUserConnect(userrec* user) { }
-void		Module::OnUserQuit(userrec* user, const std::string& message) { }
-void		Module::OnUserDisconnect(userrec* user) { }
-void		Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void		Module::OnPostJoin(userrec* user, chanrec* channel) { }
-void		Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
-void		Module::OnRehash(const std::string &parameter) { }
-void		Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int		Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
-void		Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
+void		Module::OnReadConfig(ServerConfig*, ConfigReader*) { }
+int		Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; }
+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::OnOper(userrec* user, const std::string &opertype) { };
-void		Module::OnPostOper(userrec* user, const std::string &opertype) { };
-void		Module::OnInfo(userrec* user) { };
-void		Module::OnWhois(userrec* source, userrec* dest) { };
-int		Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
-int		Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int		Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int		Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; };
-void		Module::OnUserPostNick(userrec* user, const std::string &oldnick) { };
-int		Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; };
-void		Module::On005Numeric(std::string &output) { };
-int		Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; };
-void		Module::OnLoadModule(Module* mod,const std::string &name) { };
-void		Module::OnUnloadModule(Module* mod,const std::string &name) { };
-void		Module::OnBackgroundTimer(time_t curtime) { };
-int		Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { return 0; };
-void		Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { };
-bool		Module::OnCheckReady(userrec* user) { return true; };
-void		Module::OnUserRegister(userrec* user) { };
-int		Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void		Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
-int		Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
-int		Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
-int		Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
-int		Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
-int		Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; };
-int		Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; };
-int		Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; };
-int		Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; };
-void		Module::OnEvent(Event* event) { return; };
-char*		Module::OnRequest(Request* request) { return NULL; };
-int		Module::OnOperCompare(const std::string &password, const std::string &input) { return 0; };
-void		Module::OnGlobalOper(userrec* user) { };
-void		Module::OnPostConnect(userrec* user) { };
-int		Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-int		Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-void		Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { };
-int		Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; };
-void		Module::OnRawSocketClose(int fd) { };
-int		Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
-void		Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void		Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void 		Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { };
-void		Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
-void		Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
-void		Module::OnGetServerDescription(const std::string &servername,std::string &description) { };
-void		Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
-void		Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
-void		Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
-void		Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void		Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void		Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
-void		Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
-void		Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
-void		Module::OnWallops(userrec* user, const std::string &text) { };
-void		Module::OnChangeHost(userrec* user, const std::string &newhost) { };
-void		Module::OnChangeName(userrec* user, const std::string &gecos) { };
-void		Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void		Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { };
-void		Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void		Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { };
-void		Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void		Module::OnDelGLine(userrec* source, const std::string &hostmask) { };
-void		Module::OnDelZLine(userrec* source, const std::string &ipmask) { };
-void		Module::OnDelKLine(userrec* source, const std::string &hostmask) { };
-void		Module::OnDelQLine(userrec* source, const std::string &nickmask) { };
-void		Module::OnDelELine(userrec* source, const std::string &hostmask) { };
-void 		Module::OnCleanup(int target_type, void* item) { };
-void		Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; };
-void		Module::OnChannelDelete(chanrec* chan) { };
-Priority	Module::Prioritize() { return PRIORITY_DONTCARE; }
-void		Module::OnSetAway(userrec* user) { };
-void		Module::OnCancelAway(userrec* user) { };
-int		Module::OnUserList(userrec* user, chanrec* Ptr) { return 0; };
-int		Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; };
-
-long InspIRCd::PriorityAfter(const std::string &modulename)
-{
-	for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+void		Module::OnOper(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; }
+void		Module::OnUserPostNick(User*, const std::string&) { }
+int		Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; }
+void		Module::On005Numeric(std::string&) { }
+int		Module::OnKill(User*, User*, const std::string&) { return 0; }
+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::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return 0; }
+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; }
+void		Module::OnEvent(Event*) { return; }
+char*		Module::OnRequest(Request*) { return NULL; }
+int		Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; }
+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) { }
+int		Module::OnRawSocketWrite(int, const char*, int) { return 0; }
+void		Module::OnRawSocketClose(int) { }
+void		Module::OnRawSocketConnect(int) { }
+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::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::OnWallops(User*, const std::string&) { }
+void		Module::OnChangeHost(User*, const std::string&) { }
+void		Module::OnChangeName(User*, const std::string&) { }
+void		Module::OnAddLine(User*, XLine*) { }
+void		Module::OnDelLine(User*, XLine*) { }
+void		Module::OnExpireLine(XLine*) { }
+void 		Module::OnCleanup(int, void*) { }
+int		Module::OnChannelPreDelete(Channel*) { return 0; }
+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; }
+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&) { }
+
+
+ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
+{
+}
+
+ModuleManager::~ModuleManager()
+{
+}
+
+bool ModuleManager::Attach(Implementation i, Module* mod)
+{
+	if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end())
+		return false;
+
+	EventHandlers[i].push_back(mod);
+	return true;
+}
+
+bool ModuleManager::Detach(Implementation i, Module* mod)
+{
+	EventHandlerIter x = std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod);
+
+	if (x == EventHandlers[i].end())
+		return false;
+
+	EventHandlers[i].erase(x);
+	return true;
+}
+
+void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz)
+{
+	for (size_t n = 0; n < sz; ++n)
+		Attach(i[n], mod);
+}
+
+void ModuleManager::DetachAll(Module* mod)
+{
+	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+		Detach((Implementation)n, mod);
+}
+
+bool ModuleManager::SetPriority(Module* mod, PriorityState s)
+{
+	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+		SetPriority(mod, (Implementation)n, s);
+
+	return true;
+}
+
+bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState 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
+	 * wants to be before/after. We pick off either the first or last of these depending
+	 * 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 source = 0;
+	bool swap = true;
+	bool found = false;
+
+	/* Locate our module. This is O(n) but it only occurs on module load so we're
+	 * not too bothered about it
+	 */
+	for (size_t x = 0; x != EventHandlers[i].size(); ++x)
+	{
+		if (EventHandlers[i][x] == mod)
+		{
+			source = x;
+			found = true;
+			break;
+		}
+	}
+
+	/* Eh? this module doesnt exist, probably trying to set priority on an event
+	 * theyre not attached to.
+	 */
+	if (!found)
+		return false;
+
+	switch (s)
+	{
+		/* Dummy value */
+		case PRIO_DONTCARE:
+			swap = false;
+		break;
+		/* Module wants to be first, sod everything else */
+		case PRIO_FIRST:
+			swap_pos = 0;
+		break;
+		/* Module is submissive and wants to be last... awww. */
+		case PRIO_LAST:
+			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:
+		{
+			/* Find the latest possible position */
+			swap_pos = 0;
+			swap = false;
+			for (size_t x = 0; x != EventHandlers[i].size(); ++x)
+			{
+				for (size_t n = 0; n < sz; ++n)
+				{
+					if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x >= swap_pos) && (source <= swap_pos))
+					{
+						swap_pos = x;
+						swap = true;
+					}
+				}
+			}
+		}
+		break;
+		/* Place this module before a set of other modules */
+		case PRIO_BEFORE:
+		{
+			swap_pos = EventHandlers[i].size() - 1;
+			swap = false;
+			for (size_t x = 0; x != EventHandlers[i].size(); ++x)
+			{
+				for (size_t n = 0; n < sz; ++n)
+				{
+					if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x <= swap_pos) && (source >= swap_pos))
+					{
+						swap = true;
+						swap_pos = x;
+					}
+				}
+			}
+		}
+		break;
+	}
+
+	/* Do we need to swap? */
+	if (swap && (swap_pos != source))
+		std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]);
+
+	return true;
+}
+
+std::string& ModuleManager::LastError()
+{
+	return LastModuleError;
+}
+
+bool ModuleManager::Load(const char* filename)
+{
+	/* Do we have a glob pattern in the filename?
+	 * The user wants to load multiple modules which
+	 * match the pattern.
+	 */
+	if (strchr(filename,'*') || (strchr(filename,'?')))
+	{
+		int n_match = 0;
+		DIR* library = opendir(Instance->Config->ModPath);
+		if (library)
+		{
+			/* Try and locate and load all modules matching the pattern */
+			dirent* entry = NULL;
+			while ((entry = readdir(library)))
+			{
+				if (Instance->MatchText(entry->d_name, filename))
+				{
+					if (!this->Load(entry->d_name))
+						n_match++;
+				}
+			}
+			closedir(library);
+		}
+		/* Loadmodule will now return false if any one of the modules failed
+		 * to load (but wont abort when it encounters a bad one) and when 1 or
+		 * more modules were actually loaded.
+		 */
+		return (n_match > 0);
+	}
+
+	char modfile[MAXBUF];
+	snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,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);
+		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);
+		return false;
+	}
+		
+	Module* newmod = NULL;
+	ircd_module* newhandle = NULL;
+
+	try
+	{
+		/* 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");
+		newmod = newhandle->CallInit();
+
+		if (newmod)
+		{
+			Version v = newmod->GetVersion();
+
+			if (v.API != API_VERSION)
+			{
+				DetachAll(newmod);
+				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);
+				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]"));
+			}
+
+			Modules[filename_str] = std::make_pair(newhandle, newmod);
+		}
+		else
+		{
+			delete newhandle;
+			LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
+			Instance->Log(DEFAULT, LastModuleError);
+			return false;
+		}
+	}
+	/** XXX: Is there anything we can do about this mess? -- Brain */
+	catch (LoadModuleException& modexcept)
+	{
+		DetachAll(newmod);
+		if (newmod)
+			delete newmod;
+		if (newhandle)
+			delete newhandle;
+		LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
+		Instance->Log(DEFAULT, LastModuleError);
+		return false;
+	}
+	catch (FindSymbolException& modexcept)
+	{
+		DetachAll(newmod);
+		if (newmod)
+			delete newmod;
+		if (newhandle)
+			delete newhandle;
+		LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
+		Instance->Log(DEFAULT, LastModuleError);
+		return false;
+	}
+	catch (CoreException& modexcept)
+	{
+		DetachAll(newmod);
+		if (newmod)
+			delete newmod;
+		if (newhandle)
+			delete newhandle;
+		LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
+		Instance->Log(DEFAULT, LastModuleError);
+		return false;
+	}
+
+	this->ModCount++;
+	FOREACH_MOD_I(Instance,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();
+
+	Instance->BuildISupport();
+	return true;
+}
+
+bool ModuleManager::Unload(const char* filename)
+{
+	std::string filename_str(filename);
+	std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
+
+	if (modfind != Modules.end())
 	{
-		if (this->Config->module_names[j] == modulename)
+		if (modfind->second.second->GetVersion().Flags & VF_STATIC)
 		{
-			return ((j << 8) | PRIORITY_AFTER);
+			LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
+			Instance->Log(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);
+			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++)
+		{
+			modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
+		}
+		for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++)
+		{
+			modfind->second.second->OnCleanup(TYPE_USER,u->second);
+		}
+
+		/* Tidy up any dangling resolvers */
+		Instance->Res->CleanResolvers(modfind->second.second);
+
+
+		FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
+
+		this->DetachAll(modfind->second.second);
+
+		Instance->Parser->RemoveCommands(filename);
+
+		delete modfind->second.second;
+		delete modfind->second.first;
+		Modules.erase(modfind);
+
+		Instance->Log(DEFAULT,"Module %s unloaded",filename);
+		this->ModCount--;
+		Instance->BuildISupport();
+		return true;
 	}
-	return PRIORITY_DONTCARE;
+
+	LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
+	Instance->Log(DEFAULT, LastModuleError);
+	return false;
 }
 
-long InspIRCd::PriorityBefore(const std::string &modulename)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
 {
-	for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+	char configToken[MAXBUF];
+	ModCount = -1;
+
+	for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
 	{
-		if (this->Config->module_names[j] == modulename)
+		Instance->Config->ConfValue(Instance->Config->config_data, "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))		
 		{
-			return ((j << 8) | PRIORITY_BEFORE);
+			Instance->Log(DEFAULT, this->LastError());
+			printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+			Instance->Exit(EXIT_STATUS_MODULE);
 		}
 	}
-	return PRIORITY_DONTCARE;
 }
 
-bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
+bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
 {
 	if (Features.find(FeatureName) == Features.end())
 	{
@@ -227,7 +572,7 @@ bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
 	return false;
 }
 
-bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
 	
@@ -238,7 +583,7 @@ bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
 	return true;
 }
 
-Module* InspIRCd::FindFeature(const std::string &FeatureName)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
 
@@ -248,23 +593,108 @@ Module* InspIRCd::FindFeature(const std::string &FeatureName)
 	return iter->second;
 }
 
-const std::string& InspIRCd::GetModuleName(Module* m)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
+{
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+	if (iter == Interfaces.end())
+	{
+		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;
+}
+
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+{
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+	if (iter == Interfaces.end())
+		return false;
+
+	for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+	{
+		if (*x == Mod)
+		{
+			iter->second.second.erase(x);
+			if (iter->second.second.empty())
+				Interfaces.erase(InterfaceName);
+			return true;
+		}
+	}
+	return false;
+}
+
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
+{
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+	if (iter == Interfaces.end())
+		return NULL;
+	else
+		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)
 {
-	static std::string nothing = ""; /* Prevent compiler warning */
-	for (int i = 0; i <= this->GetModuleCount(); i++)
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+	if (iter != Interfaces.end())
+		iter->second.first++;
+
+}
+
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
+{
+	interfacelist::iterator iter = Interfaces.find(InterfaceName);
+	if (iter != Interfaces.end())
+		iter->second.first--;
+}
+
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
+{
+	for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
 	{
-		if (this->modules[i] == m)
+		for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
 		{
-			return this->Config->module_names[i];
+			if (*x == m)
+			{
+				return std::make_pair(iter->second.first, iter->first);
+			}
 		}
 	}
-	return nothing; /* As above */
+	return std::make_pair(0, "");
 }
 
-void InspIRCd::RehashServer()
+const std::string& ModuleManager::GetModuleName(Module* m)
 {
-	this->WriteOpers("*** Rehashing config file");
-	this->Config->Read(false,NULL);
+	static std::string nothing;
+
+	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+	{
+		if (n->second.second == m)
+			return n->first;
+	}
+
+	return nothing;
 }
 
 /* This is ugly, yes, but hash_map's arent designed to be
@@ -274,10 +704,10 @@ void InspIRCd::RehashServer()
  * m_safelist possible, initially).
  */
 
-chanrec* InspIRCd::GetChannelIndex(long index)
+Channel* InspIRCd::GetChannelIndex(long index)
 {
 	int target = 0;
-	for (chan_hash::iterator n = this->chanlist.begin(); n != this->chanlist.end(); n++, target++)
+	for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
 	{
 		if (index == target)
 			return n->second;
@@ -290,17 +720,17 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
 	return match(sliteral.c_str(),spattern.c_str());
 }
 
-bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user)
 {
 	return this->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
 
-bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
 {
 	return this->Parser->IsValidCommand(commandname, pcnt, user);
 }
 
-void InspIRCd::AddCommand(command_t *f)
+void InspIRCd::AddCommand(Command *f)
 {
 	if (!this->Parser->CreateCommand(f))
 	{
@@ -309,15 +739,15 @@ void InspIRCd::AddCommand(command_t *f)
 	}
 }
 
-void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
+void InspIRCd::SendMode(const char** parameters, int pcnt, User *user)
 {
 	this->Modes->Process(parameters,pcnt,user,true);
 }
 
-void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
 {
 	std::string CompleteLine = LinePrefix;
-	std::string Word = "";
+	std::string Word;
 	while (TextStream >> Word)
 	{
 		if (CompleteLine.length() + Word.length() + 3 > 500)
@@ -330,195 +760,46 @@ void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstre
 	User->WriteServ(CompleteLine);
 }
 
-userrec* InspIRCd::FindDescriptor(int socket)
-{
-	return reinterpret_cast<userrec*>(this->SE->GetRef(socket));
-}
-
-bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
-{
-	return this->Modes->AddMode(mh,mode);
-}
-
-bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
+User* FindDescriptorHandler::Call(int socket)
 {
-	return this->Modes->AddModeWatcher(mw);
-}
-
-bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
-{
-	return this->Modes->DelModeWatcher(mw);
-}
-
-bool InspIRCd::AddResolver(Resolver* r)
-{
-	return this->Res->AddResolverClass(r);
-}
-
-bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
-{
-	unsigned int old_fd = user->GetFd();
-	user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
-	user->FlushWriteBuf();
-	user->ClearBuffer();
-	user->SetFd(FD_MAGIC_NUMBER);
-
-	if (find(local_users.begin(),local_users.end(),user) != local_users.end())
-	{
-		local_users.erase(find(local_users.begin(),local_users.end(),user));
-	}
-
-	this->SE->DelFd(user);
-	shutdown(old_fd,2);
-	close(old_fd);
-	return true;
+	return reinterpret_cast<User*>(Server->SE->GetRef(socket));
 }
 
-bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
+bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
-	zombie->SetFd(alive->GetFd());
-	FOREACH_MOD_I(this,I_OnUserQuit,OnUserQuit(alive,message));
-	alive->SetFd(FD_MAGIC_NUMBER);
-	alive->FlushWriteBuf();
-	alive->ClearBuffer();
-	// save these for later
-	std::string oldnick = alive->nick;
-	std::string oldhost = alive->host;
-	std::string oldident = alive->ident;
-	userrec::QuitUser(this,alive,message.c_str());
-	if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
-	{
-		local_users.erase(find(local_users.begin(),local_users.end(),alive));
-	}
-	// Fix by brain - cant write the user until their fd table entry is updated
-	zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
-	for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
+	if (!cached)
+		return this->Res->AddResolverClass(r);
+	else
 	{
-		if (((ucrec*)(*i))->channel != NULL)
-		{
-				chanrec* Ptr = ((ucrec*)(*i))->channel;
-				zombie->WriteFrom(zombie,"JOIN %s",Ptr->name);
-				if (Ptr->topicset)
-				{
-					zombie->WriteServ("332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
-					zombie->WriteServ("333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
-				}
-				Ptr->UserList(zombie);
-				zombie->WriteServ("366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
-		}
+		r->TriggerCachedResult();
+		delete r;
+		return true;
 	}
-	if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->GetFd() != FD_MAGIC_NUMBER))
-		local_users.push_back(zombie);
-	return true;
-}
-
-void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-	XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-	XLines->apply_lines(APPLY_GLINES);
-}
-
-void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
-{
-	XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
-	XLines->apply_lines(APPLY_QLINES);
-}
-
-void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
-{
-	XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
-	XLines->apply_lines(APPLY_ZLINES);
-}
-
-void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-	XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-	XLines->apply_lines(APPLY_KLINES);
-}
-
-void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-	XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-}
-
-bool InspIRCd::DelGLine(const std::string &hostmask)
-{
-	return XLines->del_gline(hostmask.c_str());
-}
-
-bool InspIRCd::DelQLine(const std::string &nickname)
-{
-	return XLines->del_qline(nickname.c_str());
-}
-
-bool InspIRCd::DelZLine(const std::string &ipaddr)
-{
-	return XLines->del_zline(ipaddr.c_str());
-}
-
-bool InspIRCd::DelKLine(const std::string &hostmask)
-{
-	return XLines->del_kline(hostmask.c_str());
-}
-
-bool InspIRCd::DelELine(const std::string &hostmask)
-{
-	return XLines->del_eline(hostmask.c_str());
 }
 
-/*
- * XXX why on *earth* is this in modules.cpp...? I think
- * perhaps we need a server.cpp for InspIRCd:: stuff where possible. -- w00t
- */
-bool InspIRCd::IsValidMask(const std::string &mask)
+Module* ModuleManager::Find(const std::string &name)
 {
-	char* dest = (char*)mask.c_str();
-	if (strchr(dest,'!')==0)
-		return false;
-	if (strchr(dest,'@')==0)
-		return false;
-	for (char* i = dest; *i; i++)
-		if (*i < 32)
-			return false;
-	for (char* i = dest; *i; i++)
-		if (*i > 126)
-			return false;
-	unsigned int c = 0;
-	for (char* i = dest; *i; i++)
-		if (*i == '!')
-			c++;
-	if (c>1)
-		return false;
-	c = 0;
-	for (char* i = dest; *i; i++)
-		if (*i == '@')
-			c++;
-	if (c>1)
-		return false;
+	std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(name);
 
-	return true;
+	if (modfind == Modules.end())
+		return NULL;
+	else
+		return modfind->second.second;
 }
 
-Module* InspIRCd::FindModule(const std::string &name)
+const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 {
-	for (int i = 0; i <= this->GetModuleCount(); i++)
-	{
-		if (this->Config->module_names[i] == name)
-		{
-			return this->modules[i];
-		}
-	}
-	return NULL;
+	std::vector<std::string> retval;
+	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator x = Modules.begin(); x != Modules.end(); ++x)
+		if (!filter || (x->second.second->GetVersion().Flags & filter))
+			retval.push_back(x->first);
+	return retval;
 }
 
 ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(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;
 }
@@ -527,9 +808,9 @@ ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
 ConfigReader::~ConfigReader()
 {
 	if (this->errorlog)
-		DELETE(this->errorlog);
+		delete this->errorlog;
 	if(this->privatehash)
-		DELETE(this->data);
+		delete this->data;
 }
 
 
@@ -537,52 +818,72 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
 {
 	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);
-	this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog);
+	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, int index)
+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* */ 
 	std::string result;
 	
-	if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
+	if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
-		return "";
 	}
-	
 	return result;
 }
 
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
+{
+	return ReadValue(tag, name, "", index, allow_linefeeds);
+}
+
+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);
+}
+
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
 {
-	return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
+	return ReadFlag(tag, name, "", index);
 }
 
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+
+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, index, result))
+	if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 		return 0;
 	}
 	
-	if ((needs_unsigned) && (result < 0))
+	if ((need_positive) && (result < 0))
 	{
-		this->error = CONF_NOT_UNSIGNED;
+		this->error = CONF_INT_NEGATIVE;
 		return 0;
 	}
 	
 	return result;
 }
 
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool need_positive)
+{
+	return ReadInteger(tag, name, "", index, need_positive);
+}
+
 long ConfigReader::GetError()
 {
 	long olderr = this->error;
@@ -590,48 +891,9 @@ long ConfigReader::GetError()
 	return olderr;
 }
 
-void ConfigReader::DumpErrors(bool bail, userrec* user)
+void ConfigReader::DumpErrors(bool bail, User* user)
 {
-	/* XXX - Duplicated code */
-	
-	if (bail)
-	{
-		printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
-		InspIRCd::Exit(ERROR);
-	}
-	else
-	{
-		std::string errors = this->errorlog->str();
-		std::string::size_type start;
-		unsigned int prefixlen;
-		
-		start = 0;
-		/* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
-		prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11;
-	
-		if (user)
-		{
-			user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
-			
-			while(start < errors.length())
-			{
-				user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
-				start += 510 - prefixlen;
-			}
-		}
-		else
-		{
-			ServerInstance->WriteOpers("There were errors in the configuration file:");
-			
-			while(start < errors.length())
-			{
-				ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
-				start += 360;
-			}
-		}
-
-		return;
-	}
+	ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
 }
 
 
@@ -653,10 +915,7 @@ bool ConfigReader::Verify()
 
 FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
 {
-	file_cache c;
-	ServerInstance->Config->ReadFile(c,filename.c_str());
-	this->fc = c;
-	this->CalcSize();
+	LoadFile(filename);
 }
 
 FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
@@ -665,7 +924,7 @@ FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
 
 std::string FileReader::Contents()
 {
-	std::string x = "";
+	std::string x;
 	for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
 	{
 		x.append(*a);
@@ -690,9 +949,12 @@ void FileReader::CalcSize()
 void FileReader::LoadFile(const std::string &filename)
 {
 	file_cache c;
-	ServerInstance->Config->ReadFile(c,filename.c_str());
-	this->fc = c;
-	this->CalcSize();
+	c.clear();
+	if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+	{
+		this->fc = c;
+		this->CalcSize();
+	}
 }
 
 
@@ -716,5 +978,3 @@ int FileReader::FileSize()
 {
 	return fc.size();
 }
-
-