updated the chanserv section in webcpanel

9 files changed, 256 insertions, 64 deletions

diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/extra/webcpanel/pages/chanserv/access.cpp
index 06b363b53..ce36ecae9 100644
--- a/modules/extra/webcpanel/pages/chanserv/access.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/access.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "../../webcpanel.h"
+#include "utils.h"
 
 WebCPanel::ChanServ::Access::Access(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
@@ -15,23 +16,30 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 {
 	const Anope::string &chname = message.get_data["channel"];
 
+	BuildChanlist(page_name, na, replacements);
+
 	if (chname.empty())
 	{
-		reply.error = HTTP_FOUND;
-		reply.headers["Location"] = Anope::string("http") + (server->IsSSL() ? "s" : "") + "://" + message.headers["Host"] + "/chanserv/info";
-		return true;
+		replacements["STOP"];
+		return ServePage("chanserv/access.html", server, page_name, client, message, reply, replacements);
 	}
 
 	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci)
-		return true;
+	{
+		replacements["STOP"];
+		replacements["MESSAGES"] = "Channel not registered.";
+		return ServePage("chanserv/access.html", server, page_name, client, message, reply, replacements);
+	}
 
 	AccessGroup u_access = ci->AccessFor(na->nc);
 	bool has_priv = na->nc->IsServicesOper() && na->nc->o->ot->HasPriv("chanserv/access/modify");
 
 	if (!u_access.HasPriv("ACCESS_LIST") && !has_priv)
-		return true;
+	{	replacements["STOP"];
+		replacements["MESSAGES"] = "Access denied.";
+	}
 
 	const ChanAccess *highest = u_access.Highest();
 	
@@ -119,6 +127,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 	}
 
 	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ACCESS_CHANGE"] = ci->AccessFor(na->nc).HasPriv("ACCESS_CHANGE") ? "YES" : "NO";
 
 	for (unsigned i = 0; i < ci->GetAccessCount(); ++i)
 	{
@@ -127,7 +136,6 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 		replacements["MASKS"] = HTTPUtils::Escape(access->mask);
 		replacements["ACCESSES"] = HTTPUtils::Escape(access->AccessSerialize());
 		replacements["CREATORS"] = HTTPUtils::Escape(access->creator);
-		replacements["ACCESS_CHANGES"] = ci->AccessFor(na->nc).HasPriv("ACCESS_CHANGE") ? "YES" : "NO";
 	}
 
 	for (std::list<AccessProvider *>::const_iterator it = AccessProvider::GetProviders().begin(); it != AccessProvider::GetProviders().end(); ++it)
@@ -136,9 +144,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 		replacements["PROVIDERS"] = a->name;
 	}
 
-	TemplateFileServer page("chanserv/access.html");
-	page.Serve(server, page_name, client, message, reply, replacements);
-	return true;
+	return ServePage("chanserv/access.html", server, page_name, client, message, reply, replacements);
 }
 
 std::set<Anope::string> WebCPanel::ChanServ::Access::GetData()
