Made the Flag class able to convert flags to strings and back

24 files changed, 206 insertions, 424 deletions

diff --git a/include/account.h b/include/account.h
index 08652f13c..afef1236d 100644
--- a/include/account.h
+++ b/include/account.h
@@ -41,6 +41,10 @@ enum NickNameFlag
 	NS_END
 };
 
+const Anope::string NickNameFlagStrings[] = {
+	"NS_BEGIN", "NS_FORBIDDEN", "NS_NO_EXPIRE", "NS_HELD", "NS_COLLIDED", "NS_END", ""
+};
+
 /** Flags set on NickCores
  */
 enum NickCoreFlag
@@ -85,6 +89,12 @@ enum NickCoreFlag
 	NI_END
 };
 
+const Anope::string NickCoreFlagStrings[] = {
+	"NI_BEGIN", "NI_KILLPROTECT", "NI_SECURE", "NI_MSG", "NI_MEMO_HARDMAX", "NI_MEMO_SIGNON", "NI_MEMO_RECEIVE",
+	"NI_PRIVATE", "NI_HIDE_EMAIL", "NI_HIDE_MASK", "NI_HIDE_QUIT", "NI_KILL_QUICK", "NI_KILL_IMMED",
+	"NI_MEMO_MAIL", "NI_HIDE_STATUS", "NI_SUSPENDED", "NI_AUTOOP", "NI_FORBIDDEN", ""
+};
+
 class CoreExport NickRequest : public Extensible
 {
  public:
diff --git a/include/channels.h b/include/channels.h
index 6991e1a20..8d6cbde5e 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -52,7 +52,7 @@ struct UserContainer
 
 typedef std::list<UserContainer *> CUserList;
 
-enum ChannelFlags
+enum ChannelFlag
 {
 	/* Channel still exists when emptied */
 	CH_PERSIST,
@@ -62,7 +62,7 @@ enum ChannelFlags
 	CH_LOGCHAN
 };
 
-class CoreExport Channel : public Extensible, public Flags<ChannelFlags>
+class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 {
  public:
 	typedef std::multimap<ChannelModeName, Anope::string> ModeList;
diff --git a/include/commands.h b/include/commands.h
index 4abaa43b8..afb7ab51f 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -43,6 +43,16 @@ enum CommandFlag
 	CFLAG_DISABLE_FANTASY
 };
 
+const Anope::string CommandFlagStrings[] = {
+	"CFLAG_ALLOW_UNREGISTERED",
+	"CFLAG_ALLOW_FORBIDDEN",
+	"CFLAG_ALLOW_SUSPENDED",
+	"CFLAG_ALLOW_UNREGISTEREDCHANNEL",
+	"CFLAG_STRIP_CHANNEL",
+	"CFLAG_DISABLE_FANTASY",
+	""
+};
+
 /* The source for a command */
 struct CoreExport CommandSource
 {
diff --git a/include/modes.h b/include/modes.h
index c6534f353..9cf780b31 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -24,6 +24,18 @@ enum UserModeName
 	UMODE_END
 };
 
+const Anope::string UserModeNameStrings[] = {
+	"UMODE_BEGIN",
+
+	"UMODE_SERV_ADMIN", "UMODE_BOT", "UMODE_CO_ADMIN", "UMODE_FILTER", "UMODE_HIDEOPER", "UMODE_NETADMIN",
+	"UMODE_REGPRIV", "UMODE_PROTECTED", "UMODE_NO_CTCP", "UMODE_WEBTV", "UMODE_WEBIRC", "UMODE_WHOIS", "UMODE_ADMIN", "UMODE_DEAF",
+	"UMODE_GLOBOPS", "UMODE_HELPOP", "UMODE_INVIS", "UMODE_OPER", "UMODE_PRIV", "UMODE_GOD", "UMODE_REGISTERED",
+	"UMODE_SNOMASK", "UMODE_VHOST", "UMODE_WALLOPS", "UMODE_CLOAK", "UMODE_SSL", "UMODE_SOFTCALLERID", "UMODE_CALLERID",
+	"UMODE_COMMONCHANS", "UMODE_HIDDEN", "UMODE_STRIPCOLOR", "UMODE_INVISIBLE_OPER",
+
+	""
+};
+
 /** All of the valid channel mode names
  */
 enum ChannelModeName
@@ -49,6 +61,29 @@ enum ChannelModeName
 	CMODE_END
 };
 
