1 files changed, 53 insertions, 39 deletions

diff --git a/modules/webcpanel/pages/memoserv/memos.cpp b/modules/webcpanel/pages/memoserv/memos.cpp
index d4335f749..76f4d676e 100644
--- a/modules/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/webcpanel/pages/memoserv/memos.cpp
@@ -1,8 +1,20 @@
 /*
- * (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"
@@ -11,45 +23,46 @@ WebCPanel::MemoServ::Memos::Memos(const Anope::string &cat, const Anope::string
 {
 }
 
-bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::MemoServ::Memos::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"];
-	ChannelInfo *ci;
-	const MemoInfo *mi;
-	Memo *m;
+	::ChanServ::Channel *ci;
+	::MemoServ::MemoInfo *mi;
+	::MemoServ::Memo *m;
 
-	for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
-	{
-		ci = it->second;
-
-		if (ci->AccessFor(na->nc).HasPriv("MEMO"))
+	if (::ChanServ::service)
+		for (auto& it : ::ChanServ::service->GetChannels())
 		{
-			replacements["CHANNEL_NAMES"] = ci->name;
-			replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name);
+			ci = it.second;
+
+			if (ci->AccessFor(na->GetAccount()).HasPriv("MEMO"))
+			{
+				replacements["CHANNEL_NAMES"] = ci->GetName();
+				replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->GetName());
+			}
 		}
-	}
 
 	if (chname.empty())
 	{
 		replacements["MESSAGES"] = "No Channel specified, displaying the memos for your Nick";
-		mi = &na->nc->memos;
+		mi = na->GetAccount()->GetMemos();
 	}
 	else
 	{
-		ci = ChannelInfo::Find(chname);
+		ci = ::ChanServ::Find(chname);
 		if (ci)
 		{
 			replacements["MESSAGES"] = "Displaying the memos for " + chname + ".";
-			mi = &ci->memos;
-
-			replacements["CHANNEL_NAME"] = ci->name;
-			replacements["ESCAPED_CHANNEL_NAME"] = HTTPUtils::URLEncode(ci->name);
+			mi = ci->GetMemos();
 		}
 		else
 		{
 			replacements["MESSAGES"] = "Channel " + chname + " not found, displaying the memos for your nick";
-			mi = &na->nc->memos;
+			mi = na->GetAccount()->GetMemos();
 		}
+
+		replacements["CHANNEL_NAME"] = ci->GetName();
+		replacements["ESCAPED_CHANNEL_NAME"] = HTTPUtils::URLEncode(ci->GetName());
 	}
 	if (message.post_data.count("receiver") > 0 && message.post_data.count("message") > 0)
 	{
@@ -57,7 +70,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 		params.push_back(HTTPUtils::URLDecode(message.post_data["receiver"]));
 		params.push_back(HTTPUtils::URLDecode(message.post_data["message"]));
 
-		WebPanel::RunCommand(na->nc->display, na->nc, "MemoServ", "memoserv/send", params, replacements, "CMDR");
+		WebPanel::RunCommand(na->GetAccount()->GetDisplay(), na->GetAccount(), "MemoServ", "memoserv/send", params, replacements, "CMDR");
 	}
 	if (message.get_data.count("del") > 0 && message.get_data.count("number") > 0)
 	{
@@ -66,7 +79,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 			params.push_back(chname);
 		params.push_back(message.get_data["number"]);
 
-		WebPanel::RunCommand(na->nc->display, na->nc, "MemoServ", "memoserv/del", params, replacements, "CMDR");
+		WebPanel::RunCommand(na->GetAccount()->GetDisplay(), na->GetAccount(), "MemoServ", "memoserv/del", params, replacements, "CMDR");
 	}
 	if (message.get_data.count("read") > 0 && message.get_data.count("number") > 0)
 	{
@@ -84,29 +97,30 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 
 		if (number > 0)
 		{
-			m = mi->GetMemo(number-1);
+			m = mi ? mi->GetMemo(number-1) : nullptr;
 
 			if (!m)
 				replacements["MESSAGES"] = "ERROR - invalid memo number.";
 			else if (message.get_data["read"] == "1")
-				m->unread = false;
+				m->SetUnread(false);
 			else if (message.get_data["read"] == "2")
-				m->unread = true;
+				m->SetUnread(true);
 		}
 	}
 
-	for (unsigned i = 0; i < mi->memos->size(); ++i)
-	{
-		m = mi->GetMemo(i);
-		replacements["NUMBER"] = stringify(i+1);
-		replacements["SENDER"] = m->sender;
-		replacements["TIME"] = Anope::strftime(m->time);
-		replacements["TEXT"] = HTTPUtils::Escape(m->text);
-		if (m->unread)
-			replacements["UNREAD"] = "YES";
-		else
-			replacements["UNREAD"] = "NO";
-	}
+	if (mi)
+		for (unsigned i = 0; i < mi->GetMemos().size(); ++i)
+		{
+			m = mi->GetMemo(i);
+			replacements["NUMBER"] = stringify(i+1);
+			replacements["SENDER"] = m->GetSender();
+			replacements["TIME"] = Anope::strftime(m->GetTime());
+			replacements["TEXT"] = HTTPUtils::Escape(m->GetText());
+			if (m->GetUnread())
+				replacements["UNREAD"] = "YES";
+			else
+				replacements["UNREAD"] = "NO";
+		}
 
 	TemplateFileServer page("memoserv/memos.html");
 	page.Serve(server, page_name, client, message, reply, replacements);