Rename most ext fields names to be consistent with everything else, add accessors for many

4 files changed, 49 insertions, 83 deletions

diff --git a/modules/webcpanel/pages/chanserv/drop.cpp b/modules/webcpanel/pages/chanserv/drop.cpp
index 64ee9b9f8..411aa92c4 100644
--- a/modules/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/webcpanel/pages/chanserv/drop.cpp
@@ -44,7 +44,7 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 	}
 
 	for (::ChanServ::Channel *ci : na->GetAccount()->GetRefs<::ChanServ::Channel *>())
-		if ((ci->HasFieldS("SECUREFOUNDER") ? ci->AccessFor(na->GetAccount()).founder : ci->AccessFor(na->GetAccount()).HasPriv("FOUNDER")) || (na->GetAccount()->GetOper() && na->GetAccount()->GetOper()->HasCommand("chanserv/drop")))
+		if ((ci->IsSecureFounder() ? ci->AccessFor(na->GetAccount()).founder : ci->AccessFor(na->GetAccount()).HasPriv("FOUNDER")) || (na->GetAccount()->GetOper() && na->GetAccount()->GetOper()->HasCommand("chanserv/drop")))
 		{
 			replacements["CHANNEL_NAMES"] = ci->GetName();
 			replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->GetName());
diff --git a/modules/webcpanel/pages/chanserv/set.cpp b/modules/webcpanel/pages/chanserv/set.cpp
index d3cca72cc..e33d52a60 100644
--- a/modules/webcpanel/pages/chanserv/set.cpp
+++ b/modules/webcpanel/pages/chanserv/set.cpp
@@ -56,60 +56,39 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 
 	if (can_set && message.post_data.empty() == false)
 	{
-		if (ci->HasFieldS("KEEPTOPIC") != message.post_data.count("keeptopic"))
+		if (ci->IsKeepTopic() != message.post_data.count("keeptopic"))
 		{
-			if (!ci->HasFieldS("KEEPTOPIC"))
-				ci->SetS<bool>("KEEPTOPIC", true);
-			else
-				ci->UnsetS<bool>("KEEPTOPIC");
+			ci->SetKeepTopic(!ci->IsKeepTopic());
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (ci->HasFieldS("PEACE") != message.post_data.count("peace"))
+		if (ci->IsPeace() != message.post_data.count("peace"))
 		{
-			if (!ci->HasFieldS("PEACE"))
-				ci->SetS<bool>("PEACE", true);
-			else
-				ci->UnsetS<bool>("PEACE");
+			ci->SetPeace(!ci->IsPeace());
 			replacements["MESSAGES"] = "Peace updated";
 		}
-		if (ci->HasFieldS("CS_PRIVATE") != message.post_data.count("private"))
+		if (ci->IsPrivate() != message.post_data.count("private"))
 		{
-			if (!ci->HasFieldS("CS_PRIVATE"))
-				ci->SetS<bool>("CS_PRIVATE", true);
-			else
-				ci->UnsetS<bool>("CS_PRIVATE");
+			ci->SetPrivate(!ci->IsPrivate());
 			replacements["MESSAGES"] = "Private updated";
 		}
-		if (ci->HasFieldS("RESTRICTED") != message.post_data.count("restricted"))
+		if (ci->IsRestricted() != message.post_data.count("restricted"))
 		{
-			if (!ci->HasFieldS("RESTRICTED"))
-				ci->SetS<bool>("RESTRICTED", true);
-			else
-				ci->UnsetS<bool>("RESTRICTED");
+			ci->SetRestricted(!ci->IsRestricted());
 			replacements["MESSAGES"] = "Restricted updated";
 		}
-		if (ci->HasFieldS("CS_SECURE") != message.post_data.count("secure"))
+		if (ci->IsSecure() != message.post_data.count("secure"))
 		{
-			if (!ci->HasFieldS("CS_SECURE"))
-				ci->SetS<bool>("CS_SECURE", true);
-			else
-				ci->UnsetS<bool>("CS_SECURE");
+			ci->SetSecure(!ci->IsSecure());
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (ci->HasFieldS("SECUREOPS") != message.post_data.count("secureops"))
+		if (ci->IsSecureOps() != message.post_data.count("secureops"))
 		{
-			if (!ci->HasFieldS("SECUREOPS"))
-				ci->SetS<bool>("SECUREOPS", true);
-			else
-				ci->UnsetS<bool>("SECUREOPS");
+			ci->SetSecureOps(!ci->IsSecureOps());
 			replacements["MESSAGES"] = "Secureops updated";
 		}
-		if (ci->HasFieldS("TOPICLOCK") != message.post_data.count("topiclock"))
+		if (ci->IsTopicLock() != message.post_data.count("topiclock"))
 		{
-			if (!ci->HasFieldS("TOPICLOCK"))
-				ci->SetS<bool>("TOPICLOCK", true);
-			else
-				ci->UnsetS<bool>("TOPICLOCK");
+			ci->SetTopicLock(!ci->IsTopicLock());
 			replacements["MESSAGES"] = "Topiclock updated";
 		}
 	}
@@ -132,25 +111,25 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 
 	if (can_set)
 	{
-		if (ci->HasFieldS("KEEPTOPIC"))
+		if (ci->IsKeepTopic())
 			replacements["KEEPTOPIC"];
 
-		if (ci->HasFieldS("PEACE"))
+		if (ci->IsPeace())
 			replacements["PEACE"];
 
-		if (ci->HasFieldS("CS_PRIVATE"))
+		if (ci->IsPrivate())
 			replacements["PRIVATE"];
 
-		if (ci->HasFieldS("RESTRICTED"))
+		if (ci->IsRestricted())
 			replacements["RESTRICTED"];
 
-		if (ci->HasFieldS("CS_SECURE"))
+		if (ci->IsSecure())
 			replacements["SECURE"];
 
-		if (ci->HasFieldS("SECUREOPS"))
+		if (ci->IsSecureOps())
 			replacements["SECUREOPS"];
 
-		if (ci->HasFieldS("TOPICLOCK"))
+		if (ci->IsTopicLock())
 			replacements["TOPICLOCK"];
 	}
 
diff --git a/modules/webcpanel/pages/nickserv/alist.cpp b/modules/webcpanel/pages/nickserv/alist.cpp
index f950cf63a..dd5c536f9 100644
--- a/modules/webcpanel/pages/nickserv/alist.cpp
+++ b/modules/webcpanel/pages/nickserv/alist.cpp
@@ -42,7 +42,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 			++chan_count;
 
 			replacements["NUMBERS"] = stringify(chan_count);
-			replacements["CHANNELS"] = (ci->HasFieldS("CS_NO_EXPIRE") ? "!" : "") + ci->GetName();
+			replacements["CHANNELS"] = (ci->IsNoExpire() ? "!" : "") + ci->GetName();
 			replacements["ACCESSES"] = "Founder";
 			continue;
 		}
@@ -54,7 +54,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 		++chan_count;
 
 		replacements["NUMBERS"] = stringify(chan_count);
-		replacements["CHANNELS"] = (ci->HasFieldS("CS_NO_EXPIRE") ? "!" : "") + ci->GetName();
+		replacements["CHANNELS"] = (ci->IsNoExpire() ? "!" : "") + ci->GetName();
 		Anope::string access_str;
 		for (unsigned i = 0; i < access.size(); ++i)
 			access_str += ", " + access[i]->AccessSerialize();
diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp
index 5dc9eed03..bf901aa83 100644
--- a/modules/webcpanel/pages/nickserv/info.cpp
+++ b/modules/webcpanel/pages/nickserv/info.cpp
@@ -42,56 +42,43 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 		}
 		if (message.post_data.count("greet") > 0)
 		{
-			Anope::string *greet = na->GetAccount()->GetExt<Anope::string>("greet");
 			const Anope::string &post_greet = HTTPUtils::URLDecode(message.post_data["greet"].replace_all_cs("+", " "));
 
-			if (post_greet.empty())
-				na->GetAccount()->Shrink<Anope::string>("greet");
-			else if (!greet || post_greet != *greet)
-				na->GetAccount()->Extend<Anope::string>("greet", post_greet);
+			na->GetAccount()->SetGreet(post_greet);
 
 			replacements["MESSAGES"] = "Greet updated";
 		}