+const Anope::string ChannelModeNameStrings[] = {
+	"CMODE_BEGIN",
+
+	/* Channel modes */
+	"CMODE_BLOCKCOLOR", " CMODE_FLOOD", " CMODE_INVITE", " CMODE_KEY", " CMODE_LIMIT", " CMODE_MODERATED", " CMODE_NOEXTERNAL",
+	"CMODE_PRIVATE", " CMODE_REGISTERED", " CMODE_SECRET", " CMODE_TOPIC", " CMODE_AUDITORIUM", " CMODE_SSL", " CMODE_ADMINONLY",
+	"CMODE_NOCTCP", " CMODE_FILTER", " CMODE_NOKNOCK", " CMODE_REDIRECT", " CMODE_REGMODERATED", " CMODE_NONICK", " CMODE_OPERONLY",
+	"CMODE_NOKICK", " CMODE_REGISTEREDONLY", " CMODE_STRIPCOLOR", " CMODE_NONOTICE", " CMODE_NOINVITE", " CMODE_ALLINVITE",
+	"CMODE_BLOCKCAPS", " CMODE_PERM", " CMODE_NICKFLOOD", " CMODE_JOINFLOOD", " CMODE_DELAYEDJOIN", " CMODE_NOREJOIN",
+	"CMODE_BANDWIDTH",
+
+	/* b/e/I */
+	"CMODE_BAN", " CMODE_EXCEPT",
+	"CMODE_INVITEOVERRIDE",
+
+	/* v/h/o/a/q */
+	"CMODE_VOICE", " CMODE_HALFOP", " CMODE_OP",
+	"CMODE_PROTECT", " CMODE_OWNER",
+
+	""
+};
+
+
 /** The different types of modes
 */
 enum ModeType
diff --git a/include/regchannel.h b/include/regchannel.h
index 4be8a50aa..298e35798 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -62,6 +62,12 @@ enum ChannelInfoFlag
 	CI_END
 };
 
+const Anope::string ChannelInfoFlagStrings[] = {
+	"CI_BEGIN", "CI_INHABIT", "CI_KEEPTOPIC", "CI_SECUREOPS", "CI_PRIVATE", "CI_TOPICLOCK", "CI_RESTRICTED",
+	"CI_PEACE", "CI_SECURE", "CI_FORBIDDEN", "CI_NO_EXPIRE", "CI_MEMO_HARDMAX", "CI_OPNOTICE", "CI_SECUREFOUNDER",
+	"CI_SIGNKICK", "CI_SIGNKICK_LEVEL", "CI_XOP", "CI_SUSPENDED", "CI_PERSIST", ""
+};
+
 struct ModeLock
 {
 	bool set;
diff --git a/include/servers.h b/include/servers.h
index d22ab05ac..c9d85804b 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -70,6 +70,8 @@ enum ServerFlag
 	SERVER_JUPED
 };
 
+const Anope::string ServerFlagStrings[] = { "SERVER_NONE", "SERVER_SYNCING", "SERVER_JUPED", "" };
+
 /** Class representing a server
  */
 class CoreExport Server : public Flags<ServerFlag>
diff --git a/include/services.h b/include/services.h
index 881bbbb76..69ed1a944 100644
--- a/include/services.h
+++ b/include/services.h
@@ -306,8 +306,11 @@ template<typename T, size_t Size = 32> class Flags
 {
  protected:
 	std::bitset<Size> Flag_Values;
+	const Anope::string *Flag_Strings;
 
  public:
+ 	Flags(const Anope::string *flag_strings) : Flag_Strings(flag_strings) { }
+
 	/** Add a flag to this item
 	 * @param Value The flag
 	 */
@@ -347,6 +350,23 @@ template<typename T, size_t Size = 32> class Flags
 	{
 		Flag_Values.reset();
 	}
+
+	std::vector<Anope::string> ToString()
+	{
+		std::vector<Anope::string> ret;
+		for (unsigned i = 0; this->Flag_Strings && !this->Flag_Strings[i].empty(); ++i)
+			if (this->HasFlag(static_cast<T>(i)))
+				ret.push_back(this->Flag_Strings[i]);
+		return ret;
+	}
+
+	void FromString(const std::vector<Anope::string> &strings)
+	{
+		for (unsigned i = 0; this->Flag_Strings && !this->Flag_Strings[i].empty(); ++i)
+			for (unsigned j = 0; j < strings.size(); ++j)
+				if (this->Flag_Strings[i] == strings[j])
+					this->SetFlag(static_cast<T>(i));
+	}
 };
 
 #include "sockets.h"
