Merge usefulness of Flags and Extensible classes into Extensible, made most flags we have juse strings instead of defines/enums

5 files changed, 70 insertions, 74 deletions

diff --git a/modules/extra/webcpanel/pages/chanserv/drop.cpp b/modules/extra/webcpanel/pages/chanserv/drop.cpp
index 824b1e58b..0ebb8e7a1 100644
--- a/modules/extra/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/drop.cpp
@@ -29,16 +29,16 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 	for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
 	{
 		ChannelInfo *ci = it->second;
-		if ((ci->HasFlag(CI_SECUREFOUNDER) ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop")))
+		if ((ci->HasExt("SECUREFOUNDER") ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop")))
 		{
 			replacements["CHANNEL_NAMES"] = ci->name;
 			replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
 		}
 	}
 
-	if (message.get_data.count("channel") > 0) {
+	if (message.get_data.count("channel") > 0)
 		replacements["CHANNEL_DROP"] = message.get_data["channel"];
-	}
+
 	TemplateFileServer page("chanserv/drop.html");
 	page.Serve(server, page_name, client, message, reply, replacements);
 	return true;
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp
index 9cee680eb..af3640e33 100644
--- a/modules/extra/webcpanel/pages/chanserv/set.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/set.cpp
@@ -29,60 +29,60 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 
 	if (message.post_data.empty() == false)
 	{
-		if (ci->HasFlag(CI_KEEPTOPIC) != message.post_data.count("keeptopic"))
+		if (ci->HasExt("KEEPTOPIC") != message.post_data.count("keeptopic"))
 		{
-			if (!ci->HasFlag(CI_KEEPTOPIC))
-				ci->SetFlag(CI_KEEPTOPIC);
+			if (!ci->HasExt("KEEPTOPIC"))
+				ci->ExtendMetadata("KEEPTOPIC");
 			else
-				ci->UnsetFlag(CI_KEEPTOPIC);
+				ci->Shrink("KEEPTOPIC");
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (ci->HasFlag(CI_PEACE) != message.post_data.count("peace"))
+		if (ci->HasExt("PEACE") != message.post_data.count("peace"))
 		{
-			if (!ci->HasFlag(CI_PEACE))
-				ci->SetFlag(CI_PEACE);
+			if (!ci->HasExt("PEACE"))
+				ci->ExtendMetadata("PEACE");
 			else
-				ci->UnsetFlag(CI_PEACE);
+				ci->Shrink("PEACE");
 			replacements["MESSAGES"] = "Peace updated";
 		}
-		if (ci->HasFlag(CI_PRIVATE) != message.post_data.count("private"))
+		if (ci->HasExt("PRIVATE") != message.post_data.count("private"))
 		{
-			if (!ci->HasFlag(CI_PRIVATE))
-				ci->SetFlag(CI_PRIVATE);
+			if (!ci->HasExt("PRIVATE"))
+				ci->ExtendMetadata("PRIVATE");
 			else
-				ci->UnsetFlag(CI_PRIVATE);
+				ci->Shrink("PRIVATE");
 			replacements["MESSAGES"] = "Private updated";
 		}
-		if (ci->HasFlag(CI_RESTRICTED) != message.post_data.count("restricted"))
+		if (ci->HasExt("RESTRICTED") != message.post_data.count("restricted"))
 		{
-			if (!ci->HasFlag(CI_RESTRICTED))
-				ci->SetFlag(CI_RESTRICTED);
+			if (!ci->HasExt("RESTRICTED"))
+				ci->ExtendMetadata("RESTRICTED");
 			else
-				ci->UnsetFlag(CI_RESTRICTED);
+				ci->Shrink("RESTRICTED");
 			replacements["MESSAGES"] = "Restricted updated";
 		}
-		if (ci->HasFlag(CI_SECURE) != message.post_data.count("secure"))
+		if (ci->HasExt("SECURE") != message.post_data.count("secure"))
 		{
-			if (!ci->HasFlag(CI_SECURE))
-				ci->SetFlag(CI_SECURE);
+			if (!ci->HasExt("SECURE"))
+				ci->ExtendMetadata("SECURE");
 			else
-				ci->UnsetFlag(CI_SECURE);
+				ci->Shrink("SECURE");
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (ci->HasFlag(CI_SECUREOPS) != message.post_data.count("secureops"))
+		if (ci->HasExt("SECUREOPS") != message.post_data.count("secureops"))
 		{
-			if (!ci->HasFlag(CI_SECUREOPS))
-				ci->SetFlag(CI_SECUREOPS);
+			if (!ci->HasExt("SECUREOPS"))
+				ci->ExtendMetadata("SECUREOPS");
 			else
-				ci->UnsetFlag(CI_SECUREOPS);
+				ci->Shrink("SECUREOPS");
 			replacements["MESSAGES"] = "Secureops updated";
 		}
-		if (ci->HasFlag(CI_TOPICLOCK) != message.post_data.count("topiclock"))
+		if (ci->HasExt("TOPICLOCK") != message.post_data.count("topiclock"))
 		{
-			if (!ci->HasFlag(CI_TOPICLOCK))
-				ci->SetFlag(CI_TOPICLOCK);
+			if (!ci->HasExt("TOPICLOCK"))
+				ci->ExtendMetadata("TOPICLOCK");
 			else
-				ci->UnsetFlag(CI_TOPICLOCK);
+				ci->Shrink("TOPICLOCK");
 			replacements["MESSAGES"] = "Topiclock updated";
 		}
 	}
@@ -102,25 +102,25 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 		replacements["LAST_TOPIC_SETTER"] = HTTPUtils::Escape(ci->last_topic_setter);
 	}
 
-	if (ci->HasFlag(CI_KEEPTOPIC))
+	if (ci->HasExt("KEEPTOPIC"))
 		replacements["KEEPTOPIC"];
 	
-	if (ci->HasFlag(CI_PEACE))
+	if (ci->HasExt("PEACE"))
 		replacements["PEACE"];
 	
-	if (ci->HasFlag(CI_PRIVATE))
+	if (ci->HasExt("PRIVATE"))
 		replacements["PRIVATE"];
 
-	if (ci->HasFlag(CI_RESTRICTED))
+	if (ci->HasExt("RESTRICTED"))
 		replacements["RESTRICTED"];
 	
-	if (ci->HasFlag(CI_SECURE))
+	if (ci->HasExt("SECURE"))
 		replacements["SECURE"];
 	
-	if (ci->HasFlag(CI_SECUREOPS))
+	if (ci->HasExt("SECUREOPS"))
 		replacements["SECUREOPS"];
 	
-	if (ci->HasFlag(CI_TOPICLOCK))
+	if (ci->HasExt("TOPICLOCK"))
 		replacements["TOPICLOCK"];
 
 	TemplateFileServer page("chanserv/set.html");
diff --git a/modules/extra/webcpanel/pages/memoserv/memos.cpp b/modules/extra/webcpanel/pages/memoserv/memos.cpp
index 7d0dfcecb..9fa36d3c4 100644
--- a/modules/extra/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/extra/webcpanel/pages/memoserv/memos.cpp
@@ -93,13 +93,9 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 		}
 
 		if (!error && message.get_data["read"] == "1")
-		{
-			m->UnsetFlag(MF_UNREAD);
-		}
+			m->unread = false;
 		else if (!error && message.get_data["read"] == "2")
-		{
-			m->SetFlag(MF_UNREAD);
-		}
+			m->unread = true;
 	}
 
 	for (unsigned i = 0; i < mi->memos->size(); ++i)
@@ -109,7 +105,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 		replacements["SENDER"] = m->sender;
 		replacements["TIME"] = Anope::strftime(m->time);
 		replacements["TEXT"] = m->text;
-		if (m->HasFlag(MF_UNREAD))
+		if (m->unread)
 			replacements["UNREAD"] = "YES";
 		else
 			replacements["UNREAD"] = "NO";
diff --git a/modules/extra/webcpanel/pages/nickserv/alist.cpp b/modules/extra/webcpanel/pages/nickserv/alist.cpp
index e3fe59ff1..0afe2a4f3 100644
--- a/modules/extra/webcpanel/pages/nickserv/alist.cpp
+++ b/modules/extra/webcpanel/pages/nickserv/alist.cpp
@@ -24,7 +24,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 			++chan_count;
 
 			replacements["NUMBERS"] = stringify(chan_count);
-			replacements["CHANNELS"] = (ci->HasFlag(CI_NO_EXPIRE) ? "!" : "") + ci->name;
+			replacements["CHANNELS"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name;
 			replacements["ACCESSES"] = "Founder";
 			continue;
 		}
@@ -36,7 +36,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 		++chan_count;
 
 		replacements["NUMBERS"] = stringify(chan_count);
-		replacements["CHANNELS"] = (ci->HasFlag(CI_NO_EXPIRE) ? "!" : "") + ci->name;
+		replacements["CHANNELS"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name;
 		Anope::string access_str;
 		for (unsigned i = 0; i < access.size(); ++i)
 			access_str += ", " + access[i]->AccessSerialize();
diff --git a/modules/extra/webcpanel/pages/nickserv/info.cpp b/modules/extra/webcpanel/pages/nickserv/info.cpp
index e83768387..35a4a8a0a 100644
--- a/modules/extra/webcpanel/pages/nickserv/info.cpp
+++ b/modules/extra/webcpanel/pages/nickserv/info.cpp
@@ -36,46 +36,46 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 				replacements["MESSAGES"] = "Greet updated";
 			}
 		}
-		if (na->nc->HasFlag(NI_AUTOOP) != message.post_data.count("autoop"))
+		if (na->nc->HasExt("AUTOOP") != message.post_data.count("autoop"))
 		{
-			if (!na->nc->HasFlag(NI_AUTOOP))
-				na->nc->SetFlag(NI_AUTOOP);
+			if (!na->nc->HasExt("AUTOOP"))
+				na->nc->ExtendMetadata("AUTOOP");
 			else
-				na->nc->UnsetFlag(NI_AUTOOP);
+				na->nc->Shrink("AUTOOP");
 			replacements["MESSAGES"] = "Autoop updated";
 		}
-		if (na->nc->HasFlag(NI_PRIVATE) != message.post_data.count("private"))
+		if (na->nc->HasExt("PRIVATE") != message.post_data.count("private"))
 		{
-			if (!na->nc->HasFlag(NI_PRIVATE))
-				na->nc->SetFlag(NI_PRIVATE);
+			if (!na->nc->HasExt("PRIVATE"))
+				na->nc->ExtendMetadata("PRIVATE");
 			else
-				na->nc->UnsetFlag(NI_PRIVATE);
+				na->nc->Shrink("PRIVATE");
 			replacements["MESSAGES"] = "Private updated";
 		}
-		if (na->nc->HasFlag(NI_SECURE) != message.post_data.count("secure"))
+		if (na->nc->HasExt("SECURE") != message.post_data.count("secure"))
 		{
-			if (!na->nc->HasFlag(NI_SECURE))
-				na->nc->SetFlag(NI_SECURE);
+			if (!na->nc->HasExt("SECURE"))
+				na->nc->ExtendMetadata("SECURE");
 			else
-				na->nc->UnsetFlag(NI_SECURE);
+				na->nc->Shrink("SECURE");
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (message.post_data["kill"] == "on" && !na->nc->HasFlag(NI_KILLPROTECT))
+		if (message.post_data["kill"] == "on" && !na->nc->HasExt("KILLPROTECT"))
 		{
-			na->nc->SetFlag(NI_KILLPROTECT);
-			na->nc->UnsetFlag(NI_KILL_QUICK);
+			na->nc->ExtendMetadata("KILLPROTECT");
+			na->nc->Shrink("KILL_QUICK");
 			replacements["MESSAGES"] = "Kill updated";
 		}
-		else if (message.post_data["kill"] == "quick" && !na->nc->HasFlag(NI_KILL_QUICK))
+		else if (message.post_data["kill"] == "quick" && !na->nc->HasExt("KILL_QUICK"))
 		{
-			na->nc->UnsetFlag(NI_KILLPROTECT);
-			na->nc->SetFlag(NI_KILL_QUICK);
+			na->nc->Shrink("KILLPROTECT");
+			na->nc->ExtendMetadata("KILL_QUICK");
 			replacements["MESSAGES"] = "Kill updated";
 		}
-		else if (message.post_data["kill"] == "off" && (na->nc->HasFlag(NI_KILLPROTECT) || na->nc->HasFlag(NI_KILL_QUICK)))
+		else if (message.post_data["kill"] == "off" && (na->nc->HasExt("KILLPROTECT") || na->nc->HasExt("KILL_QUICK")))
 		{
-			na->nc->UnsetFlag(NI_KILLPROTECT);
-			na->nc->UnsetFlag(NI_KILL_QUICK);
+			na->nc->Shrink("KILLPROTECT");
+			na->nc->Shrink("KILL_QUICK");
 			replacements["MESSAGES"] = "Kill updated";
 		}
 	}
@@ -92,17 +92,17 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 			replacements["VHOST"] = na->GetVhostHost();
 	}
 	replacements["GREET"] = HTTPUtils::Escape(na->nc->greet);
-	if (na->nc->HasFlag(NI_AUTOOP))
+	if (na->nc->HasExt("AUTOOP"))
 		replacements["AUTOOP"];
-	if (na->nc->HasFlag(NI_PRIVATE))
+	if (na->nc->HasExt("PRIVATE"))
 		replacements["PRIVATE"];
-	if (na->nc->HasFlag(NI_SECURE))
+	if (na->nc->HasExt("SECURE"))
 		replacements["SECURE"];
-	if (na->nc->HasFlag(NI_KILLPROTECT))
+	if (na->nc->HasExt("KILLPROTECT"))
 		replacements["KILL_ON"];
-	if (na->nc->HasFlag(NI_KILL_QUICK))
+	if (na->nc->HasExt("KILL_QUICK"))
 		replacements["KILL_QUICK"];
-	if (!na->nc->HasFlag(NI_KILLPROTECT) && !na->nc->HasFlag(NI_KILL_QUICK))
+	if (!na->nc->HasExt("KILLPROTECT") && !na->nc->HasExt("KILL_QUICK"))
 		replacements["KILL_OFF"];
 	
 	TemplateFileServer page("nickserv/info.html");