Move HTTP types to the HTTP namespace.

8 files changed, 23 insertions, 23 deletions

diff --git a/modules/webcpanel/pages/chanserv/access.cpp b/modules/webcpanel/pages/chanserv/access.cpp
index 18a265152..f6cfcb130 100644
--- a/modules/webcpanel/pages/chanserv/access.cpp
+++ b/modules/webcpanel/pages/chanserv/access.cpp
@@ -11,7 +11,7 @@ WebCPanel::ChanServ::Access::Access(const Anope::string &cat, const Anope::strin
 {
 }
 
-bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Access::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 	TemplateFileServer Page("chanserv/access.html");
 	const Anope::string &chname = message.get_data["channel"];
@@ -95,7 +95,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 	/* command might have invalidated u_access */
 	u_access = ci->AccessFor(na->nc);
 
-	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 	replacements["ACCESS_CHANGE"] = u_access.HasPriv("ACCESS_CHANGE") ? "YES" : "NO";
 
 	for (unsigned i = 0; i < ci->GetAccessCount(); ++i)
diff --git a/modules/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
index dbb9520be..314ed458f 100644
--- a/modules/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/webcpanel/pages/chanserv/akick.cpp
@@ -11,7 +11,7 @@ WebCPanel::ChanServ::Akick::Akick(const Anope::string &cat, const Anope::string
 {
 }
 
-bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Akick::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 	const Anope::string &chname = message.get_data["channel"];
 	TemplateFileServer Page("chanserv/akick.html");
@@ -66,7 +66,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		WebPanel::RunCommand(client, na->nc->display, na->nc, "ChanServ", "chanserv/akick", params, replacements);
 	}
 
-	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 
 	for (unsigned i = 0; i < ci->GetAkickCount(); ++i)
 	{
diff --git a/modules/webcpanel/pages/chanserv/chanserv.h b/modules/webcpanel/pages/chanserv/chanserv.h
index 6740880af..c72edafaa 100644
--- a/modules/webcpanel/pages/chanserv/chanserv.h
+++ b/modules/webcpanel/pages/chanserv/chanserv.h
@@ -24,7 +24,7 @@ class WebCPanel::ChanServ::Access final
 {
 public:
 	Access(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 	std::set<Anope::string> GetData() override;
 };
 
@@ -33,7 +33,7 @@ class WebCPanel::ChanServ::Akick final
 {
 public:
 	Akick(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 	std::set<Anope::string> GetData() override;
 };
 
@@ -42,7 +42,7 @@ class WebCPanel::ChanServ::Drop final
 {
 public:
 	Drop(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 };
 
 class WebCPanel::ChanServ::Info final
@@ -50,7 +50,7 @@ class WebCPanel::ChanServ::Info final
 {
 public:
 	Info(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 };
 
 class WebCPanel::ChanServ::Modes final
@@ -58,7 +58,7 @@ class WebCPanel::ChanServ::Modes final
 {
 public:
 	Modes(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 	std::set<Anope::string> GetData() override;
 };
 
@@ -67,6 +67,6 @@ class WebCPanel::ChanServ::Set final
 {
 public:
 	Set(const Anope::string &cat, const Anope::string &u);
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	bool OnRequest(HTTP::Provider *, const Anope::string &, HTTP::Client *, HTTP::Message &, HTTP::Reply &, NickAlias *, TemplateFileServer::Replacements &) override;
 	std::set<Anope::string> GetData() override;
 };
diff --git a/modules/webcpanel/pages/chanserv/drop.cpp b/modules/webcpanel/pages/chanserv/drop.cpp
index 877054bae..b51dfc441 100644
--- a/modules/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/webcpanel/pages/chanserv/drop.cpp
@@ -12,7 +12,7 @@ WebCPanel::ChanServ::Drop::Drop(const Anope::string &cat, const Anope::string &u
 }
 
 
-bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Drop::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 
 	if (message.post_data.count("channel") > 0 && message.post_data.count("confChan") > 0)
@@ -20,7 +20,7 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 		if (message.post_data["channel"] == message.post_data["confChan"])
 		{
 			std::vector<Anope::string> params;
-			const Anope::string &channel = HTTPUtils::URLDecode(message.post_data["channel"]);
+			const Anope::string &channel = HTTP::URLDecode(message.post_data["channel"]);
 			params.push_back(channel);
 			params.push_back(channel);
 
@@ -37,7 +37,7 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 		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);
+			replacements["ESCAPED_CHANNEL_NAMES"] = HTTP::URLEncode(ci->name);
 		}
 	}
 
@@ -46,7 +46,7 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 		const Anope::string &chname = message.get_data["channel"];
 
 		replacements["CHANNEL_DROP"] = chname;
-		replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+		replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 	}
 
 	TemplateFileServer page("chanserv/drop.html");
diff --git a/modules/webcpanel/pages/chanserv/info.cpp b/modules/webcpanel/pages/chanserv/info.cpp
index 75729a7d6..bd8c0cf01 100644
--- a/modules/webcpanel/pages/chanserv/info.cpp
+++ b/modules/webcpanel/pages/chanserv/info.cpp
@@ -11,12 +11,12 @@ WebCPanel::ChanServ::Info::Info(const Anope::string &cat, const Anope::string &u
 {
 }
 
-bool WebCPanel::ChanServ::Info::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Info::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 	const Anope::string &chname = message.get_data["channel"];
 
 	if (!chname.empty())
-		replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+		replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 
 	BuildChanList(na, replacements);
 
diff --git a/modules/webcpanel/pages/chanserv/modes.cpp b/modules/webcpanel/pages/chanserv/modes.cpp
index 32510f39f..b33894ee8 100644
--- a/modules/webcpanel/pages/chanserv/modes.cpp
+++ b/modules/webcpanel/pages/chanserv/modes.cpp
@@ -11,7 +11,7 @@ WebCPanel::ChanServ::Modes::Modes(const Anope::string &cat, const Anope::string
 {
 }
 
-bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Modes::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 	const Anope::string &chname = message.get_data["channel"];
 	const Anope::string &mode = message.get_data["m"];
@@ -25,7 +25,7 @@ bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::st
 		return true;
 	}
 
-	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci)
@@ -67,7 +67,7 @@ bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::st
 		Page.Serve(server, page_name, client, message, reply, replacements);
 		return true;
 	}
-	replacements["ESCAPED_MODE"] = HTTPUtils::URLEncode(mode);
+	replacements["ESCAPED_MODE"] = HTTP::URLEncode(mode);
 
 	ChannelMode *cm = ModeManager::FindChannelModeByChar(mode[0]);
 	if (cm)
diff --git a/modules/webcpanel/pages/chanserv/set.cpp b/modules/webcpanel/pages/chanserv/set.cpp
index c7163a605..39071fafc 100644
--- a/modules/webcpanel/pages/chanserv/set.cpp
+++ b/modules/webcpanel/pages/chanserv/set.cpp
@@ -11,7 +11,7 @@ WebCPanel::ChanServ::Set::Set(const Anope::string &cat, const Anope::string &u)
 {
 }
 
-bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::ChanServ::Set::OnRequest(HTTP::Provider *server, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
 	const Anope::string &chname = message.get_data["channel"];
 	bool can_set = false;
@@ -94,14 +94,14 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 	}
 
 	replacements["CHANNEL"] = ci->name;
-	replacements["CHANNEL_ESCAPED"] = HTTPUtils::URLEncode(ci->name);
+	replacements["CHANNEL_ESCAPED"] = HTTP::URLEncode(ci->name);
 	if (ci->GetFounder())
 		replacements["FOUNDER"] = ci->GetFounder()->display;
 	if (ci->GetSuccessor())
 		replacements["SUCCESSOR"] = ci->GetSuccessor()->display;
 	replacements["REGISTERED"] = Anope::strftime(ci->registered, na->nc);
 	replacements["LAST_USED"] = Anope::strftime(ci->last_used, na->nc);
-	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ESCAPED_CHANNEL"] = HTTP::URLEncode(chname);
 
 	if (!ci->last_topic.empty())
 	{
diff --git a/modules/webcpanel/pages/chanserv/utils.cpp b/modules/webcpanel/pages/chanserv/utils.cpp
index bf46667b3..710a9d216 100644
--- a/modules/webcpanel/pages/chanserv/utils.cpp
+++ b/modules/webcpanel/pages/chanserv/utils.cpp
@@ -27,7 +27,7 @@ void BuildChanList(NickAlias *na, TemplateFileServer::Replacements &replacements
 			continue;
 
 		replacements["CHANNEL_NAMES"] = ci->name;
-		replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
+		replacements["ESCAPED_CHANNEL_NAMES"] = HTTP::URLEncode(ci->name);
 	}
 }