Pretty large coding style cleanup, in source doc

cleanup, and allow protocol mods to depend on each
other

11 files changed, 45 insertions, 38 deletions

diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/extra/webcpanel/pages/chanserv/access.cpp
index a1b8be97f..d21546c3a 100644
--- a/modules/extra/webcpanel/pages/chanserv/access.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/access.cpp
@@ -22,7 +22,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 		return true;
 	}
 
-	ChannelInfo *ci = cs_findchan(chname);
+	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci)
 		return true;
@@ -64,7 +64,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 
 					if (acc->mask == message.post_data["mask"])
 					{
-						if ((!highest || *acc >= *highest) && !u_access.Founder && !has_priv)
+						if ((!highest || *acc >= *highest) && !u_access.founder && !has_priv)
 						{
 							replacements["MESSAGES"] = "Access denied";
 							denied = true;
@@ -85,7 +85,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 					new_acc->creator = na->nc->display;
 					try
 					{
-						new_acc->Unserialize(message.post_data["access"]);
+						new_acc->AccessUnserialize(message.post_data["access"]);
 					}
 					catch (...)
 					{
@@ -98,7 +98,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 						new_acc->last_seen = 0;
 						new_acc->created = Anope::CurTime;
 
-						if ((!highest || *highest <= *new_acc) && !u_access.Founder && !has_priv)
+						if ((!highest || *highest <= *new_acc) && !u_access.founder && !has_priv)
 							delete new_acc;
 						else if (new_acc->Serialize().empty())
 						{
@@ -108,7 +108,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 						else
 						{
 							ci->AddAccess(new_acc);
-							replacements["MESSAGES"] = "Access for " + new_acc->mask + " set to " + new_acc->Serialize();
+							replacements["MESSAGES"] = "Access for " + new_acc->mask + " set to " + new_acc->AccessSerialize();
 						}
 					}
 				}
@@ -123,7 +123,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 		ChanAccess *access = ci->GetAccess(i);
 
 		replacements["MASKS"] = HTTPUtils::Escape(access->mask);
-		replacements["ACCESSES"] = HTTPUtils::Escape(access->Serialize());
+		replacements["ACCESSES"] = HTTPUtils::Escape(access->AccessSerialize());
 		replacements["CREATORS"] = HTTPUtils::Escape(access->creator);
 		replacements["ACCESS_CHANGES"] = ci->AccessFor(na->nc).HasPriv("ACCESS_CHANGE") ? "YES" : "NO";
 	}
diff --git a/modules/extra/webcpanel/pages/chanserv/akick.cpp b/modules/extra/webcpanel/pages/chanserv/akick.cpp
index d5351bfd9..bb678b715 100644
--- a/modules/extra/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/akick.cpp
@@ -22,7 +22,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		return true;
 	}
 
-	ChannelInfo *ci = cs_findchan(chname);
+	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci)
 		return true;
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp
index 4ad551e6a..4a61b37db 100644
--- a/modules/extra/webcpanel/pages/chanserv/set.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/set.cpp
@@ -22,7 +22,7 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 		return true;
 	}
 
-	ChannelInfo *ci = cs_findchan(chname);
+	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci || !ci->AccessFor(na->nc).HasPriv("SET"))
 		return true;
@@ -93,8 +93,8 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 		replacements["FOUNDER"] = ci->GetFounder()->display;
 	if (ci->successor)
 		replacements["SUCCESSOR"] = ci->successor->display;