-		if (na->GetAccount()->HasFieldS("AUTOOP") != message.post_data.count("autoop"))
+		if (na->GetAccount()->IsAutoOp() != message.post_data.count("autoop"))
 		{
-			if (!na->GetAccount()->HasFieldS("AUTOOP"))
-				na->GetAccount()->SetS<bool>("AUTOOP", true);
-			else
-				na->GetAccount()->UnsetS<bool>("AUTOOP");
+			na->GetAccount()->SetAutoOp(!na->GetAccount()->IsAutoOp());
 			replacements["MESSAGES"] = "Autoop updated";
 		}
-		if (na->GetAccount()->HasFieldS("NS_PRIVATE") != message.post_data.count("private"))
+		if (na->GetAccount()->IsPrivate() != message.post_data.count("private"))
 		{
-			if (!na->GetAccount()->HasFieldS("NS_PRIVATE"))
-				na->GetAccount()->SetS<bool>("NS_PRIVATE", true);
-			else
-				na->GetAccount()->UnsetS<bool>("NS_PRIVATE");
+			na->GetAccount()->SetPrivate(!na->GetAccount()->IsPrivate());
 			replacements["MESSAGES"] = "Private updated";
 		}
-		if (na->GetAccount()->HasFieldS("NS_SECURE") != message.post_data.count("secure"))
+		if (na->GetAccount()->IsSecure() != message.post_data.count("secure"))
 		{
-			if (!na->GetAccount()->HasFieldS("NS_SECURE"))
-				na->GetAccount()->SetS<bool>("NS_SECURE", true);
-			else
-				na->GetAccount()->UnsetS<bool>("NS_SECURE");
+			na->GetAccount()->SetSecure(!na->GetAccount()->IsSecure());
 			replacements["MESSAGES"] = "Secure updated";
 		}