@@ -470,17 +490,22 @@ enum MemoFlag
 {
 	/* Memo is unread */
 	MF_UNREAD,
-	/* SEnder requests a receipt */
+	/* Sender requests a receipt */
 	MF_RECEIPT,
 	/* Memo is a notification of receipt */
 	MF_NOTIFYS
 };
 
+const Anope::string MemoFlagStrings[] = {
+	"MF_UNREAD", "MF_RECEIPT", "MF_NOTIFYS", ""
+};
+
 /* Memo info structures.  Since both nicknames and channels can have memos,
  * we encapsulate memo data in a MemoList to make it easier to handle. */
 class Memo : public Flags<MemoFlag>
 {
  public:
+	Memo();
 	time_t time;	/* When it was sent */
 	Anope::string sender;
 	Anope::string text;
@@ -592,10 +617,13 @@ enum AutoKickFlag
 	AK_ISNICK
 };
 
+const Anope::string AutoKickFlagString[] = { "AK_ISNICK", "" };
+
 /* AutoKick data. */
 class AutoKick : public Flags<AutoKickFlag>
 {
  public:
+ 	AutoKick() : Flags<AutoKickFlag>(AutoKickFlagString) { }
 	/* Only one of these can be in use */
 	Anope::string mask;
 	NickCore *nc;
@@ -715,6 +743,12 @@ enum BotServFlag
 	BS_END
 };
 
+const Anope::string BotServFlagStrings[] = {
+	"BS_BEGIN", "BS_DONTKICKOPS", "BS_DONTKICKVOICES", "BS_FANTASY", "BS_SYMBIOSIS", "BS_GREET", "BS_NOBOT",
+	"BS_KICK_BOLDs", "BS_KICK_COLORS", "BS_KICK_REVERSES", "BS_KICK_UNDERLINES", "BS_KICK_BADWORDS", "BS_KICK_CAPS",
+	"BS_KICK_FLOOD", "BS_KICK_REPEAT", "BS_KICK_ITALICS", "BS_MSG_PRIVMSG", "BS_MSG_NOTICE", "BS_MSG_NOTICEOPS", ""
+};
+
 /* Indices for TTB (Times To Ban) */
 enum
 {
diff --git a/include/sockets.h b/include/sockets.h
index 4d6938e09..6d48d1481 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -121,6 +121,8 @@ enum SocketFlag
 	SF_WRITABLE
 };
 
+static const Anope::string SocketFlagStrings[] = { "SF_DEAD", "SF_WRITABLE", "" };
+
 class Socket;
 class ClientSocket;
 class ListenSocket;
diff --git a/include/users.h b/include/users.h
index 8eba0e476..d54fd13be 100644
--- a/include/users.h
+++ b/include/users.h
@@ -14,6 +14,7 @@ extern CoreExport patricia_tree<User *> UserListByUID;
 class CoreExport ChannelStatus : public Flags<ChannelModeName, CMODE_END * 2>
 {
  public:
+	ChannelStatus();
 	Anope::string BuildCharPrefixList() const;
 	Anope::string BuildModePrefixList() const;
 };
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index dd634dd02..ab95ea094 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -203,51 +203,12 @@ static void ReadDatabase(Module *m = NULL)
 	db.close();
 }
 
-struct ChannelFlagInfo
-{
-	Anope::string Name;
-	ChannelInfoFlag Flag;
-};
-
 struct ChannelLevel
 {
 	Anope::string Name;
 	int Level;
 };
 
