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::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 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 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 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::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 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 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 WebCPanel::ChanServ::Modes::GetData() +{ + std::set 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 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 (can_set) + { + if (ci->HasExt("KEEPTOPIC")) + replacements["KEEPTOPIC"]; - 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"]; + 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); - TemplateFileServer page("chanserv/set.html"); - page.Serve(server, page_name, client, message, reply, replacements); - return true; } std::set 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 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 &); diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/extra/webcpanel/templates/default/chanserv/access.html index 5b02c068a..5364a4e94 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/access.html +++ b/modules/extra/webcpanel/templates/default/chanserv/access.html @@ -1,4 +1,5 @@ {INCLUDE header.html} +{INCLUDE chanserv/chanlist.html}
Access List
{FOR M IN MESSAGES} @@ -7,64 +8,71 @@
{END FOR} - {IF EXISTS ACCESSES} - - - - - - - - - - - {FOR MASK,ACCESS,CREATOR,ACCESS_CHANGE IN MASKS,ACCESSES,CREATORS,ACCESS_CHANGES} - - - - - {IF EQ ACCESS_CHANGE YES} - - {END IF} - - {END FOR} - -
MaskAccessCreator
{MASK}{ACCESS}{CREATOR}Delete
+ {IF EXISTS STOP} {ELSE} - Access list is empty. + {IF EXISTS ACCESSES} + + + + + + + + + + + {FOR MASK,ACCESS,CREATOR IN MASKS,ACCESSES,CREATORS} + + + + + {IF EQ ACCESS_CHANGE YES} + + {ELSE} + + {END IF} + + {END FOR} + +
MaskAccessCreator
{MASK}{ACCESS}{CREATOR}Delete
+ {ELSE} + Access list is empty. + {END IF} + +
+ + {IF EQ ACCESS_CHANGE YES} +

Add an access entry

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ {END IF} {END IF} - -
- -

Add an access entry

-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/extra/webcpanel/templates/default/chanserv/akick.html index 3b6a2f190..1483cd660 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/akick.html +++ b/modules/extra/webcpanel/templates/default/chanserv/akick.html @@ -1,4 +1,5 @@ {INCLUDE header.html} +{INCLUDE chanserv/chanlist.html}
Akick List
{FOR M IN MESSAGES} @@ -7,52 +8,55 @@
{END FOR} - {IF EXISTS MASKS} - - - - - - - - - - - {FOR MASK,REASON,CREATOR IN MASKS,REASONS,CREATORS} - - - - - - - {END FOR} - -
MaskReasonCreator
{MASK}{REASON}{CREATOR}Delete
+ {IF EXISTS STOP} {ELSE} - Akick list is empty. + {IF EXISTS MASKS} + + + + + + + + + + + {FOR MASK,REASON,CREATOR IN MASKS,REASONS,CREATORS} + + + + + + + {END FOR} + +
MaskReasonCreator
{MASK}{REASON}{CREATOR}Delete
+ {ELSE} + Akick list is empty. + {END IF} + +
+ +

Add an akick entry

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
{END IF} - -
- -

Add an akick entry

-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/chanlist.html b/modules/extra/webcpanel/templates/default/chanserv/chanlist.html new file mode 100644 index 000000000..50e3a60f6 --- /dev/null +++ b/modules/extra/webcpanel/templates/default/chanserv/chanlist.html @@ -0,0 +1,13 @@ + +
+ {IF EXISTS CHANNEL_NAMES} +
+

Choose a channel to access it's Settings, Access or Akick pages.

+ {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} + {CH} + {END FOR} +
+ {ELSE} + You don't have access in any channel
+ {END IF} +

diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/extra/webcpanel/templates/default/chanserv/drop.html index 1b7e788d0..23cb42a1e 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/drop.html +++ b/modules/extra/webcpanel/templates/default/chanserv/drop.html @@ -1,4 +1,5 @@ {INCLUDE header.html} +{INCLUDE chanserv/chanlist.html}
Channels you can drop
{FOR M IN MESSAGES} @@ -7,11 +8,6 @@
{END FOR} -
- {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} - {CH}
- {END FOR} -
{IF EXISTS CHANNEL_DROP}

Drop Channel {CHANNEL_DROP}?

diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/extra/webcpanel/templates/default/chanserv/main.html index 8b88970e8..e77626f31 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/main.html +++ b/modules/extra/webcpanel/templates/default/chanserv/main.html @@ -1,17 +1,3 @@ {INCLUDE header.html} -
Channels you have access in
-
- {IF EXISTS CHANNEL_NAMES} -
-

Choose a channel to access it's Settings, Access or Akick pages.

-
    - {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} -
  • {CH}
    • - {END FOR} -
-
- {ELSE} - You don't have access in any channel
- {END IF} -
+{INCLUDE chanserv/chanlist.html} {INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/modes.html b/modules/extra/webcpanel/templates/default/chanserv/modes.html new file mode 100644 index 000000000..e441797dc --- /dev/null +++ b/modules/extra/webcpanel/templates/default/chanserv/modes.html @@ -0,0 +1,57 @@ +{INCLUDE header.html} +{INCLUDE chanserv/chanlist.html} +
Channel Mode List
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} + + {IF EXISTS STOP} + {ELSE} + {FOR LM IN LISTMODES} + {LM} + {END FOR} +
+ + {IF EXISTS MASKS} + + + + + + + + + {FOR MASK IN MASKS} + + + + + {END FOR} + +
Mask
{MASK}Delete
+ {ELSE} + Nothing to display. + {END IF} + +
+ +

Set a new mode

+
+
+ +
+ +
+
+
+
+ +
+
+
+ {END IF} +
+{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/extra/webcpanel/templates/default/chanserv/set.html index 0c2596dc6..e8522cef9 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/set.html +++ b/modules/extra/webcpanel/templates/default/chanserv/set.html @@ -1,4 +1,5 @@ {INCLUDE header.html} +{INCLUDE chanserv/chanlist.html}
Channel Information
{FOR M IN MESSAGES} @@ -7,7 +8,9 @@
{END FOR} -
+ {IF EXISTS STOP} + {ELSE} + {IF EXISTS CAN_SET}{END IF} @@ -43,6 +46,7 @@ {END IF} + {IF EXISTS CAN_SET} @@ -75,7 +79,9 @@ + {END IF}
Channel Name{LAST_TOPIC_SETTER}
Keep topic
-
+ {IF EXISTS CAN_SET}{END IF} + {END IF}
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html index 9d9710c30..93d2c31fb 100644 --- a/modules/extra/webcpanel/templates/default/header.html +++ b/modules/extra/webcpanel/templates/default/header.html @@ -17,6 +17,7 @@ + {TITLE} diff --git a/modules/extra/webcpanel/webcpanel.cpp b/modules/extra/webcpanel/webcpanel.cpp index c0bd841a0..4f4dca97e 100644 --- a/modules/extra/webcpanel/webcpanel.cpp +++ b/modules/extra/webcpanel/webcpanel.cpp @@ -32,6 +32,7 @@ class ModuleWebCPanel : public Module WebCPanel::ChanServ::Set chanserv_set; WebCPanel::ChanServ::Access chanserv_access; WebCPanel::ChanServ::Akick chanserv_akick; + WebCPanel::ChanServ::Modes chanserv_modes; WebCPanel::ChanServ::Drop chanserv_drop; WebCPanel::MemoServ::Memos memoserv_memos; @@ -48,7 +49,8 @@ class ModuleWebCPanel : public Module index("/"), logout("/logout"), _register("/register"), confirm("/confirm"), nickserv_info("NickServ", "/nickserv/info"), nickserv_cert("NickServ", "/nickserv/cert"), nickserv_access("NickServ", "/nickserv/access"), nickserv_alist("NickServ", "/nickserv/alist"), chanserv_info("ChanServ", "/chanserv/info"), chanserv_set("ChanServ", "/chanserv/set"), chanserv_access("ChanServ", "/chanserv/access"), chanserv_akick("ChanServ", "/chanserv/akick"), - chanserv_drop("ChanServ", "/chanserv/drop"), memoserv_memos("MemoServ", "/memoserv/memos"), hostserv_request("HostServ", "/hostserv/request"), operserv_akill("OperServ", "/operserv/akill") + chanserv_modes("ChanServ", "/chanserv/modes"), chanserv_drop("ChanServ", "/chanserv/drop"), memoserv_memos("MemoServ", "/memoserv/memos"), hostserv_request("HostServ", "/hostserv/request"), + operserv_akill("OperServ", "/operserv/akill") { me = this; @@ -133,6 +135,11 @@ class ModuleWebCPanel : public Module s.subsections.push_back(ss); provider->RegisterPage(&this->chanserv_akick); + ss.name = "Modes"; + ss.url = "/chanserv/modes"; + s.subsections.push_back(ss); + provider->RegisterPage(&this->chanserv_modes); + ss.name = "Drop"; ss.url = "/chanserv/drop"; s.subsections.push_back(ss); @@ -210,6 +217,7 @@ class ModuleWebCPanel : public Module provider->UnregisterPage(&this->chanserv_set); provider->UnregisterPage(&this->chanserv_access); provider->UnregisterPage(&this->chanserv_akick); + provider->UnregisterPage(&this->chanserv_modes); provider->UnregisterPage(&this->chanserv_drop); provider->UnregisterPage(&this->memoserv_memos); diff --git a/modules/extra/webcpanel/webcpanel.h b/modules/extra/webcpanel/webcpanel.h index ebce325d2..b04859376 100644 --- a/modules/extra/webcpanel/webcpanel.h +++ b/modules/extra/webcpanel/webcpanel.h @@ -166,6 +166,7 @@ namespace WebPanel #include "pages/chanserv/set.h" #include "pages/chanserv/access.h" #include "pages/chanserv/akick.h" +#include "pages/chanserv/modes.h" #include "pages/chanserv/drop.h" #include "pages/memoserv/memos.h"