-		if (message.post_data["kill"] == "on" && !na->GetAccount()->HasFieldS("KILLPROTECT"))
+		if (message.post_data["kill"] == "on" && !na->GetAccount()->IsKillProtect())
 		{
-			na->GetAccount()->SetS<bool>("KILLPROTECT", true);
-			na->GetAccount()->UnsetS<bool>("KILL_QUICK");
+			na->GetAccount()->SetKillProtect(true);
+			na->GetAccount()->SetKillQuick(false);
 			replacements["MESSAGES"] = "Kill updated";
 		}
-		else if (message.post_data["kill"] == "quick" && !na->GetAccount()->HasFieldS("KILL_QUICK"))
+		else if (message.post_data["kill"] == "quick" && !na->GetAccount()->IsKillQuick())
 		{
-			na->GetAccount()->UnsetS<bool>("KILLPROTECT");
-			na->GetAccount()->SetS<bool>("KILL_QUICK", true);
+			na->GetAccount()->SetKillProtect(false);
+			na->GetAccount()->SetKillQuick(true);
 			replacements["MESSAGES"] = "Kill updated";
 		}
-		else if (message.post_data["kill"] == "off" && (na->GetAccount()->HasFieldS("KILLPROTECT") || na->GetAccount()->HasFieldS("KILL_QUICK")))
+		else if (message.post_data["kill"] == "off" && (na->GetAccount()->IsKillProtect() || na->GetAccount()->IsKillQuick()))
 		{
-			na->GetAccount()->UnsetS<bool>("KILLPROTECT");
-			na->GetAccount()->UnsetS<bool>("KILL_QUICK");
+			na->GetAccount()->SetKillProtect(false);
+			na->GetAccount()->SetKillQuick(false);
 			replacements["MESSAGES"] = "Kill updated";
 		}
 	}
@@ -107,20 +94,20 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 		replacements["VHOST"] = vhost->Mask();
 	}
 
-	Anope::string *greet = na->GetAccount()->GetExt<Anope::string>("greet");
-	if (greet)
-		replacements["GREET"] = HTTPUtils::Escape(*greet);
-	if (na->GetAccount()->HasFieldS("AUTOOP"))
+	Anope::string greet = na->GetAccount()->GetGreet();
+	if (greet.empty() == false)
+		replacements["GREET"] = HTTPUtils::Escape(greet);
+	if (na->GetAccount()->IsAutoOp())
 		replacements["AUTOOP"];
-	if (na->GetAccount()->HasFieldS("NS_PRIVATE"))
+	if (na->GetAccount()->IsPrivate())
 		replacements["PRIVATE"];
-	if (na->GetAccount()->HasFieldS("NS_SECURE"))
+	if (na->GetAccount()->IsSecure())
 		replacements["SECURE"];
-	if (na->GetAccount()->HasFieldS("KILLPROTECT"))
+	if (na->GetAccount()->IsKillProtect())
 		replacements["KILL_ON"];
-	if (na->GetAccount()->HasFieldS("KILL_QUICK"))
+	if (na->GetAccount()->IsKillQuick())
 		replacements["KILL_QUICK"];
-	if (!na->GetAccount()->HasFieldS("KILLPROTECT") && !na->GetAccount()->HasFieldS("KILL_QUICK"))
+	if (!na->GetAccount()->IsKillProtect() && !na->GetAccount()->IsKillQuick())
 		replacements["KILL_OFF"];
 
 	TemplateFileServer page("nickserv/info.html");