-struct BotFlagInfo
-{
-	Anope::string Name;
-	BotServFlag Flag;
-};
-
-struct NickCoreFlagInfo
-{
-	Anope::string Name;
-	NickCoreFlag Flag;
-};
-
-ChannelFlagInfo ChannelInfoFlags[] = {
-	{"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)}
-};
-
 ChannelLevel ChannelLevels[] = {
 	{"INVITE", CA_INVITE},
 	{"AKICK", CA_AKICK},
@@ -289,48 +250,18 @@ ChannelLevel ChannelLevels[] = {
 	{"", -1}
 };
 
-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},
-	{"MSG_PRIVMSG", BS_MSG_PRIVMSG},
-	{"MSG_NOTICE", BS_MSG_NOTICE},
-	{"MSG_NOTICEOPS", BS_MSG_NOTICEOPS},
-	{"", static_cast<BotServFlag>(-1)}
-};
+static Anope::string ToString(const std::vector<Anope::string> &strings)
+{
+	Anope::string ret;
 
-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)}
-};
+	for (unsigned i = 0; i < strings.size(); ++i)
+		ret += " " + strings[i];
+	
+	if (!ret.empty())
+		ret.erase(ret.begin());
+	
+	return ret;
+}
 
 static void LoadNickCore(const std::vector<Anope::string> &params)
 {
@@ -587,12 +518,7 @@ class DBPlain : public Module
 		else if (key.equals_ci("ACCESS"))
 			nc->AddAccess(params[0]);
 		else if (key.equals_ci("FLAGS"))
-		{
-			for (unsigned j = 0, end = params.size(); j < end; ++j)
-				for (int i = 0; NickCoreFlags[i].Flag != -1; ++i)
-					if (params[j].equals_ci(NickCoreFlags[i].Name))
-						nc->SetFlag(NickCoreFlags[i].Flag);
-		}
+			nc->FromString(params);
 		else if (key.equals_ci("MI"))
 		{
 			Memo *m = new Memo;
@@ -676,12 +602,7 @@ class DBPlain : public Module
 						ci->levels[ChannelLevels[i].Level] = params[j + 1].is_number_only() ? convertTo<int16>(params[j + 1]) : 0;
 		}
 		else if (key.equals_ci("FLAGS"))
-		{
-			for (unsigned j = 0, end = params.size(); j < end; ++j)
-				for (int i = 0; ChannelInfoFlags[i].Flag != -1; ++i)
-					if (params[j].equals_ci(ChannelInfoFlags[i].Name))
-						ci->SetFlag(ChannelInfoFlags[i].Flag);
-		}
+			ci->FromString(params);
 		else if (key.equals_ci("DESC"))
 			ci->desc = params[0];
 		else if (key.equals_ci("TOPIC"))
@@ -776,12 +697,7 @@ class DBPlain : public Module
 			if (params[0].equals_ci("NAME"))
 				ci->bi = findbot(params[1]);
 			else if (params[0].equals_ci("FLAGS"))
-			{
-				for (unsigned j = 1, end = params.size(); j < end; ++j)
-					for (int i = 0; BotFlags[i].Flag != -1; ++i)
-						if (params[j].equals_ci(BotFlags[i].Name))
-							ci->botflags.SetFlag(BotFlags[i].Flag);
-			}
+				ci->FromString(params);
 			else if (params[0].equals_ci("TTB"))
 			{
 				for (unsigned j = 1, end = params.size(); j < end; j += 2)
@@ -880,13 +796,7 @@ class DBPlain : public Module
 					db << "MD ACCESS " << *it << endl;
 			}
 			if (nc->FlagCount())
-			{
-				db << "MD FLAGS";
-				for (int j = 0; NickCoreFlags[j].Flag != -1; ++j)
-					if (nc->HasFlag(NickCoreFlags[j].Flag))
-						db << " " << NickCoreFlags[j].Name;
-				db << endl;
-			}
+				db << "MD FLAGS " << ToString(nc->ToString()) << endl;
 			MemoInfo *mi = &nc->memos;
 			for (unsigned k = 0, end = mi->memos.size(); k < end; ++k)
 			{
@@ -915,8 +825,8 @@ class DBPlain : public Module
 				db << "MD LAST_REALNAME :" << na->last_realname << endl;
 			if (!na->last_quit.empty())
 				db << "MD LAST_QUIT :" << na->last_quit << endl;
-			if (na->HasFlag(NS_FORBIDDEN) || na->HasFlag(NS_NO_EXPIRE))
-				db << "MD FLAGS" << (na->HasFlag(NS_FORBIDDEN) ? " FORBIDDEN" : "") << (na->HasFlag(NS_NO_EXPIRE) ? " NOEXPIRE " : "") << endl;
+			if (na->FlagCount())
+				db << "MD FLAGS " << ToString(na->ToString()) << endl;
 			if (na->hostinfo.HasVhost())
 				db << "MD VHOST " << na->hostinfo.GetCreator() << " " << na->hostinfo.GetTime() << " " << na->hostinfo.GetHost() << " :" << na->hostinfo.GetIdent() << endl;
 
@@ -928,10 +838,8 @@ class DBPlain : public Module
 			BotInfo *bi = *it;
 
 			db << "BI " << bi->nick << " " << bi->GetIdent() << " " << bi->host << " " << bi->created << " " << bi->chancount << " :" << bi->realname << endl;
-			if (bi->HasFlag(BI_PRIVATE))
-			{
-				db << "MD FLAGS PRIVATE" << endl;
-			}
+			if (bi->FlagCount())
+				db << "MD FLAGS " << ToString(bi->ToString()) << endl;
 		}
 
 		for (registered_channel_map::const_iterator cit = RegisteredChannelList.begin(), cit_end = RegisteredChannelList.end(); cit != cit_end; ++cit)
@@ -954,15 +862,9 @@ class DBPlain : public Module
 				db << " " << ChannelLevels[j].Name << " " << ci->levels[ChannelLevels[j].Level];
 			db << endl;
 			if (ci->FlagCount())
-			{
-				db << "MD FLAGS";
-				for (int j = 0; ChannelInfoFlags[j].Flag != -1; ++j)
-					if (ci->HasFlag(ChannelInfoFlags[j].Flag))
-						db << " " << ChannelInfoFlags[j].Name;
-				db << endl;
-				if (ci->HasFlag(CI_FORBIDDEN))
-					db << "MD FORBID " << ci->forbidby << " :" << ci->forbidreason << endl;
-			}
+				db << "MD FLAGS " << ToString(ci->ToString()) << endl;
+			if (ci->HasFlag(CI_FORBIDDEN))
+				db << "MD FORBID " << ci->forbidby << " :" << ci->forbidreason << endl;
 			for (unsigned k = 0, end = ci->GetAccessCount(); k < end; ++k)
 				db << "MD ACCESS " << ci->GetAccess(k)->mask << " " << ci->GetAccess(k)->level << " " << ci->GetAccess(k)->last_seen << " " << ci->GetAccess(k)->creator << endl;
 			for (unsigned k = 0, end = ci->GetAkickCount(); k < end; ++k)
@@ -1057,13 +959,7 @@ class DBPlain : public Module
 			if (ci->bi)
 				db << "MD BI NAME " << ci->bi->nick << endl;
 			if (ci->botflags.FlagCount())
-			{
-				db << "MD BI FLAGS";
-				for (int j = 0; BotFlags[j].Flag != -1; ++j)
-					if (ci->botflags.HasFlag(BotFlags[j].Flag))
-						db << " " << BotFlags[j].Name;
-				db << endl;
-			}
+				db << "MD BI FLAGS " << ToString(ci->botflags.ToString()) << endl;
 			db << "MD BI TTB BOLDS " << ci->ttb[0] << " COLORS " << ci->ttb[1] << " REVERSES " << ci->ttb[2] << " UNDERLINES " << ci->ttb[3] << " BADWORDS " << ci->ttb[4] << " CAPS " << ci->ttb[5] << " FLOOD " << ci->ttb[6] << " REPEAT " << ci->ttb[7] << " ITALICS " << ci->ttb[8] << endl;
 			if (ci->capsmin)
 				db << "MD BI CAPSMIN " << ci->capsmin << endl;
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
index d11d7b914..d5c51fb36 100644
--- a/modules/extra/db_mysql.cpp
+++ b/modules/extra/db_mysql.cpp
@@ -1,123 +1,18 @@
 #include "module.h"
 #include "sql.h"
 
-struct NickAliasFlagInfo
+static Anope::string ToString(const std::vector<Anope::string> &strings)
 {
-	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},
-	{"MSG_PRIVMSG", BS_MSG_PRIVMSG},
-	{"MSG_NOTICE", BS_MSG_NOTICE},
-	{"MSG_NOTICEOPS", BS_MSG_NOTICEOPS},
-	{"", 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;
-};
+	Anope::string ret;
 
-MemoFlagInfo MemoFlags[] = {
-	{"UNREAD", MF_UNREAD},
-	{"RECEIPT", MF_RECEIPT},
-	{"NOTIFYS", MF_NOTIFYS},
-	{"", static_cast<MemoFlag>(-1)}
-};
+	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)
 {
@@ -142,62 +37,6 @@ static std::vector<Anope::string> MakeVector(const Anope::string &buf)
 	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;
@@ -268,34 +107,6 @@ static Anope::string GetMLockParams(ChannelInfo *ci, bool onoff)
 	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;
@@ -446,17 +257,10 @@ class DBMySQL : public Module
 
 			spacesepstream sep(r.Get(i, "flags"));
 			Anope::string buf;
+			std::vector<Anope::string> flags;
 			while (sep.GetToken(buf))
-			{
-				for (int j = 0; NickCoreFlags[j].Flag != -1; ++j)
-				{
-					if (NickCoreFlags[j].Name == buf)
-					{
-						nc->SetFlag(NickCoreFlags[j].Flag);
-						break;
-					}
-				}
-			}
+				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;
@@ -510,17 +314,11 @@ class DBMySQL : public Module
 
 			spacesepstream sep(r.Get(i, "flags"));
 			Anope::string buf;
+			std::vector<Anope::string> flags;
 			while (sep.GetToken(buf))
-			{
-				for (int j = 0; NickAliasFlags[j].Flag != -1; ++j)
-				{
-					if (NickAliasFlags[j].Name == buf)
-					{
-						na->SetFlag(NickAliasFlags[j].Flag);
-						break;
-					}
-				}
-			}
+				flags.push_back(buf);
+
+			na->FromString(flags);
 		}
 
 		r = SQL->RunQuery("SELECT * FROM `anope_ns_alias_metadata`");