diff --git a/modules/extra/webcpanel/pages/chanserv/akick.cpp b/modules/extra/webcpanel/pages/chanserv/akick.cpp
index 80a8a6a3d..cfcf58b28 100644
--- a/modules/extra/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/akick.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "../../webcpanel.h"
+#include "utils.h"
 
 WebCPanel::ChanServ::Akick::Akick(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
@@ -15,23 +16,31 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 {
 	const Anope::string &chname = message.get_data["channel"];
 
+	BuildChanlist(page_name, na, replacements);
 	if (chname.empty())
 	{
-		reply.error = HTTP_FOUND;
-		reply.headers["Location"] = Anope::string("http") + (server->IsSSL() ? "s" : "") + "://" + message.headers["Host"] + "/chanserv/info";
-		return true;
+		replacements["STOP"];
+		return ServePage("chanserv/akick.html", server, page_name, client, message, reply, replacements);
 	}
 
 	ChannelInfo *ci = ChannelInfo::Find(chname);
 
 	if (!ci)
-		return true;
+	{
+		replacements["STOP"];
+		replacements["MESSAGES"] = "Channel not registered";
+		return ServePage("chanserv/akick.html", server, page_name, client, message, reply, replacements);
+	}
 
 	AccessGroup u_access = ci->AccessFor(na->nc);
 	bool has_priv = na->nc->IsServicesOper() && na->nc->o->ot->HasPriv("chanserv/access/modify");
 
 	if (!u_access.HasPriv("akick") && !has_priv)
-		return true;
+	{
+		replacements["STOP"];
+		replacements["MESSAGES"] = "Permission denied.";
+		return ServePage("chanserv/akick.html", server, page_name, client, message, reply, replacements);
+	}
 
 	if (message.get_data["del"].empty() == false && message.get_data["mask"].empty() == false)
 	{
@@ -68,9 +77,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		replacements["REASONS"] = HTTPUtils::Escape(akick->reason);
 	}
 
-	TemplateFileServer page("chanserv/akick.html");
-	page.Serve(server, page_name, client, message, reply, replacements);
-	return true;
+	return ServePage("chanserv/akick.html", server, page_name, client, message, reply, replacements);
 }
 
 std::set<Anope::string> WebCPanel::ChanServ::Akick::GetData()
diff --git a/modules/extra/webcpanel/pages/chanserv/drop.cpp b/modules/extra/webcpanel/pages/chanserv/drop.cpp
index 8d1342ed3..8f52f7f08 100644
--- a/modules/extra/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/drop.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "../../webcpanel.h"
+#include "utils.h"
 
 WebCPanel::ChanServ::Drop::Drop(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage (cat, u)
 {
@@ -37,11 +38,11 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 			replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
 		}
 	}
+	replacements["PAGE"] = page_name;
 
 	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;
+	return ServePage("chanserv/drop.html", server, page_name, client, message, reply, replacements);
+
 }
diff --git a/modules/extra/webcpanel/pages/chanserv/info.cpp b/modules/extra/webcpanel/pages/chanserv/info.cpp
index 95592706d..5338cc4b2 100644
--- a/modules/extra/webcpanel/pages/chanserv/info.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/info.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "../../webcpanel.h"
+#include "utils.h"
 
 WebCPanel::ChanServ::Info::Info(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
@@ -13,21 +14,13 @@ 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)
 {
-	std::deque<ChannelInfo *> queue;
-	na->nc->GetChannelReferences(queue);
-	for (unsigned i = 0; i < queue.size(); ++i)
-	{
-		ChannelInfo *ci = queue[i];
+	const Anope::string &chname = message.get_data["channel"];
 
-		if (ci->AccessFor(na->nc).HasPriv("SET") || ci->AccessFor(na->nc).HasPriv("ACCESS_LIST"))
-		{
-			replacements["CHANNEL_NAMES"] = ci->name;
-			replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
-		}
-	}
+	if (!chname.empty())
+		replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
 
-	TemplateFileServer page("chanserv/main.html");
-	page.Serve(server, page_name, client, message, reply, replacements);
-	return true;
+	BuildChanlist("/chanserv/set", na, replacements);
+
+	return ServePage("chanserv/main.html", server, page_name, client, message, reply, replacements);
 }
 
