From d95189a4d8075a378f777eb5206984ebbb0db5ba Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 31 Jul 2015 18:26:49 -0400 Subject: Fix webcpanel/memoserv/memos with a nonexistent channel --- modules/webcpanel/pages/memoserv/memos.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/webcpanel') diff --git a/modules/webcpanel/pages/memoserv/memos.cpp b/modules/webcpanel/pages/memoserv/memos.cpp index 944864cdd..750b6bd8b 100644 --- a/modules/webcpanel/pages/memoserv/memos.cpp +++ b/modules/webcpanel/pages/memoserv/memos.cpp @@ -41,15 +41,15 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st { replacements["MESSAGES"] = "Displaying the memos for " + chname + "."; mi = &ci->memos; + + replacements["CHANNEL_NAME"] = ci->name; + replacements["ESCAPED_CHANNEL_NAME"] = HTTPUtils::URLEncode(ci->name); } else { replacements["MESSAGES"] = "Channel " + chname + " not found, displaying the memos for your nick"; mi = &na->nc->memos; } - - replacements["CHANNEL_NAME"] = ci->name; - replacements["ESCAPED_CHANNEL_NAME"] = HTTPUtils::URLEncode(ci->name); } if (message.post_data.count("receiver") > 0 && message.post_data.count("message") > 0) { -- cgit From 776207ba67e6065611d9ba4e2dec603062cb220f Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 14 Sep 2015 12:35:26 -0400 Subject: Don't allow suspended users to login to webcpanel --- modules/webcpanel/pages/index.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/webcpanel') diff --git a/modules/webcpanel/pages/index.cpp b/modules/webcpanel/pages/index.cpp index 1b136c7fb..7b755cfe8 100644 --- a/modules/webcpanel/pages/index.cpp +++ b/modules/webcpanel/pages/index.cpp @@ -30,6 +30,12 @@ class WebpanelRequest : public IdentifyRequest return; } + if (na->nc->HasExt("NS_SUSPENDED")) + { + this->OnFail(); + return; + } + Anope::string id; for (int i = 0; i < 64; ++i) { -- cgit