@@ -563,17 +361,11 @@ class DBMySQL : public Module
 
 			spacesepstream sep(r.Get(i, "flags"));
 			Anope::string buf;
+			std::vector<Anope::string> flags;
 			while (sep.GetToken(buf))
-			{
-				for (int j = 0; BotServFlags[j].Flag != -1; ++j)
-				{
-					if (buf == BotServFlags[j].Name)
-					{
-						bi->SetFlag(BotServFlags[j].Flag);
-						break;
-					}
-				}
-			}
+				flags.push_back(buf);
+
+			bi->FromString(flags);
 		}
 
 		r = SQL->RunQuery("SELECT * FROM `anope_bs_info_metadata`");
@@ -629,17 +421,11 @@ class DBMySQL : public Module
 				{
 					spacesepstream sep(r.Get(i, "botflags"));
 					Anope::string buf;
+					std::vector<Anope::string> flags;
 					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;
-							}
-						}
-					}
+						flags.push_back(buf);
+
+					ci->botflags.FromString(flags);
 				}
 
 				if (!r.Get(i, "mlock_on").empty())
@@ -691,18 +477,11 @@ class DBMySQL : public Module
 				{
 					spacesepstream sep(r.Get(i, "flags"));
 					Anope::string buf;
-
+					std::vector<Anope::string> flags;
 					while (sep.GetToken(buf))
-					{
-						for (int j = 0; ChannelFlags[j].Flag != -1; ++j)
-						{
-							if (buf == ChannelFlags[j].Name)
-							{
-								ci->SetFlag(ChannelFlags[j].Flag);
-								break;
-							}
-						}
-					}
+						flags.push_back(buf);
+
+					ci->FromString(flags);
 				}
 			}
 		}
