Use module type to determine what type each module is instead of its location in the configuration file.

22 files changed, 25 insertions, 1978 deletions

diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp
index dc3b40288..5132d272f 100644
--- a/modules/extra/cs_appendtopic.cpp
+++ b/modules/extra/cs_appendtopic.cpp
@@ -107,10 +107,9 @@ class CSAppendTopic : public Module
 	CommandCSAppendTopic commandcsappendtopic;
 
  public:
-	CSAppendTopic(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
+	CSAppendTopic(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
 	{
 		this->SetAuthor("SGR");
-		this->SetType(SUPPORTED);
 
 		if (!chanserv)
 			throw ModuleException("ChanServ is not loaded!");
diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp
index 6e39f33f3..29914a17e 100644
--- a/modules/extra/cs_enforce.cpp
+++ b/modules/extra/cs_enforce.cpp
@@ -216,10 +216,9 @@ class CSEnforce : public Module
 	CommandCSEnforce commandcsenforce;
 
  public:
-	CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
+	CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
 	{
 		this->SetAuthor("Anope");
-		this->SetType(SUPPORTED);
 
 		if (!chanserv)
 			throw ModuleException("ChanServ is not loaded!");
diff --git a/modules/extra/cs_entrymsg.cpp b/modules/extra/cs_entrymsg.cpp
index f424baede..dbfe35d35 100644
--- a/modules/extra/cs_entrymsg.cpp
+++ b/modules/extra/cs_entrymsg.cpp
@@ -159,10 +159,9 @@ class CSEntryMessage : public Module
 	CommandEntryMessage commandentrymsg;
 
  public:
-	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator), commandentrymsg("ENTRYMSG")
+	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED), commandentrymsg("ENTRYMSG")
 	{
 		this->SetAuthor("Anope");
-		this->SetType(CORE);
 
 		if (!chanserv)
 			throw ModuleException("ChanServ is not loaded!");
diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp
index f71363795..2318d415c 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/extra/cs_set_misc.cpp
@@ -110,10 +110,9 @@ class CSSetMisc : public Module
 	}
 
  public:
-	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
+	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
 	{
 		this->SetAuthor("Anope");
-		this->SetType(CORE);
 
 		if (!chanserv)
 			throw ModuleException("ChanServ is not loaded!");
diff --git a/modules/extra/cs_tban.cpp b/modules/extra/cs_tban.cpp
index 04d608246..003f8a3d5 100644
--- a/modules/extra/cs_tban.cpp
+++ b/modules/extra/cs_tban.cpp
@@ -109,10 +109,9 @@ class CSTBan : public Module
 	CommandCSTBan commandcstban;
 
  public:
-	CSTBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
+	CSTBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
 	{
 		this->SetAuthor("Anope");
-		this->SetType(SUPPORTED);
 
 		if (!chanserv)
 			throw ModuleException("ChanServ is not loaded!");
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
deleted file mode 100644
index 0285d2530..000000000
--- a/modules/extra/db_mysql.cpp
+++ /dev/null
@@ -1,1653 +0,0 @@
-#include "module.h"
-#include "operserv.h"
-#include "sql.h"
-#include "os_session.h"
-
-static Anope::string ToString(const std::vector<Anope::string> &strings)
-{
-	Anope::string ret;
-
-	for (unsigned i = 0; i < strings.size(); ++i)
-		ret += " " + strings[i];
-	
-	if (!ret.empty())
-		ret.erase(ret.begin());
-	
-	return ret;
-}
-
-static std::vector<Anope::string> MakeVector(const Anope::string &buf)
-{
-	Anope::string s;
-	spacesepstream sep(buf);
-	std::vector<Anope::string> params;
-
-	while (sep.GetToken(s))
-	{
-		if (s[0] == ':')
-		{
-			s.erase(s.begin());
-			if (!s.empty() && !sep.StreamEnd())
-				params.push_back(s + " " + sep.GetRemaining());
-			else if (!s.empty())
-				params.push_back(s);
-		}
-		else
-			params.push_back(s);
-	}
-
-	return params;
-}
-
-static NickAlias *CurNick = NULL;
-static NickCore *CurCore = NULL;
-static ChannelInfo *CurChannel = NULL;
-static BotInfo *CurBot = NULL;
-
-static void Write(const Anope::string &data);
-static void WriteNickMetadata(const Anope::string &key, const Anope::string &data);
-static void WriteCoreMetadata(const Anope::string &key, const Anope::string &data);
-static void WriteChannelMetadata(const Anope::string &key, const Anope::string &data);
-static void WriteBotMetadata(const Anope::string &key, const Anope::string &data);
-
-class CommandSQLSync : public Command
-{
- public:
-	CommandSQLSync() : Command("SQLSYNC", 0, 0, "operserv/sqlsync")
-	{
-		this->SetDesc(_("Import your databases to SQL"));
-	}
-
-	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params);
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		source.Reply(_("Syntax: \002SQLSYNC\002\n"
-				" \n"
-				"This command syncs your databases with SQL. You should\n"
-				"only have to execute this command once, when you initially\n"
-				"import your databases into SQL."));
-		return true;
-	}
-};
-
-class MySQLInterface : public SQLInterface
-{
- public:
-	MySQLInterface(Module *o) : SQLInterface(o) { }
-
-	void OnResult(const SQLResult &r);
-
-	void OnError(const SQLResult &r);
-};
-
-class DBMySQL;
-static DBMySQL *me;
-class DBMySQL : public Module
-{
- private:
-	CommandSQLSync commandsqlsync;
-	MySQLInterface sqlinterface;
-	service_reference<SQLProvider> SQL;
-
- public:
-	service_reference<SessionService> SessionInterface;
-	time_t lastwarn;
-	bool ro;
-
-	void RunQuery(const SQLQuery &query)
-	{
-		if (SQL)
-		{
-			if (readonly && this->ro)
-			{
-				readonly = this->ro = false;
-				if (operserv)
-					ircdproto->SendGlobops(operserv->Bot(), "Found SQL again, going out of readonly mode...");
-			}
-
-			SQL->Run(&sqlinterface, query);
-		}
-		else
-		{
-			if (Anope::CurTime - Config->UpdateTimeout > lastwarn)
-			{
-				if (operserv)
-					ircdproto->SendGlobops(operserv->Bot(), "Unable to locate SQL reference, is m_mysql loaded? Going to readonly...");
-				readonly = this->ro = true;
-				this->lastwarn = Anope::CurTime;
-			}
-		}
-	}
-
-	DBMySQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator), sqlinterface(this), SQL("mysql/main"), SessionInterface("session")
-	{
-		me = this;
-
-		this->SetType(DATABASE);
-
-		this->lastwarn = 0;
-		this->ro = false;
-
-		Implementation i[] = {
-			I_OnLoadDatabase, I_OnServerConnect
-		};
-		ModuleManager::Attach(i, this, 2);
-
-		if (operserv)
-			this->AddCommand(operserv->Bot(), &commandsqlsync);
-
-		if (uplink_server)
-			OnServerConnect();
-	}
-
-	void OnServerConnect()
-	{
-		Implementation i[] = {
-			/* Misc */
-			I_OnSaveDatabase, I_OnPostCommand,
-			/* NickServ */
-			I_OnNickAddAccess, I_OnNickEraseAccess, I_OnNickClearAccess,
-			I_OnDelCore, I_OnNickForbidden, I_OnNickGroup,
-			I_OnNickRegister, I_OnChangeCoreDisplay,
-			I_OnNickSuspended, I_OnDelNick,
-			/* ChanServ */
-			I_OnAccessAdd, I_OnAccessDel, I_OnAccessChange, I_OnAccessClear, I_OnLevelChange,
-			I_OnChanForbidden, I_OnDelChan, I_OnChanRegistered, I_OnChanSuspend,
-			I_OnAkickAdd, I_OnAkickDel, I_OnMLock, I_OnUnMLock,
-			/* BotServ */
-			I_OnBotCreate, I_OnBotChange, I_OnBotDelete,
-			I_OnBotAssign, I_OnBotUnAssign,
-			I_OnBadWordAdd, I_OnBadWordDel,
-			/* MemoServ */
-			I_OnMemoSend, I_OnMemoDel,
-			/* OperServ */
-			I_OnAddAkill, I_OnDelAkill, I_OnExceptionAdd, I_OnExceptionDel,
-			I_OnAddXLine, I_OnDelXLine,
-			/* HostServ */
-			I_OnSetVhost, I_OnDeleteVhost
-		};
-		ModuleManager::Attach(i, this, 42);
-	}
-
-	EventReturn OnLoadDatabase()
-	{
-		if (!SQL)
-		{
-			Log() << "Error, unable to find service reference for SQL, is m_mysql loaded and configured properly?";
-			return EVENT_CONTINUE;
-		}
-
-		SQLQuery query;
-
-		query = "SELECT * FROM `anope_ns_core`";
-		SQLResult r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = new NickCore(r.Get(i, "display"));
-			nc->pass = r.Get(i, "pass");
-			nc->email = r.Get(i, "email");
-			nc->greet = r.Get(i, "greet");
-
-			spacesepstream sep(r.Get(i, "flags"));
-			Anope::string buf;
-			std::vector<Anope::string> flags;
-			while (sep.GetToken(buf))
-				flags.push_back(buf);
-			nc->FromString(flags);
-
-			nc->language = r.Get(i, "language");
-			nc->channelcount = r.Get(i, "channelcount").is_number_only() ? convertTo<int>(r.Get(i, "channelcount")) : 0;
-			nc->memos.memomax = r.Get(i, "memomax").is_number_only() ? convertTo<int16>(r.Get(i, "memomax")) : 20;
-		}
-
-		query = "SELECT * FROM `anope_ns_access`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = findcore(r.Get(i, "display"));
-			if (!nc)
-			{
-				Log() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display");
-				continue;
-			}
-
-			nc->AddAccess(r.Get(i, "access"));
-		}
-
-		query = "SELECT * FROM `anope_ns_core_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = findcore(r.Get(i, "display"));
-			if (!nc)
-			{
-				Log() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display");
-				continue;
-			}
-
-			EventReturn MOD_RESULT;;
-			std::vector<Anope::string> Params = MakeVector(r.Get(i, "value"));
-			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nc, r.Get(i, "name"), Params));
-		}
-
-		query = "SELECT * FROM `anope_ns_alias`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = findcore(r.Get(i, "display"));
-			if (!nc)
-			{
-				Log() << "MySQL: Got NickAlias for nick " << r.Get(i, "nick") << " with nonexistant core " << r.Get(i, "display");
-				continue;
-			}
-
-			NickAlias *na = new NickAlias(r.Get(i, "nick"), nc);
-			na->last_quit = r.Get(i, "last_quit");
-			na->last_realname = r.Get(i, "last_realname");
-			na->last_usermask = r.Get(i, "last_usermask");
-			na->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : Anope::CurTime;
-			na->last_seen = r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : Anope::CurTime;
-
-			spacesepstream sep(r.Get(i, "flags"));
-			Anope::string buf;
-			std::vector<Anope::string> flags;
-			while (sep.GetToken(buf))
-				flags.push_back(buf);
-
-			na->FromString(flags);
-		}
-
-		query = "SELECT * FROM `anope_ns_alias_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickAlias *na = findnick(r.Get(i, "nick"));
-			if (!na)
-			{
-				Log() << "MySQL: Got metadata for nonexistant nick " << r.Get(i, "nick");
-				continue;
-			}
-
-			EventReturn MOD_RESULT;
-			std::vector<Anope::string> Params = MakeVector(r.Get(i, "value"));
-			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(na, na->nick, Params));
-		}
-
-		query = "SELECT * FROM `anope_hs_core`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickAlias *na = findnick(r.Get(i, "nick"));
-			if (!na)
-			{
-				Log() << "MySQL: Got vhost entry for nonexistant nick " << r.Get(i, "nick");
-				continue;
-			}
-
-			time_t creation = r.Get(i, "time").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time")) : Anope::CurTime;
-			na->hostinfo.SetVhost(r.Get(i, "vident"), r.Get(i, "vhost"), r.Get(i, "creator"), creation);
-		}
-
-		query = "SELECT * FROM `anope_bs_core`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			BotInfo *bi = findbot(r.Get(i, "nick"));
-			if (!bi)
-				bi = new BotInfo(r.Get(i, "nick"), r.Get(i, "user"), r.Get(i, "host"));
-			bi->realname = r.Get(i, "rname");
-			bi->created = r.Get(i, "created").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "created")) : Anope::CurTime;
-
-			spacesepstream sep(r.Get(i, "flags"));
-			Anope::string buf;
-			std::vector<Anope::string> flags;
-			while (sep.GetToken(buf))
-				flags.push_back(buf);
-
-			bi->FromString(flags);
-		}
-
-		query = "SELECT * FROM `anope_bs_info_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			BotInfo *bi = findbot(r.Get(i, "botname"));
-			if (!bi)
-			{
-				Log() << "MySQL: BotInfo metadata for nonexistant bot " << r.Get(i, "botname");
-				continue;
-			}
-
-			EventReturn MOD_RESULT;
-			std::vector<Anope::string> Params = MakeVector(r.Get(i, "value"));
-			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(bi, bi->nick, Params));
-		}
-
-		query = "SELECT * FROM `anope_cs_info`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = NULL;
-
-			if (!r.Get(i, "founder").empty())
-			{
-				nc = findcore(r.Get(i, "founder"));
-				if (!nc)
-				{
-					Log() << "MySQL: Channel " << r.Get(i, "name") << " with nonexistant founder " << r.Get(i, "founder");
-					continue;
-				}
-
-				ChannelInfo *ci = new ChannelInfo(r.Get(i, "name"));
-				ci->founder = nc;
-				if (!r.Get(i, "successor").empty())
-					ci->successor = findcore(r.Get(i, "successor"));
-				ci->desc = r.Get(i, "descr");
-				ci->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : Anope::CurTime;
-				ci->last_used = r.Get(i, "last_used").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_used")) : Anope::CurTime;
-				ci->last_topic = r.Get(i, "last_topic");
-				ci->last_topic_setter = r.Get(i, "last_topic_setter");
-				ci->last_topic_time = r.Get(i, "last_topic_time").is_number_only() ? convertTo<int>(r.Get(i, "last_topic_time")) : Anope::CurTime;
-				ci->forbidby = r.Get(i, "forbidby");
-				ci->forbidreason = r.Get(i, "forbidreason");
-				ci->bantype = r.Get(i, "bantype").is_number_only() ? convertTo<int>(r.Get(i, "bantype")) : 2;
-				ci->memos.memomax = r.Get(i, "memomax").is_number_only() ? convertTo<int16>(r.Get(i, "memomax")) : 20;
-				ci->capsmin = r.Get(i, "capsmin").is_number_only() ? convertTo<int>(r.Get(i, "capsmin")) : 0;
-				ci->capspercent = r.Get(i, "capspercent").is_number_only() ? convertTo<int>(r.Get(i, "capspercent")) : 0;
-				ci->floodlines = r.Get(i, "floodlines").is_number_only() ? convertTo<int>(r.Get(i, "floodlines")) : 0;
-				ci->floodsecs = r.Get(i, "floodsecs").is_number_only() ? convertTo<int>(r.Get(i, "floodsecs")) : 0;
-				ci->repeattimes = r.Get(i, "repeattimes").is_number_only() ? convertTo<int>(r.Get(i, "repeattimes")) : 0;
-				ci->bi = findbot(r.Get(i, "botnick"));
-				if (ci->bi && !r.Get(i, "botflags").empty())
-				{
-					spacesepstream sep(r.Get(i, "botflags"));
-					Anope::string buf;
-					std::vector<Anope::string> flags;
-					while (sep.GetToken(buf))
-						flags.push_back(buf);
-
-					ci->botflags.FromString(flags);
-				}
-
-				if (!r.Get(i, "flags").empty())
-				{
-					spacesepstream sep(r.Get(i, "flags"));
-					Anope::string buf;
-					std::vector<Anope::string> flags;
-					while (sep.GetToken(buf))
-						flags.push_back(buf);
-
-					ci->FromString(flags);
-				}
-			}
-		}
-
-		query = "SELECT * FROM `anope_cs_ttb`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel ttb for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			ci->ttb[atoi(r.Get(i, "ttb_id").c_str())] = atoi(r.Get(i, "value").c_str());
-		}
-
-		query = "SELECT * FROM `anope_bs_badwords`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel badwords entry for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			BadWordType BWTYPE = BW_ANY;
-			if (r.Get(i, "type").equals_cs("SINGLE"))
-				BWTYPE = BW_SINGLE;
-			else if (r.Get(i, "type").equals_cs("START"))
-				BWTYPE = BW_START;
-			else if (r.Get(i, "type").equals_cs("END"))
-				BWTYPE = BW_END;
-			ci->AddBadWord(r.Get(i, "word"), BWTYPE);
-		}
-
-		query = "SELECT * FROM `anope_cs_access`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			ci->AddAccess(r.Get(i, "display"), atoi(r.Get(i, "level").c_str()), r.Get(i, "creator"), (r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : Anope::CurTime));
-		}
-
-		query = "SELECT * FROM `anope_cs_akick`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			NickCore *nc = NULL;
-			spacesepstream sep(r.Get(i, "flags"));
-			Anope::string flag, mask;
-			while (sep.GetToken(flag))
-			{
-				if (flag.equals_cs("ISNICK"))
-					nc = findcore(r.Get(i, "mask"));
-
-				AutoKick *ak;
-				if (nc)
-					ak = ci->AddAkick(r.Get(i, "creator"), nc, r.Get(i, "reason"), atol(r.Get(i, "created").c_str()), atol(r.Get(i, "last_used").c_str()));
-				else
-					ak = ci->AddAkick(r.Get(i, "creator"), r.Get(i, "mask"), r.Get(i, "reason"), atol(r.Get(i, "created").c_str()), atol(r.Get(i, "last_used").c_str()));
-				if (nc)
-					ak->SetFlag(AK_ISNICK);
-			}
-		}
-
-		query = "SELECT * FROM `anope_cs_levels`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel level entry for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			ci->levels[atoi(r.Get(i, "position").c_str())] = atoi(r.Get(i, "level").c_str());
-		}
-
-		query = "SELECT * FROM `anope_cs_info_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel metadata for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			EventReturn MOD_RESULT;
-			std::vector<Anope::string> Params = MakeVector(r.Get(i, "value"));
-			FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(ci, ci->name, Params));
-		}
-
-		query = "SELECT * FROM `anope_cs_mlock`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-			{
-				Log() << "MySQL: Channel mlock for nonexistant channel " << r.Get(i, "channel");
-				continue;
-			}
-
-			std::vector<Anope::string> mlocks;
-			ci->GetExtRegular("db_mlock", mlocks);
-
-			Anope::string modestring = r.Get(i, "status") + " " + r.Get(i, "mode") + " " + r.Get(i, "setter") + " " + r.Get(i, "created") + " " + r.Get(i, "param");
-
-			mlocks.push_back(modestring);
-
-			ci->Extend("db_mlock", new ExtensibleItemRegular<std::vector<Anope::string> >(mlocks));
-		}
-
-		query = "SELECT * FROM `anope_ms_info`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			MemoInfo *mi = NULL;
-			if (r.Get(i, "serv").equals_cs("NICK"))
-			{
-				NickCore *nc = findcore(r.Get(i, "receiver"));
-				if (nc)
-					mi = &nc->memos;
-			}
-			else if (r.Get(i, "serv").equals_cs("CHAN"))
-			{
-				ChannelInfo *ci = cs_findchan(r.Get(i, "receiver"));
-				if (ci)
-					mi = &ci->memos;
-			}
-			if (mi)
-			{
-				Memo *m = new Memo();
-				mi->memos.push_back(m);
-				m->sender = r.Get(i, "sender");
-				m->time = r.Get(i, "time").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time")) : Anope::CurTime;
-				m->text = r.Get(i, "text");
-
-				if (!r.Get(i, "flags").empty())
-				{
-					spacesepstream sep(r.Get(i, "flags"));
-					Anope::string buf;
-					std::vector<Anope::string> flags;
-					while (sep.GetToken(buf))
-						flags.push_back(buf);
-
-					m->FromString(flags);
-				}
-			}
-		}
-
-		if (SQLine)
-		{
-			query = "SELECT * FROM `anope_os_akills`";
-			r = SQL->RunQuery(query);
-			for (int i = 0; i < r.Rows(); ++i)
-			{
-				Anope::string user = r.Get(i, "user");
-				Anope::string host = r.Get(i, "host");
-				Anope::string by = r.Get(i, "by");
-				Anope::string reason = r.Get(i, "reason");
-				time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : Anope::CurTime;
-				time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : Anope::CurTime;
-
-				XLine *x = SGLine->Add(user + "@" + host, by, expires, reason);
-				if (x)
-					x->Created = seton;
-			}
-		}
-
-		query = "SELECT * FROM `anope_os_xlines`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			Anope::string mask = r.Get(i, "mask");
-			Anope::string by = r.Get(i, "xby");
-			Anope::string reason = r.Get(i, "reason");
-			time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : Anope::CurTime;
-			time_t expires = r.Get(i, "expire").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expire")) : Anope::CurTime;
-
-			XLine *x = NULL;
-			if (SNLine && r.Get(i, "type").equals_cs("SNLINE"))
-				x = SNLine->Add(mask, by, expires, reason);
-			else if (SQLine && r.Get(i, "type").equals_cs("SQLINE"))
-				x = SQLine->Add(mask, by, expires, reason);
-			else if (SZLine && r.Get(i, "type").equals_cs("SZLINE"))
-				x = SZLine->Add(mask, by, expires, reason);
-			if (x)
-				x->Created = seton;
-		}
-
-		query = "SELECT * FROM `anope_os_exceptions`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			Anope::string mask = r.Get(i, "mask");
-			unsigned limit = convertTo<unsigned>(r.Get(i, "slimit"));
-			Anope::string creator = r.Get(i, "who");
-			Anope::string reason = r.Get(i, "reason");
-			time_t expires = convertTo<time_t>(r.Get(i, "expires"));
-
-			if (SessionInterface)
-			{
-				Exception *e = new Exception();
-				e->mask = mask;
-				e->limit = limit;
-				e->who = creator;
-				e->reason = reason;
-				e->time = expires;
-				SessionInterface->AddException(e);
-			}
-		}
-
-		query = "SELECT * FROM `anope_extra`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			std::vector<Anope::string> params = MakeVector(r.Get(i, "data"));
-			EventReturn MOD_RESULT;
-			FOREACH_RESULT(I_OnDatabaseRead, OnDatabaseRead(params));
-		}
-
-		query = "SELECT * FROM `anope_ns_core_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			NickCore *nc = findcore(r.Get(i, "nick"));
-			if (!nc)
-				continue;
-			if (r.Get(i, "name") == "MEMO_IGNORE")
-				nc->memos.ignores.push_back(r.Get(i, "value").ci_str());
-		}
-
-		query = "SELECT * FROM `anope_cs_info_metadata`";
-		r = SQL->RunQuery(query);
-		for (int i = 0; i < r.Rows(); ++i)
-		{
-			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
-			if (!ci)
-				continue;
-			if (r.Get(i, "name") == "MEMO_IGNORE")
-				ci->memos.ignores.push_back(r.Get(i, "value").ci_str());
-		}
-
-		return EVENT_STOP;
-	}
-
-	EventReturn OnSaveDatabase()
-	{
-		SQLQuery query;
-	
-		query = "TRUNCATE TABLE `anope_os_core`";
-		this->RunQuery(query);
-
-		query = "INSERT INTO `anope_os_core` (maxusercnt, maxusertime, akills_count, snlines_count, sqlines_count, szlines_count) VALUES(@maxusercnt, @maxusertime, @akills_count, @snlines_count, @sqlines_count, @szlines_count)";
-		query.setValue("maxusercnt", maxusercnt);
-		query.setValue("maxusertime", maxusertime);
-		query.setValue("akills_count", SGLine ? SGLine->GetCount() : 0);
-		query.setValue("snlines_count", SQLine ? SQLine->GetCount() : 0);
-		query.setValue("sqlines_count", SNLine ? SNLine->GetCount() : 0);
-		query.setValue("szlines_count", SZLine ? SZLine->GetCount() : 0);
-		this->RunQuery(query);
-
-		for (nickcore_map::const_iterator it = NickCoreList.begin(), it_end = NickCoreList.end(); it != it_end; ++it)
-		{
-			CurCore = it->second;
-			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteCoreMetadata, CurCore));
-		}
-
-		for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; ++it)
-		{
-			CurNick = it->second;
-			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteNickMetadata, CurNick));
-		}
-
-		for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it)
-		{
-			CurChannel = it->second;
-			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteChannelMetadata, CurChannel));
-		}
-
-		for (Anope::insensitive_map<BotInfo *>::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
-		{
-			CurBot = it->second;
-			FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteBotMetadata, CurBot));
-
-			/* This is for the core bots, bots added by users are already handled by an event */
-			query = "INSERT INTO `anope_bs_core` (nick, user, host, rname, flags, created, chancount) VALUES(@nick, @user, @host, @rname, @flags, @created, @chancount) ON DUPLICATE KEY UPDATE nick=VALUES(nick), user=VALUES(user), host=VALUES(host), rname=VALUES(rname), flags=VALUES(flags), created=VALUES(created), chancount=VALUES(chancount)";
-			query.setValue("nick", CurBot->nick);
-			query.setValue("user", CurBot->GetIdent());
-			query.setValue("host", CurBot->host);
-			query.setValue("rname", CurBot->realname);
-			query.setValue("flags", ToString(CurBot->ToString()));
-			query.setValue("created", CurBot->created);
-			query.setValue("chancount", CurBot->chancount);
-			this->RunQuery(query);
-		}
-
-		query = "TRUNCATE TABLE `anope_extra`";
-		this->RunQuery(query);
-		FOREACH_MOD(I_OnDatabaseWrite, OnDatabaseWrite(Write));
-
-		return EVENT_CONTINUE;
-	}
-
-	void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		BotInfo *service = command->service;
-		ChannelInfo *ci = source.ci;
-
-		if (service->nick == Config->s_NickServ)
-		{
-			if (u->Account() && ((command->name.equals_ci("SET") && !params.empty()) || (command->name.equals_ci("SASET") && u->HasCommand("nickserv/saset") && params.size() > 1)))
-			{
-				Anope::string cmd = (command->name.equals_ci("SET") ? params[0] : params[1]);
-				NickCore *nc = (command->name.equals_ci("SET") ? u->Account() : findcore(params[0]));
-				if (!nc)
-					return;
-				if (cmd.equals_ci("PASSWORD") && params.size() > 1)
-				{
-					SQLQuery query("UPDATE `anope_ns_core` SET `pass` = @pass WHERE `display` = @display");
-					query.setValue("pass", nc->pass);
-					query.setValue("display", nc->display);
-					this->RunQuery(query);
-				}
-				else if (cmd.equals_ci("LANGUAGE") && params.size() > 1)
-				{
-					SQLQuery query("UPDATE `anope_ns_core` SET `language` = @language WHERE `display` = @display");
-					query.setValue("language", nc->language);
-					query.setValue("display", nc->display);
-					this->RunQuery(query);
-				}
-				else if (cmd.equals_ci("EMAIL"))
-				{
-					SQLQuery query("UPDATE `anope_ns_core` SET `email` = @email WHERE `display` = @display");
-					query.setValue("email", nc->email);
-					query.setValue("display", nc->display);
-					this->RunQuery(query);
-				}
-				else if (cmd.equals_ci("GREET"))
-				{
-					SQLQuery query("UPDATE `anope_ns_core` SET `greet` = @greet WHERE `display` = @display");
-					query.setValue("greet", nc->greet);
-					query.setValue("display", nc->display);
-					this->RunQuery(query);
-				}
-				else if (cmd.equals_ci("KILL") || cmd.equals_ci("SECURE") || cmd.equals_ci("PRIVATE") || cmd.equals_ci("MSG") || cmd.equals_ci("HIDE") || cmd.equals_ci("AUTOOP"))
-				{
-					SQLQuery query("UPDATE `anope_ns_core` SET `flags` = @flags WHERE `display` = @display");
-					query.setValue("flags", ToString(nc->ToString()));
-					query.setValue("display", nc->display);
-					this->RunQuery(query);
-				}
-			}
-		}
-		else if (service->nick == Config->s_ChanServ)
-		{
-			if (command->name.equals_ci("SET") && u->Account() && params.size() > 1)
-			{
-				if (!ci)
-					return;