Rewrote the MySQL API to use threads. This acts similar to before, but is faster. Removed db_mysql_execute for now.

7 files changed, 2046 insertions, 2029 deletions

diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
new file mode 100644
index 000000000..e93abba10
--- /dev/null
+++ b/modules/extra/db_mysql.cpp
@@ -0,0 +1,1550 @@
+#include "module.h"
+#include "sql.h"
+
+struct NickAliasFlagInfo
+{
+	Anope::string Name;
+	NickNameFlag Flag;
+};
+
+NickAliasFlagInfo NickAliasFlags[] = {
+	{"FORBIDDEN", NS_FORBIDDEN},
+	{"NOEXPIRE", NS_NO_EXPIRE},
+	{"", static_cast<NickNameFlag>(-1)}
+};
+
+struct NickCoreFlagInfo
+{
+	Anope::string Name;
+	NickCoreFlag Flag;
+};
+
+NickCoreFlagInfo NickCoreFlags[] = {
+	{"KILLPROTECT", NI_KILLPROTECT},
+	{"SECURE", NI_SECURE},
+	{"MSG", NI_MSG},
+	{"MEMO_HARDMAX", NI_MEMO_HARDMAX},
+	{"MEMO_SIGNON", NI_MEMO_SIGNON},
+	{"MEMO_RECEIVE", NI_MEMO_RECEIVE},
+	{"PRIVATE", NI_PRIVATE},
+	{"HIDE_EMAIL", NI_HIDE_EMAIL},
+	{"HIDE_MASK", NI_HIDE_MASK},
+	{"HIDE_QUIT", NI_HIDE_QUIT},
+	{"KILL_QUICK", NI_KILL_QUICK},
+	{"KILL_IMMED", NI_KILL_IMMED},
+	{"MEMO_MAIL", NI_MEMO_MAIL},
+	{"HIDE_STATUS", NI_HIDE_STATUS},
+	{"SUSPENDED", NI_SUSPENDED},
+	{"AUTOOP", NI_AUTOOP},
+	{"FORBIDDEN", NI_FORBIDDEN},
+	{"", static_cast<NickCoreFlag>(-1)}
+};
+
+struct BotServFlagInfo
+{
+	Anope::string Name;
+	BotFlag Flag;
+};
+
+BotServFlagInfo BotServFlags[] = {
+	{"PRIVATE", BI_PRIVATE},
+	{"", static_cast<BotFlag>(-1)}
+};
+
+struct BotFlagInfo
+{
+	Anope::string Name;
+	BotServFlag Flag;
+};
+
+BotFlagInfo BotFlags[] = {
+	{"DONTKICKOPS", BS_DONTKICKOPS},
+	{"DONTKICKVOICES", BS_DONTKICKVOICES},
+	{"FANTASY", BS_FANTASY},
+	{"SYMBIOSIS", BS_SYMBIOSIS},
+	{"GREET", BS_GREET},
+	{"NOBOT", BS_NOBOT},
+	{"KICK_BOLDS", BS_KICK_BOLDS},
+	{"KICK_COLORS", BS_KICK_COLORS},
+	{"KICK_REVERSES", BS_KICK_REVERSES},
+	{"KICK_UNDERLINES", BS_KICK_UNDERLINES},
+	{"KICK_BADWORDS", BS_KICK_BADWORDS},
+	{"KICK_CAPS", BS_KICK_CAPS},
+	{"KICK_FLOOD", BS_KICK_FLOOD},
+	{"KICK_REPEAT", BS_KICK_REPEAT},
+	{"KICK_ITALICS", BS_KICK_ITALICS},
+	{"", static_cast<BotServFlag>(-1)}
+};
+
+struct ChannelFlagInfo
+{
+	Anope::string Name;
+	ChannelInfoFlag Flag;
+};
+
+ChannelFlagInfo ChannelFlags[] = {
+	{"KEEPTOPIC", CI_KEEPTOPIC},
+	{"SECUREOPS", CI_SECUREOPS},
+	{"PRIVATE", CI_PRIVATE},
+	{"TOPICLOCK", CI_TOPICLOCK},
+	{"RESTRICTED", CI_RESTRICTED},
+	{"PEACE", CI_PEACE},
+	{"SECURE", CI_SECURE},
+	{"FORBIDDEN", CI_FORBIDDEN},
+	{"NO_EXPIRE", CI_NO_EXPIRE},
+	{"MEMO_HARDMAX", CI_MEMO_HARDMAX},
+	{"OPNOTICE", CI_OPNOTICE},
+	{"SECUREFOUNDER", CI_SECUREFOUNDER},
+	{"SIGNKICK", CI_SIGNKICK},
+	{"SIGNKICK_LEVEL", CI_SIGNKICK_LEVEL},
+	{"XOP", CI_XOP},
+	{"SUSPENDED", CI_SUSPENDED},
+	{"PERSIST", CI_PERSIST},
+	{"", static_cast<ChannelInfoFlag>(-1)}
+};
+
+struct MemoFlagInfo
+{
+	Anope::string Name;
+	MemoFlag Flag;
+};
+
+MemoFlagInfo MemoFlags[] = {
+	{"UNREAD", MF_UNREAD},
+	{"RECEIPT", MF_RECEIPT},
+	{"NOTIFYS", MF_NOTIFYS},
+	{"", static_cast<MemoFlag>(-1)}
+};
+
+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 Anope::string BuildFlagsList(ChannelInfo *ci)
+{
+	Anope::string ret;
+
+	for (int i = 0; ChannelFlags[i].Flag != -1; ++i)
+		if (ci->HasFlag(ChannelFlags[i].Flag))
+			ret += " " + ChannelFlags[i].Name;
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static Anope::string BuildFlagsList(NickAlias *na)
+{
+	Anope::string ret;
+
+	for (int i = 0; NickAliasFlags[i].Flag != -1; ++i)
+		if (na->HasFlag(NickAliasFlags[i].Flag))
+			ret += " " + NickAliasFlags[i].Name;
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static Anope::string BuildFlagsList(NickCore *nc)
+{
+	Anope::string ret;
+
+	for (int i = 0; NickCoreFlags[i].Flag != -1; ++i)
+		if (nc->HasFlag(NickCoreFlags[i].Flag))
+			ret += " " + NickCoreFlags[i].Name;
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static Anope::string BuildFlagsList(Memo *m)
+{
+	Anope::string ret;
+
+	for (int i = 0; MemoFlags[i].Flag != -1; ++i)
+		if (m->HasFlag(MemoFlags[i].Flag))
+			ret += " " + MemoFlags[i].Name;
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static Anope::string MakeMLock(ChannelInfo *ci, bool status)
+{
+	Anope::string ret;
+
+	for (std::list<Mode *>::iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
+	{
+		if ((*it)->Class == MC_CHANNEL)
+		{
+			ChannelMode *cm = debug_cast<ChannelMode *>(*it);
+
+			if (ci->HasMLock(cm->Name, status))
+				ret += " " + cm->NameAsString;
+		}
+	}
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static inline Anope::string GetMLockOn(ChannelInfo *ci)
+{
+	return MakeMLock(ci, true);
+}
+
+static inline Anope::string GetMLockOff(ChannelInfo *ci)
+{
+	return MakeMLock(ci, false);
+}
+
+static Anope::string GetMLockParams(ChannelInfo *ci)
+{
+	Anope::string ret;
+
+	for (std::list<Mode *>::iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
+	{
+		if ((*it)->Class == MC_CHANNEL)
+		{
+			ChannelMode *cm = debug_cast<ChannelMode *>(*it);
+
+			Anope::string param;
+			if (ci->GetParam(cm->Name, param))
+				ret += " " + cm->NameAsString + " " + param;
+		}
+	}
+
+	if (!ret.empty())
+		ret.erase(ret.begin());
+
+	return ret;
+}
+
+static Anope::string GetBotFlags(Flags<BotServFlag>& Flags)
+{
+	Anope::string buf;
+
+	for (int i = 0; BotFlags[i].Flag != -1; ++i)
+		if (Flags.HasFlag(BotFlags[i].Flag))
+			buf += " " + BotFlags[i].Name;
+
+	if (!buf.empty())
+		buf.erase(buf.begin());
+
+	return buf;
+}
+
+static Anope::string GetBotServFlags(BotInfo *bi)
+{
+	Anope::string buf;
+
+	for (int i = 0; BotServFlags[i].Flag != -1; ++i)
+		if (bi->HasFlag(BotServFlags[i].Flag))
+			buf += " " + BotServFlags[i].Name;
+
+	if (!buf.empty())
+		buf.erase(buf.begin());;
+
+	return buf;
+}
+
+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")
+	{
+	}
+
+	CommandReturn Execute(User *u, const std::vector<Anope::string> &params);
+
+	bool OnHelp(User *u, const Anope::string &subcommand)
+	{
+		notice_help(Config.s_OperServ, u, OPER_HELP_SYNC);
+		return true;
+	}
+
+	void OnServHelp(User *u)
+	{
+		notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SQLSYNC);
+	}
+};
+
+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 interface;
+	service_reference<SQLProvider> SQL;
+
+ public:
+	time_t lastwarn;
+	bool ro;
+
+	void RunQuery(const Anope::string &query)
+	{
+		if (SQL)
+		{
+			if (readonly && this->ro)
+			{
+				readonly = this->ro = false;
+				ircdproto->SendGlobops(OperServ, "Found SQL again, going out of readonly mode...");
+			}
+
+			SQL->Run(&interface, query);
+		}
+		else
+		{
+			time_t now = time(NULL);
+
+			if (now - Config.UpdateTimeout > lastwarn)
+			{
+				ircdproto->SendGlobops(OperServ, "Unable to locate SQL reference, is m_mysql loaded? Going to readonly...");
+				readonly = this->ro = true;
+				this->lastwarn = now;
+			}
+		}
+	}
+
+	const Anope::string Escape(const Anope::string &query)
+	{
+		return SQL ? SQL->Escape(query) : query;
+	}
+
+	DBMySQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator), interface(this), SQL(this, "mysql/main")
+	{
+		me = this;
+
+		this->lastwarn = 0;
+		this->ro = false;
+
+		Implementation i[] = {
+			I_OnLoadDatabase, I_OnServerConnect
+		};
+		ModuleManager::Attach(i, this, 2);
+
+		this->AddCommand(OperServ, &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_OnMakeNickRequest,
+			I_OnDelNickRequest, I_OnNickRegister, I_OnChangeCoreDisplay,
+			I_OnNickSuspended,
+			/* ChanServ */
+			I_OnAccessAdd, I_OnAccessDel, I_OnAccessChange, I_OnAccessClear, I_OnLevelChange,
+			I_OnChanForbidden, I_OnDelChan, I_OnChanRegistered, I_OnChanSuspend,
+			I_OnAkickAdd, I_OnAkickDel,
+			/* 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
+		};
+		ModuleManager::Attach(i, this, 39);
+	}
+
+	EventReturn OnLoadDatabase()
+	{
+		if (!SQL)
+		{
+			Alog() << "Error, unable to find service reference for SQL, is m_mysql loaded and configured properly?";
+			return EVENT_CONTINUE;
+		}
+
+		SQLResult r = SQL->RunQuery("SELECT * FROM `anope_ns_core`");
+		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;
+			while (sep.GetToken(buf))
+			{
+				for (int j = 0; NickCoreFlags[j].Flag != -1; ++j)
+				{
+					if (NickCoreFlags[j].Name == buf)
+					{
+						nc->SetFlag(NickCoreFlags[j].Flag);
+						break;
+					}
+				}
+			}
+
+			nc->language = r.Get(i, "language").is_number_only() ? convertTo<int>(r.Get(i, "language")) : LANG_EN_US;
+			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<int>(r.Get(i, "memomax")) : 20;
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ns_access`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			NickCore *nc = findcore(r.Get(i, "display"));
+			if (!nc)
+			{
+				Alog() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display");
+				continue;
+			}
+
+			nc->AddAccess(r.Get(i, "access"));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ns_core_metadata`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			NickCore *nc = findcore(r.Get(i, "display"));
+			if (!nc)
+			{
+				Alog() << "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));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ns_alias`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			NickCore *nc = findcore(r.Get(i, "display"));
+			if (!nc)
+			{
+				Alog() << "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_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : time(NULL);
+			na->last_seen = r.Get(i, "last_seen").is_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : time(NULL);
+
+			spacesepstream sep(r.Get(i, "flags"));
+			Anope::string buf;
+			while (sep.GetToken(buf))
+			{
+				for (int j = 0; NickAliasFlags[j].Flag != -1; ++j)
+				{
+					if (NickAliasFlags[j].Name == buf)
+					{
+						na->SetFlag(NickAliasFlags[j].Flag);
+						break;
+					}
+				}
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ns_alias_metadata`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			NickAlias *na = findnick(r.Get(i, "nick"));
+			if (!na)
+			{
+				Alog() << "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));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_bs_core`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			BotInfo *bi = findbot(r.Get(i, "nick"));
+			if (!bi)
+				bi = new BotInfo(r.Get(i, "nick"));
+			bi->SetIdent(r.Get(i, "user"));
+			bi->host = r.Get(i, "host");
+			bi->realname = r.Get(i, "rname");
+			bi->created = r.Get(i, "created").is_number_only() ? convertTo<time_t>(r.Get(i, "creeated")) : time(NULL);
+
+			spacesepstream sep(r.Get(i, "flags"));
+			Anope::string buf;
+			while (sep.GetToken(buf))
+			{
+				for (int j = 0; BotServFlags[j].Flag != -1; ++j)
+				{
+					if (buf == BotServFlags[j].Name)
+					{
+						bi->SetFlag(BotServFlags[j].Flag);
+						break;
+					}
+				}
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_bs_info_metadata`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			BotInfo *bi = findbot(r.Get(i, "botname"));
+			if (!bi)
+			{
+				Alog() << "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));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_info`");
+		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)
+				{
+					Alog() << "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_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : time(NULL);
+				ci->last_used = r.Get(i, "last_used").is_number_only() ? convertTo<time_t>(r.Get(i, "last_used")) : time(NULL);
+				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")) : time(NULL);
+				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->entry_message = r.Get(i, "entry_message");
+				ci->memos.memomax = r.Get(i, "memomax").is_number_only() ? convertTo<int>(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;
+					while (sep.GetToken(buf))
+					{
+						for (int j = 0; BotFlags[j].Flag != -1; ++j)
+						{
+							if (buf == BotFlags[j].Name)
+							{
+								ci->botflags.SetFlag(BotFlags[j].Flag);
+								break;
+							}
+						}
+					}
+				}
+
+				if (!r.Get(i, "mlock_on").empty())
+				{
+					std::vector<Anope::string> modes;
+
+					spacesepstream sep(r.Get(i, "mlock_on"));
+					Anope::string buf;
+					while (sep.GetToken(buf))
+						modes.push_back(buf);
+
+					ci->Extend("db_mlock_modes_on", new ExtensibleItemRegular<std::vector<Anope::string> >(modes));
+				}
+				if (!r.Get(i, "mlock_off").empty())
+				{
+					std::vector<Anope::string> modes;
+
+					spacesepstream sep(r.Get(i, "mlock_off"));
+					Anope::string buf;
+					while (sep.GetToken(buf))
+						modes.push_back(buf);
+
+					ci->Extend("db_mlock_modes_off", new ExtensibleItemRegular<std::vector<Anope::string> >(modes));
+				}
+				if (!r.Get(i, "mlock_params").empty())
+				{
+					std::vector<std::pair<Anope::string, Anope::string> > mlp;
+
+					spacesepstream sep(r.Get(i, "mlock_params"));
+					Anope::string buf, buf2;
+					while (sep.GetToken(buf) && sep.GetToken(buf2))
+						mlp.push_back(std::make_pair(Anope::string(buf), Anope::string(buf2)));
+
+					ci->Extend("db_mlp", new ExtensibleItemRegular<std::vector<std::pair<Anope::string, Anope::string> > >(mlp));
+				}
+
+				if (!r.Get(i, "flags").empty())
+				{
+					spacesepstream sep(r.Get(i, "flags"));
+					Anope::string buf;
+
+					while (sep.GetToken(buf))
+					{
+						for (int j = 0; ChannelFlags[j].Flag != -1; ++j)
+						{
+							if (buf == ChannelFlags[j].Name)
+							{
+								ci->SetFlag(ChannelFlags[j].Flag);
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_ttb`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "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());
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_bs_badwords`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "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);
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_access`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel");
+				continue;
+			}
+
+			NickCore *nc = findcore(r.Get(i, "display"));
+			if (!nc)
+			{
+				Alog() << "MySQL: Channel access entry for " << ci->name << " with nonexistant nick " << r.Get(i, "display");
+				continue;
+			}
+
+			ci->AddAccess(nc, atoi(r.Get(i, "level").c_str()), r.Get(i, "creator"), (r.Get(i, "last_seen").is_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : time(NULL)));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_akick`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "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;
+			bool stuck = false;
+			while (sep.GetToken(flag))
+			{
+				if (flag.equals_cs("ISNICK"))
+					nc = findcore(r.Get(i, "mask"));
+				else if (flag.equals_cs("STUCK"))
+					stuck = true;
+
+				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 (stuck)
+					ak->SetFlag(AK_STUCK);
+				if (nc)
+					ak->SetFlag(AK_ISNICK);
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_levels`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "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());
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_cs_info_metadata");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			ChannelInfo *ci = cs_findchan(r.Get(i, "channel"));
+			if (!ci)
+			{
+				Alog() << "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));
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ns_request`");
+		for (int i = 0; i < r.Rows(); ++i)
+		{
+			NickRequest *nr = new NickRequest(r.Get(i, "nick"));
+			nr->password = r.Get(i, "passcode");
+			nr->password = r.Get(i, "password");
+			nr->email = r.Get(i, "email");
+			nr->requested = r.Get(i, "requested").is_number_only() ? convertTo<time_t>(r.Get(i, "requested")) : time(NULL);
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_ms_info`");
+		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");
+				if (mi->memos.size() > 1)
+				{
+					m->number = mi->memos[mi->memos.size() - 1]->number + 1;
+					if (m->number < 1)
+					{
+						for (unsigned j = 0; j < mi->memos.size(); ++j)
+							mi->memos[j]->number = j + 1;
+					}
+				}
+				else
+					m->number = 1;
+				m->time = r.Get(i, "time").is_number_only() ? convertTo<time_t>(r.Get(i, "time")) : time(NULL);
+				m->text = r.Get(i, "text");
+
+				if (!r.Get(i, "flags").empty())
+				{
+					spacesepstream sep(r.Get(i, "flags"));
+					Anope::string buf;
+					while (sep.GetToken(buf))
+					{
+						for (unsigned j = 0; MemoFlags[j].Flag != -1; ++j)
+						{
+							if (MemoFlags[j].Name == buf)
+							{
+								m->SetFlag(MemoFlags[j].Flag);
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (SQLine)
+		{
+			r = SQL->RunQuery("SELECT * FROM `anope_os_akills`");
+			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_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : time(NULL);
+				time_t expires = r.Get(i, "expires").is_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : time(NULL);
+
+				XLine *x = SGLine->Add(NULL, NULL, user + "@" + host, expires, reason);
+				if (x)
+				{
+					x->By = by;
+					x->Created = seton;
+				}
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_os_xlines`");
+		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_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : time(NULL);
+			time_t expires = r.Get(i, "expires").is_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : time(NULL);
+
+			XLine *x = NULL;
+			if (SNLine && r.Get(i, "type").equals_cs("SNLINE"))
+				SNLine->Add(NULL, NULL, mask, expires, reason);
+			else if (SQLine && r.Get(i, "type").equals_cs("SQLINE"))
+				SQLine->Add(NULL, NULL, mask, expires, reason);
+			else if (SZLine && r.Get(i, "type").equals_cs("SZLINE"))
+				SZLine->Add(NULL, NULL, mask, expires, reason);
+			if (x)
+			{
+				x->By = by;
+				x->Created = seton;
+			}
+		}
+
+		r = SQL->RunQuery("SELECT * FROM `anope_extra`");
+		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));
+		}
+
+		return EVENT_STOP;
+	}
+
+	EventReturn OnSaveDatabase()
+	{
+		this->RunQuery("TRUNCATE TABLE `anope_os_core`");
+
+		this->RunQuery("INSERT DELAYED INTO `anope_os_core` (maxusercnt, maxusertime, akills_count, sglines_count, sqlines_count, szlines_count) VALUES( " + stringify(maxusercnt) + ", " + stringify(maxusertime) + ", " + stringify(SGLine ? SGLine->GetCount() : 0) + ", " + stringify(SQLine ? SQLine->GetCount() : 0) + ", " + stringify(SNLine ? SNLine->GetCount() : 0) + ", " + stringify(SZLine ? SZLine->GetCount() : 0) + ")");
+		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 (botinfo_map::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 */
+			this->RunQuery("INSERT DELAYED INTO `anope_bs_core` (nick, user, host, rname, flags, created, chancount) VALUES('" + this->Escape(CurBot->nick) + "', '" + this->Escape(CurBot->GetIdent()) + "', '" + this->Escape(CurBot->host) + "', '" + this->Escape(CurBot->realname) + "', '" + GetBotServFlags(CurBot) + "', " + CurBot->created + ", " +  CurBot->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(created)");
+		}
+
+		FOREACH_MOD(I_OnDatabaseWrite, OnDatabaseWrite(Write));
+
+		return EVENT_CONTINUE;
+	}
+
+	void OnPostCommand(User *u, const Anope::string &service, const Anope::string &command, const std::vector<Anope::string> &params)
+	{
+		if (service == Config.s_NickServ)
+		{
+			if (u->Account() && ((command.equals_ci("SET") && !params.empty()) || (command.equals_ci("SASET") && u->Account()->HasCommand("nickserv/saset") && params.size() > 1)))
+			{
+				Anope::string cmd = (command == "SET" ? params[0] : params[1]);
+				NickCore *nc = (command == "SET" ? u->Account() : findcore(params[0]));
+				if (!nc)
+					return;
+				if (cmd.equals_ci("PASSWORD") && params.size() > 1)
+				{
+					this->RunQuery("UPDATE `anope_ns_core` SET `pass` = '" + this->Escape(nc->pass) + "' WHERE `display` = '" + this->Escape(nc->display) + "'");
+				}
+				else if (cmd.equals_ci("LANGUAGE") && params.size() > 1)
+				{
+					this->RunQuery("UPDATE `anope_ns_core` SET `language` = '" + this->Escape(nc->language) + "' WHERE `display` = '" + this->Escape(nc->display) + "'");
+				}
+				else if (cmd.equals_ci("EMAIL"))
+				{
+					this->RunQuery("UPDATE `anope_ns_core` SET `email` = '" + this->Escape(nc->email) + "' WHERE `display` = '" + this->Escape(nc->display) + "'");
+				}
+				else if (cmd.equals_ci("GREET"))
+				{
+					this->RunQuery("UPDATE `anope_ns_core` SET `greet` = '" + this->Escape(nc->greet) + " WHERE `display` = '" + this->Escape(nc->display) + "'");
+				}
+				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"))
+				{
+					this->RunQuery("UPDATE `anope_ns_core` SET `flags` = '" + BuildFlagsList(nc) + "' WHERE `display` = '" + this->Escape(nc->display) + "'");
+				}
+			}
+		}
+		else if (service == Config.s_ChanServ)
+		{
+			if (command.equals_ci("SET") && u->Account() && params.size() > 1)
+			{
+				ChannelInfo *ci = cs_findchan(params[0]);
+				if (!ci)
+					return;
+				if (!u->Account()->HasPriv("chanserv/set") && check_access(u, ci, CA_SET))
+					return;
+				if (params[1].equals_ci("FOUNDER") && ci->founder)
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `founder` = '" + this->Escape(ci->founder->display) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("SUCCESSOR"))
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `successor` = '" + this->Escape(ci->successor ? ci->successor->display : "") + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("DESC"))
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `descr` = '" + this->Escape(ci->desc) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("ENTRYMSG"))
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `entry_message` = '" + this->Escape(ci->entry_message) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("MLOCK"))
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `mlock_on` = '" + GetMLockOn(ci) + "' WHERE `name` = " + this->Escape(ci->name) + "'");
+					this->RunQuery("UPDATE `anope_cs_info` SET `mlock_off` = '" + GetMLockOff(ci) + "' WHERE `name` = " + this->Escape(ci->name) + "'");
+					this->RunQuery("UPDATE `anope_cs_info` SET `mlock_params` = '" + GetMLockParams(ci) + "' WHERE `name` = " + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("BANTYPE"))
+				{
+					this->RunQuery("UPDATE `anope_cs_info` SET `bantype` = " + stringify(ci->bantype) + " WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+				else if (params[1].equals_ci("KEEPTOPIC") || params[1].equals_ci("TOPICLOCK") || params[1].equals_ci("PRIVATE") || params[1].equals_ci("SECUREOPS") || params[1].equals_ci("SECUREFOUNDER") || params[1].equals_ci("RESTRICTED") || params[1].equals_ci("SECURE") || params[1].equals_ci("SIGNKICK") || params[1].equals_ci("OPNOTICE") || params[1].equals_ci("XOP") || params[1].equals_ci("PEACE") || params[1].equals_ci("PERSIST") || params[1].equals_ci("NOEXPIRE"))
+				{
+					SQL->RunQuery("UPDATE `anope_cs_info` SET `flags` = '" + BuildFlagsList(ci) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+				}
+			}
+		}
+		else if (service == Config.s_BotServ)
+		{
+			if (command.equals_ci("KICK") && params.size() > 2)
+			{
+				ChannelInfo *ci = cs_findchan(params[0]);
+				if (!ci)
+					return;
+				if (!check_access(u, ci, CA_SET) && !u->Account()->HasPriv("botserv/administration"))
+					return;
+				if (params[1].equals_ci("BADWORDS") || params[1].equals_ci("BOLDS") || params[1].equals_ci("CAPS") || params[1].equals_ci("COLORS") || params[1].equals_ci("FLOOD") || params[1].equals_ci("REPEAT") || params[1].equals_ci("REVERSES") || params[1].equals_ci("UNDERLINES"))
+				{
+					if (params[2].equals_ci("ON") || params[2].equals_ci("