@@ -847,17 +626,11 @@ class DBMySQL : public Module
 				{
 					spacesepstream sep(r.Get(i, "flags"));
 					Anope::string buf;
+					std::vector<Anope::string> flags;
 					while (sep.GetToken(buf))
-					{
-						for (unsigned j = 0; MemoFlags[j].Flag != -1; ++j)
-						{
-							if (MemoFlags[j].Name == buf)
-							{
-								m->SetFlag(MemoFlags[j].Flag);
-								break;
-							}
-						}
-					}
+						flags.push_back(buf);
+
+					m->FromString(flags);
 				}
 			}
 		}
@@ -978,7 +751,7 @@ class DBMySQL : public Module
 			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 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) + "', " + stringify(CurBot->created) + ", " + stringify(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(chancount)");
+			this->RunQuery("INSERT 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) + "', '" + ToString(CurBot->ToString()) + "', " + stringify(CurBot->created) + ", " + stringify(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(chancount)");
 		}
 
 		this->RunQuery("TRUNCATE TABLE `anope_extra`");
@@ -1019,7 +792,7 @@ class DBMySQL : public Module
 				}
 				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) + "'");
+					this->RunQuery("UPDATE `anope_ns_core` SET `flags` = '" + ToString(CurBot->ToString()) + "' WHERE `display` = '" + this->Escape(nc->display) + "'");
 				}
 			}
 		}
@@ -1056,7 +829,7 @@ class DBMySQL : public Module
 				}
 				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"))
 				{
-					this->RunQuery("UPDATE `anope_cs_info` SET `flags` = '" + BuildFlagsList(ci) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
+					this->RunQuery("UPDATE `anope_cs_info` SET `flags` = '" + ToString(ci->ToString()) + "' WHERE `name` = '" + this->Escape(ci->name) + "'");
 				}
 			}
 		}
@@ -1076,7 +849,7 @@ class DBMySQL : public Module
 						{