diff --git a/modules/extra/webcpanel/pages/chanserv/modes.cpp b/modules/extra/webcpanel/pages/chanserv/modes.cpp
new file mode 100644
index 000000000..d29fff723
--- /dev/null
+++ b/modules/extra/webcpanel/pages/chanserv/modes.cpp
@@ -0,0 +1,104 @@
+/*
+ * (C) 2003-2013 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#include "../../webcpanel.h"
+#include "utils.h"
+
+WebCPanel::ChanServ::Modes::Modes(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
+{
+}
+
+bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+{
+	const Anope::string &chname = message.get_data["channel"];
+	const Anope::string &mode = message.get_data["m"];
+
+	BuildChanlist(page_name, na, replacements);
+
+	if (chname.empty())
+	{
+		replacements["STOP"];
+		return ServePage("chanserv/modes.html", server, page_name, client, message, reply, replacements);
+	}
+
+	ChannelInfo *ci = ChannelInfo::Find(chname);
+
+	if (!ci)
+	{
+		replacements["STOP"];
+		return ServePage("chanserv/modes.html", server, page_name, client, message, reply, replacements);
+	}
+
+	Channel *c = Channel::Find(chname);
+
+	if (!c)
+	{
+		replacements["MESSAGES"] = "Channel is empty / does not exist on the network.";
+		replacements["STOP"];
+		return ServePage("chanserv/modes.html", server, page_name, client, message, reply, replacements);
+	}
+
+	AccessGroup u_access = ci->AccessFor(na->nc);
+	bool has_priv = na->nc->IsServicesOper() && na->nc->o->ot->HasPriv("chanserv/administration");
+
+	if (!u_access.HasPriv("MODE") && !has_priv)
+	{
+		replacements["MESSAGES"] = "Access denied.";
+		replacements["STOP"];
+		return ServePage("chanserv/modes.html", server, page_name, client, message, reply, replacements);
+	}
+
+	/* build a list with the names of all listmodes */
+	for (std::vector<ChannelMode *>::const_iterator it = ModeManager::GetChannelModes().begin(); it != ModeManager::GetChannelModes().end(); ++it)
+	{
+		/* "NAMEBASE" is a special mode from InspIRCds m_namedmodes, we dont want this here*/
+		if ((*it) && (*it)->type == MODE_LIST && (*it)->name != "NAMEBASE")
+			replacements["LISTMODES"] = (*it)->name;
+	}
+
+	ChannelMode *cm = ModeManager::FindChannelModeByName(mode);
+	if (cm)
+	{
+		if (message.get_data["del"].empty() == false && message.get_data["mask"].empty() == false)
+		{
+			std::vector<Anope::string> params;
+			params.push_back(ci->name);
+			params.push_back("SET");
+			params.push_back("-" + Anope::string(cm->mchar));
+			params.push_back(message.get_data["mask"]);
+			WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/mode", params, replacements);
+		}
+		else if (message.post_data["mask"].empty() == false)
+		{
+			std::vector<Anope::string> params;
+			params.push_back(ci->name);
+			params.push_back("SET");
+			params.push_back("+" + Anope::string(cm->mchar));
+			params.push_back(message.post_data["mask"]);
+			WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/mode", params, replacements);
+		}
+
+		for (Channel::ModeList::const_iterator it = c->GetModes().begin(); it != c->GetModes().end(); ++it)
+		{
+			if (it->first == mode)
+				replacements["MASKS"] = HTTPUtils::Escape(it->second);
+		}
+	}
+
+	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
+	replacements["ESCAPED_MODE"] = HTTPUtils::URLEncode(mode);
+
+	return ServePage("chanserv/modes.html", server, page_name, client, message, reply, replacements);
+}
+
+std::set<Anope::string> WebCPanel::ChanServ::Modes::GetData()
+{
+	std::set<Anope::string> v;
+	v.insert("channel");
+	return v;
+}
+
diff --git a/modules/extra/webcpanel/pages/chanserv/modes.h b/modules/extra/webcpanel/pages/chanserv/modes.h
new file mode 100644
index 000000000..2b5a58852
--- /dev/null
+++ b/modules/extra/webcpanel/pages/chanserv/modes.h
@@ -0,0 +1,27 @@
+/*
+ * (C) 2003-2013 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+namespace WebCPanel
+{
+
+namespace ChanServ
+{
+
+class Modes : public WebPanelProtectedPage
+{
+ public:
+	Modes(const Anope::string &cat, const Anope::string &u);
+
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
+
+	std::set<Anope::string> GetData() anope_override;
+};
+
+}
+
+}
+
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp
index d0b54d15a..42a3fcfe6 100644
--- a/modules/extra/webcpanel/pages/chanserv/set.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/set.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "../../webcpanel.h"
+#include "utils.h"
 
 WebCPanel::ChanServ::Set::Set(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
@@ -14,20 +15,32 @@ 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)
 {
 	const Anope::string &chname = message.get_data["channel"];
+	bool can_set = false;
+
+	BuildChanlist(page_name, na, replacements);
 
 	if (chname.empty())
 	{
-		reply.error = HTTP_FOUND;
-		reply.headers["Location"] = Anope::string("http") + (server->IsSSL() ? "s" : "") + "://" + message.headers["Host"] + "/chanserv/info";
-		return true;
+		replacements["STOP"];
+		return ServePage("chanserv/set.html", server, page_name, client, message, reply, replacements);
 	}
 
 	ChannelInfo *ci = ChannelInfo::Find(chname);
 
-	if (!ci || !ci->AccessFor(na->nc).HasPriv("SET"))
-		return true;
+	if (!ci)
+	{
+		replacements["STOP"];
+		return ServePage("chanserv/set.html", server, page_name, client, message, reply, replacements);
+	}
 
-	if (message.post_data.empty() == false)
+
+	if (ci->AccessFor(na->nc).HasPriv("SET"))
+	{
+		replacements["CAN_SET"];
+		can_set = true;
+	}
+
+	if (can_set && message.post_data.empty() == false)
 	{
 		if (ci->HasExt("KEEPTOPIC") != message.post_data.count("keeptopic"))
 		{
@@ -102,30 +115,32 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 		replacements["LAST_TOPIC_SETTER"] = HTTPUtils::Escape(ci->last_topic_setter);
 	}
 
-	if (ci->HasExt("KEEPTOPIC"))
-		replacements["KEEPTOPIC"];
-	
-	if (ci->HasExt("PEACE"))
-		replacements["PEACE"];
-	
-	if (ci->HasExt("CS_PRIVATE"))
-		replacements["PRIVATE"];
-
-	if (ci->HasExt("RESTRICTED"))
-		replacements["RESTRICTED"];
-	
-	if (ci->HasExt("CS_SECURE"))
-		replacements["SECURE"];
-	
-	if (ci->HasExt("SECUREOPS"))
-		replacements["SECUREOPS"];
-	
-	if (ci->HasExt("TOPICLOCK"))
-		replacements["TOPICLOCK"];
-
-	TemplateFileServer page("chanserv/set.html");
-	page.Serve(server, page_name, client, message, reply, replacements);
-	return true;
+	if (can_set)
+	{
+		if (ci->HasExt("KEEPTOPIC"))
+			replacements["KEEPTOPIC"];
+
+		if (ci->HasExt("PEACE"))
+			replacements["PEACE"];
+
+		if (ci->HasExt("CS_PRIVATE"))
+			replacements["PRIVATE"];
+
+		if (ci->HasExt("RESTRICTED"))
+			replacements["RESTRICTED"];
+
+		if (ci->HasExt("CS_SECURE"))
+			replacements["SECURE"];
+
+		if (ci->HasExt("SECUREOPS"))
+			replacements["SECUREOPS"];
+
+		if (ci->HasExt("TOPICLOCK"))
+			replacements["TOPICLOCK"];
+	}
+
+	return ServePage("chanserv/set.html", server, page_name, client, message, reply, replacements);
+
 }
 
 std::set<Anope::string> WebCPanel::ChanServ::Set::GetData()
diff --git a/modules/extra/webcpanel/pages/chanserv/utils.cpp b/modules/extra/webcpanel/pages/chanserv/utils.cpp
new file mode 100644
index 000000000..d5ca188e4
--- /dev/null
+++ b/modules/extra/webcpanel/pages/chanserv/utils.cpp
@@ -0,0 +1,29 @@
+/*
+ * (C) 2003-2013 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#include "../../webcpanel.h"
+
+void BuildChanlist(const Anope::string &page_name, NickAlias *na, TemplateFileServer::Replacements &replacements)
+{
+	std::deque<ChannelInfo *> queue;
+	na->nc->GetChannelReferences(queue);
+	for (unsigned i = 0; i < queue.size(); ++i)
+	{
+		ChannelInfo *ci = queue[i];
+		replacements["CHANNEL_NAMES"] = ci->name;
+		replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
+	}
+	replacements["PAGE"] = page_name;
+	return;
+}
+
+bool ServePage(const Anope::string &page, HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, TemplateFileServer::Replacements &replacements)
+{
+	TemplateFileServer Page(page);
+	Page.Serve(server, page_name, client, message, reply, replacements);
+	return 1;
+}
\ No newline at end of file
diff --git a/modules/extra/webcpanel/pages/chanserv/utils.h b/modules/extra/webcpanel/pages/chanserv/utils.h
new file mode 100644
index 000000000..cf4683936
--- /dev/null
+++ b/modules/extra/webcpanel/pages/chanserv/utils.h
@@ -0,0 +1,10 @@
+/*
+ * (C) 2003-2013 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+void BuildChanlist(const Anope::string &, NickAlias *, TemplateFileServer::Replacements &);
+
+bool ServePage(const Anope::string &, HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, TemplateFileServer::Replacements &);