1 files changed, 30 insertions, 17 deletions

diff --git a/modules/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
index 8a6a09d4d..eb1c81f5a 100644
--- a/modules/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/webcpanel/pages/chanserv/akick.cpp
@@ -1,18 +1,31 @@
 /*
- * (C) 2003-2016 Anope Team
- * Contact us at team@anope.org
+ * Anope IRC Services
  *
- * Please read COPYING and README for further details.
+ * Copyright (C) 2012-2016 Anope Team <team@anope.org>
+ *
+ * This file is part of Anope. Anope is free software; you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software
+ * Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see see <http://www.gnu.org/licenses/>.
  */
 
 #include "../../webcpanel.h"
 #include "utils.h"
+#include "modules/chanserv/akick.h"
 
 WebCPanel::ChanServ::Akick::Akick(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
 }
 
-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(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, ::NickServ::Nick *na, TemplateFileServer::Replacements &replacements)
 {
 	const Anope::string &chname = message.get_data["channel"];
 	TemplateFileServer Page("chanserv/akick.html");
@@ -25,7 +38,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		return true;
 	}
 
-	ChannelInfo *ci = ChannelInfo::Find(chname);
+	::ChanServ::Channel *ci = ::ChanServ::Find(chname);
 
 	if (!ci)
 	{
@@ -34,8 +47,8 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		return true;
 	}
 
-	AccessGroup u_access = ci->AccessFor(na->nc);
-	bool has_priv = na->nc->IsServicesOper() && na->nc->o->ot->HasPriv("chanserv/access/modify");
+	::ChanServ::AccessGroup u_access = ci->AccessFor(na->GetAccount());
+	bool has_priv = na->GetAccount()->IsServicesOper() && na->GetAccount()->o->GetType()->HasPriv("chanserv/access/modify");
 
 	if (!u_access.HasPriv("AKICK") && !has_priv)
 	{
@@ -49,36 +62,36 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 	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(ci->GetName());
 		params.push_back("DEL");
 		params.push_back(message.get_data["mask"]);
 
-		WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/akick", params, replacements);
+		WebPanel::RunCommand(na->GetAccount()->GetDisplay(), na->GetAccount(), "ChanServ", "chanserv/akick", params, replacements);
 	}
 	else if (message.post_data["mask"].empty() == false)
 	{
 		std::vector<Anope::string> params;
-		params.push_back(ci->name);
+		params.push_back(ci->GetName());
 		params.push_back("ADD");
 		params.push_back(message.post_data["mask"]);
 		if (message.post_data["reason"].empty() == false)
 			params.push_back(message.post_data["reason"]);
 
-		WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/akick", params, replacements);
+		WebPanel::RunCommand(na->GetAccount()->GetDisplay(), na->GetAccount(), "ChanServ", "chanserv/akick", params, replacements);
 	}
 
 	replacements["ESCAPED_CHANNEL"] = HTTPUtils::URLEncode(chname);
 
 	for (unsigned i = 0; i < ci->GetAkickCount(); ++i)
 	{
-		AutoKick *akick = ci->GetAkick(i);
+		AutoKick *ak = ci->GetAkick(i);
 
-		if (akick->nc)
-			replacements["MASKS"] = HTTPUtils::Escape(akick->nc->display);
+		if (ak->GetAccount())
+			replacements["MASKS"] = HTTPUtils::Escape(ak->GetAccount()->GetDisplay());
 		else
-			replacements["MASKS"] = HTTPUtils::Escape(akick->mask);
-		replacements["CREATORS"] = HTTPUtils::Escape(akick->creator);
-		replacements["REASONS"] = HTTPUtils::Escape(akick->reason);
+			replacements["MASKS"] = HTTPUtils::Escape(ak->GetMask());
+		replacements["CREATORS"] = HTTPUtils::Escape(ak->GetCreator());
+		replacements["REASONS"] = HTTPUtils::Escape(ak->GetReason());
 	}
 
 	Page.Serve(server, page_name, client, message, reply, replacements);