-	replacements["TIME_REGISTERED"] = do_strftime(ci->time_registered, na->nc);
-	replacements["LAST_USED"] = do_strftime(ci->last_used, na->nc);
+	replacements["TIME_REGISTERED"] = Anope::strftime(ci->time_registered, na->nc);
+	replacements["LAST_USED"] = Anope::strftime(ci->last_used, na->nc);
 
 	if (!ci->last_topic.empty())
 	{
diff --git a/modules/extra/webcpanel/pages/index.cpp b/modules/extra/webcpanel/pages/index.cpp
index c97737c21..6178dab29 100644
--- a/modules/extra/webcpanel/pages/index.cpp
+++ b/modules/extra/webcpanel/pages/index.cpp
@@ -11,9 +11,9 @@ class WebpanelRequest : public IdentifyRequest
 {
 	HTTPReply reply;
 	HTTPMessage message;
-	dynamic_reference<HTTPProvider> server;
+	Reference<HTTPProvider> server;
 	Anope::string page_name;
-	dynamic_reference<HTTPClient> client;
+	Reference<HTTPClient> client;
 	TemplateFileServer::Replacements replacements;
 
  public:
@@ -23,7 +23,7 @@ class WebpanelRequest : public IdentifyRequest
 	{
 		if (!client)
 			return;
-		NickAlias *na = findnick(this->GetAccount());
+		NickAlias *na = NickAlias::Find(this->GetAccount());
 		if (!na)
 		{
 			this->OnFail();
diff --git a/modules/extra/webcpanel/pages/memoserv/memos.cpp b/modules/extra/webcpanel/pages/memoserv/memos.cpp
index 00b913ef0..54c7a1227 100644
--- a/modules/extra/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/extra/webcpanel/pages/memoserv/memos.cpp
@@ -36,7 +36,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 	}
 	else
 	{
-		ci = cs_findchan(chname);
+		ci = ChannelInfo::Find(chname);
 		if (ci)
 		{
 			replacements["MESSAGES"] = "Displaying the memos for " + chname + ".";
@@ -107,7 +107,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 		m = mi->GetMemo(i);
 		replacements["NUMBER"] = stringify(i+1);
 		replacements["SENDER"] = m->sender;
-		replacements["TIME"] = do_strftime(m->time);
+		replacements["TIME"] = Anope::strftime(m->time);
 		replacements["TEXT"] = m->text;
 		if (m->HasFlag(MF_UNREAD))
 			replacements["UNREAD"] = "YES";
diff --git a/modules/extra/webcpanel/pages/nickserv/alist.cpp b/modules/extra/webcpanel/pages/nickserv/alist.cpp
index 2fd184dbb..3b5b8dab0 100644
--- a/modules/extra/webcpanel/pages/nickserv/alist.cpp
+++ b/modules/extra/webcpanel/pages/nickserv/alist.cpp
@@ -39,7 +39,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 		replacements["CHANNELS"] = (ci->HasFlag(CI_NO_EXPIRE) ? "!" : "") + ci->name;
 		Anope::string access_str;
 		for (unsigned i = 0; i < access.size(); ++i)
-			access_str += ", " + access[i]->Serialize();
+			access_str += ", " + access[i]->AccessSerialize();
 		replacements["ACCESSES"] = access_str.substr(2);
 	}
 
diff --git a/modules/extra/webcpanel/pages/nickserv/info.cpp b/modules/extra/webcpanel/pages/nickserv/info.cpp
index 3ec61b03f..cdd80b7cd 100644
--- a/modules/extra/webcpanel/pages/nickserv/info.cpp
+++ b/modules/extra/webcpanel/pages/nickserv/info.cpp
@@ -19,7 +19,7 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 		{
 			if (message.post_data["email"] != na->nc->email)
 			{
-				if (!message.post_data["email"].empty() && !MailValidate(message.post_data["email"]))
+				if (!message.post_data["email"].empty() && !Mail::Validate(message.post_data["email"]))
 					replacements["ERRORS"] = "Invalid email";
 				else
 				{
@@ -83,7 +83,7 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
 	replacements["DISPLAY"] = HTTPUtils::Escape(na->nc->display);
 	if (na->nc->email.empty() == false)
 		replacements["EMAIL"] = HTTPUtils::Escape(na->nc->email);
-	replacements["TIME_REGISTERED"] = do_strftime(na->time_registered, na->nc);
+	replacements["TIME_REGISTERED"] = Anope::strftime(na->time_registered, na->nc);
 	if (na->HasVhost())
 	{
 		if (na->GetVhostIdent().empty() == false)
diff --git a/modules/extra/webcpanel/pages/operserv/akill.cpp b/modules/extra/webcpanel/pages/operserv/akill.cpp
index 3d66b5c6a..112949d9e 100644
--- a/modules/extra/webcpanel/pages/operserv/akill.cpp
+++ b/modules/extra/webcpanel/pages/operserv/akill.cpp
@@ -14,7 +14,7 @@ WebCPanel::OperServ::Akill::Akill(const Anope::string &cat, const Anope::string
 bool WebCPanel::OperServ::Akill::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 
-	static service_reference<XLineManager> akills("XLineManager","xlinemanager/sgline");
+	static ServiceReference<XLineManager> akills("XLineManager","xlinemanager/sgline");
 
 	if (!na->nc->IsServicesOper() && !(na->nc->o && na->nc->o->ot && na->nc->o->ot->HasPriv("operserv/akill")))
 	{
@@ -28,7 +28,7 @@ bool WebCPanel::OperServ::Akill::OnRequest(HTTPProvider *server, const Anope::st
 		if (message.post_data.count("mask") > 0 && message.post_data.count("expiry") > 0 && message.post_data.count("reason") > 0)
 		{
 			std::vector<Anope::string> params;
-			stringstream cmdstr;
+			std::stringstream cmdstr;
 			params.push_back("ADD");
 			cmdstr << "+" << HTTPUtils::URLDecode(message.post_data["expiry"]);
 			cmdstr << " " << HTTPUtils::URLDecode(message.post_data["mask"]);
@@ -49,11 +49,11 @@ bool WebCPanel::OperServ::Akill::OnRequest(HTTPProvider *server, const Anope::st
 		{
 			const XLine *x = akills->GetEntry(i);
 			replacements["NUMBER"] = stringify(i + 1);
-			replacements["HOST"] = x->Mask;
-			replacements["SETTER"] = x->By;
-			replacements["TIME"] = do_strftime(x->Created, NULL, true);
-			replacements["EXPIRE"] = expire_left(na->nc, x->Expires);
-			replacements["REASON"] = x->Reason;
+			replacements["HOST"] = x->mask;
+			replacements["SETTER"] = x->by;
+			replacements["TIME"] = Anope::strftime(x->created, NULL, true);
+			replacements["EXPIRE"] = Anope::Expires(x->expires, na->nc);
+			replacements["REASON"] = x->reason;
 		}
 	}
 
diff --git a/modules/extra/webcpanel/template_fileserver.cpp b/modules/extra/webcpanel/template_fileserver.cpp
index b1881b811..cf7094e39 100644
--- a/modules/extra/webcpanel/template_fileserver.cpp
+++ b/modules/extra/webcpanel/template_fileserver.cpp
@@ -126,7 +126,8 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
 
 			if (content.find("IF ") == 0)
 			{
-				std::vector<Anope::string> tokens = BuildStringVector(content);
+				std::vector<Anope::string> tokens;
+				spacesepstream(content).GetTokens(tokens);
 
 				if (tokens.size() == 4 && tokens[1] == "EQ")
 				{
@@ -163,13 +164,17 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
 			}
 			else if (content.find("FOR ") == 0)
 			{
-				std::vector<Anope::string> tokens = BuildStringVector(content);
+				std::vector<Anope::string> tokens;
+				spacesepstream(content).GetTokens(tokens);
+
 				if (tokens.size() != 4 || tokens[2] != "IN")
 					Log() << "Invalid FOR in web template " << this->file_name;
 				else
 				{
-					std::vector<Anope::string> temp_variables = BuildStringVector(tokens[1], ','),
-						real_variables = BuildStringVector(tokens[3], ',');
+					std::vector<Anope::string> temp_variables, real_variables;
+					commasepstream(tokens[1]).GetTokens(temp_variables);
+					commasepstream(tokens[3]).GetTokens(real_variables);
+
 					if (temp_variables.size() != real_variables.size())
 						Log() << "Invalid FOR in web template " << this->file_name << " variable mismatch";
 					else
@@ -200,7 +205,9 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
 			}
 			else if (content.find("INCLUDE ") == 0)
 			{
-				std::vector<Anope::string> tokens = BuildStringVector(content);
+				std::vector<Anope::string> tokens;
+				spacesepstream(content).GetTokens(tokens);
+
 				if (tokens.size() != 2)
 					Log() << "Invalid INCLUDE in web template " << this->file_name;
 				else
diff --git a/modules/extra/webcpanel/webcpanel.cpp b/modules/extra/webcpanel/webcpanel.cpp
index 77cf606aa..164c4b903 100644
--- a/modules/extra/webcpanel/webcpanel.cpp
+++ b/modules/extra/webcpanel/webcpanel.cpp
@@ -52,11 +52,11 @@ class ModuleWebCPanel : public Module
 		ConfigReader reader;
 		provider_name = reader.ReadValue("webcpanel", "server", "httpd/main", 0);
 		template_name = reader.ReadValue("webcpanel", "template", "template", 0);
-		template_base = db_dir + "/modules/webcpanel/templates/" + template_name;
+		template_base = Anope::DataDir + "/modules/webcpanel/templates/" + template_name;
 		page_title = reader.ReadValue("webcpanel", "title", "Anope IRC Services", 0);
 		use_ssl = reader.ReadFlag("webcpanel", "ssl", "no", 0); // This is dumb, is there a better way to do this?
 
-		service_reference<HTTPProvider> provider("HTTPProvider", provider_name);
+		ServiceReference<HTTPProvider> provider("HTTPProvider", provider_name);
 		if (!provider)
 			throw ModuleException("Unable to find HTTPD provider. Is m_httpd loaded?");
 
@@ -80,7 +80,7 @@ class ModuleWebCPanel : public Module
 			s.subsections.push_back(ss);
 			provider->RegisterPage(&this->nickserv_info);
 
-			if (ircdproto && ircdproto->CanCertFP)
+			if (IRCD && IRCD->CanCertFP)
 			{
 				ss.name = "SSL Certificates";
 				ss.url = "/nickserv/cert";
@@ -160,7 +160,7 @@ class ModuleWebCPanel : public Module
 
 	~ModuleWebCPanel()
 	{
-		service_reference<HTTPProvider> provider("HTTPProvider", provider_name);
+		ServiceReference<HTTPProvider> provider("HTTPProvider", provider_name);
 		if (provider)
 		{
 			provider->UnregisterPage(&this->style_css);
@@ -191,14 +191,14 @@ namespace WebPanel
 {
 	void RunCommand(const Anope::string &user, NickCore *nc, const Anope::string &service, const Anope::string &c, const std::vector<Anope::string> &params, TemplateFileServer::Replacements &r)
 	{
-		service_reference<Command> cmd("Command", c);
+		ServiceReference<Command> cmd("Command", c);
 		if (!cmd)
 		{
 			r["MESSAGES"] = "Unable to find command " + c;
 			return;
 		}
 
-		BotInfo *bi = findbot(service);
+		BotInfo *bi = BotInfo::Find(service);
 		if (!bi)
 		{
 			if (BotListByNick->empty())
diff --git a/modules/extra/webcpanel/webcpanel.h b/modules/extra/webcpanel/webcpanel.h
index 99cb2ec3a..27b8ce67a 100644
--- a/modules/extra/webcpanel/webcpanel.h
+++ b/modules/extra/webcpanel/webcpanel.h
@@ -46,7 +46,7 @@ class Panel : public Section, public Service
 		if (acc.empty() || id.empty())
 			return NULL;
 
-		NickAlias *na = findnick(acc);
+		NickAlias *na = NickAlias::Find(acc);
 		if (na == NULL)
 			return NULL;
 
@@ -83,7 +83,7 @@ class WebPanelProtectedPage : public WebPanelPage
 
 	bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) anope_override anope_final
 	{
-		service_reference<Panel> panel("Panel", "webcpanel");
+		ServiceReference<Panel> panel("Panel", "webcpanel");
 		NickAlias *na;
 
 		if (!panel || !(na = panel->GetNickFromSession(client, message)))