From ddaa001dafb5122e6e363e4acbbe6ce045b7b104 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 21 Jan 2013 22:31:16 -0500 Subject: Merge usefulness of Flags and Extensible classes into Extensible, made most flags we have juse strings instead of defines/enums --- modules/extra/cs_statusupdate.cpp | 14 ++--- modules/extra/m_chanstats.cpp | 19 ++++--- modules/extra/m_dnsbl.cpp | 2 +- modules/extra/m_helpchan.cpp | 6 +- modules/extra/m_proxyscan.cpp | 2 +- modules/extra/m_sql_oper.cpp | 4 +- modules/extra/m_ssl.cpp | 35 ++++++------ modules/extra/m_xmlrpc_main.cpp | 12 ++-- modules/extra/webcpanel/pages/chanserv/drop.cpp | 6 +- modules/extra/webcpanel/pages/chanserv/set.cpp | 70 ++++++++++++------------ modules/extra/webcpanel/pages/memoserv/memos.cpp | 10 +--- modules/extra/webcpanel/pages/nickserv/alist.cpp | 4 +- modules/extra/webcpanel/pages/nickserv/info.cpp | 54 +++++++++--------- 13 files changed, 119 insertions(+), 119 deletions(-) (limited to 'modules/extra') diff --git a/modules/extra/cs_statusupdate.cpp b/modules/extra/cs_statusupdate.cpp index 68accac0c..97faae851 100644 --- a/modules/extra/cs_statusupdate.cpp +++ b/modules/extra/cs_statusupdate.cpp @@ -10,14 +10,14 @@ static struct ModeInfo { Anope::string priv; - ChannelModeName name; + Anope::string name; } modeInfo[] = { - { "AUTOOWNER", CMODE_OWNER }, - { "AUTOPROTECT", CMODE_PROTECT }, - { "AUTOOP", CMODE_OP }, - { "AUTOHALFOP", CMODE_HALFOP }, - { "AUTOVOICE", CMODE_VOICE }, - { "", CMODE_END } + { "AUTOOWNER", "OWNER" }, + { "AUTOPROTECT", "PROTECT" }, + { "AUTOOP", "OP" }, + { "AUTOHALFOP", "HALFOP" }, + { "AUTOVOICE", "VOICE" }, + { "", "" } }; class StatusUpdate : public Module diff --git a/modules/extra/m_chanstats.cpp b/modules/extra/m_chanstats.cpp index 7096b39a5..3c964b55c 100644 --- a/modules/extra/m_chanstats.cpp +++ b/modules/extra/m_chanstats.cpp @@ -56,7 +56,7 @@ class MChanstats : public Module const Anope::string GetDisplay(User *u) { - if (u && u->Account() && u->Account()->HasFlag(NI_STATS)) + if (u && u->Account() && u->Account()->HasExt("STATS")) return u->Account()->display; else return ""; @@ -350,6 +350,7 @@ class MChanstats : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); this->OnReload(); } + void OnReload() anope_override { ConfigReader config; @@ -365,30 +366,34 @@ class MChanstats : public Module else Log(this) << "no database connection to " << engine; } + void OnTopicUpdated(Channel *c, const Anope::string &user, const Anope::string &topic) anope_override { User *u = User::Find(user); - if (!u || !u->Account() || !c->ci || !c->ci->HasFlag(CI_STATS)) + if (!u || !u->Account() || !c->ci || !c->ci->HasExt("STATS")) return; query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);"; query.SetValue("channel", c->name); query.SetValue("nick", GetDisplay(u)); this->RunQuery(query); } - EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, ChannelModeName Name, const Anope::string ¶m) anope_override + + EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, const Anope::string &, const Anope::string ¶m) anope_override { this->OnModeChange(c, setter.GetUser()); return EVENT_CONTINUE; } - EventReturn OnChannelModeUnset(Channel *c, MessageSource &setter, ChannelModeName Name, const Anope::string ¶m) anope_override + + EventReturn OnChannelModeUnset(Channel *c, MessageSource &setter, const Anope::string &, const Anope::string ¶m) anope_override { this->OnModeChange(c, setter.GetUser()); return EVENT_CONTINUE; } + private: void OnModeChange(Channel *c, User *u) { - if (!u || !u->Account() || !c->ci || !c->ci->HasFlag(CI_STATS)) + if (!u || !u->Account() || !c->ci || !c->ci->HasExt("STATS")) return; query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0);"; @@ -399,7 +404,7 @@ class MChanstats : public Module public: void OnUserKicked(Channel *c, User *target, MessageSource &source, const Anope::string &kickmsg) anope_override { - if (!c->ci || !c->ci->HasFlag(CI_STATS)) + if (!c->ci || !c->ci->HasExt("STATS")) return; query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0);"; @@ -414,7 +419,7 @@ class MChanstats : public Module } void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override { - if (!c->ci || !c->ci->HasFlag(CI_STATS) || (msg[0] == Config->BSFantasyCharacter[0])) + if (!c->ci || !c->ci->HasExt("STATS") || (msg[0] == Config->BSFantasyCharacter[0])) return; size_t letters = msg.length(); diff --git a/modules/extra/m_dnsbl.cpp b/modules/extra/m_dnsbl.cpp index 692f1cf2d..c9940eaab 100644 --- a/modules/extra/m_dnsbl.cpp +++ b/modules/extra/m_dnsbl.cpp @@ -54,7 +54,7 @@ class DNSBLResolver : public Request record_reason = this->blacklist.replies[result]; } - user->Extend("m_dnsbl_akilled", NULL); + user->Extend("m_dnsbl_akilled"); Anope::string reason = this->blacklist.reason; reason = reason.replace_all_cs("%n", user->nick); diff --git a/modules/extra/m_helpchan.cpp b/modules/extra/m_helpchan.cpp index 88b2eaee8..32d1859fc 100644 --- a/modules/extra/m_helpchan.cpp +++ b/modules/extra/m_helpchan.cpp @@ -22,14 +22,14 @@ class HelpChannel : public Module OnReload(); } - EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, ChannelModeName Name, const Anope::string ¶m) anope_override + EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, const Anope::string &mname, const Anope::string ¶m) anope_override { - if (Name == CMODE_OP && c && c->ci && c->name.equals_ci(this->HelpChan)) + if (mname == "OP" && c && c->ci && c->name.equals_ci(this->HelpChan)) { User *u = User::Find(param); if (u && c->ci->AccessFor(u).HasPriv("OPDEOPME")) - u->SetMode(OperServ, UMODE_HELPOP); + u->SetMode(OperServ, "HELPOP"); } return EVENT_CONTINUE; diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp index 9fc8b26c9..b43954299 100644 --- a/modules/extra/m_proxyscan.cpp +++ b/modules/extra/m_proxyscan.cpp @@ -215,7 +215,7 @@ class ModuleProxyScan : public Module ProxyConnect *p = *it; if (p->created + this->GetSecs() < Anope::CurTime) - p->SetFlag(SF_DEAD); + p->flags[SF_DEAD] = true; } } } connectionTimeout; diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp index dd1f13b74..f786ad36d 100644 --- a/modules/extra/m_sql_oper.cpp +++ b/modules/extra/m_sql_oper.cpp @@ -51,7 +51,7 @@ class SQLOperResult : public SQL::Interface delete user->Account()->o; user->Account()->o = NULL; Log(this->owner) << "m_sql_oper: Removed services operator from " << user->nick << " (" << user->Account()->display << ")"; - user->RemoveMode(OperServ, UMODE_OPER); // Probably not set, just incase + user->RemoveMode(OperServ, "OPER"); // Probably not set, just incase } return; } @@ -70,7 +70,7 @@ class SQLOperResult : public SQL::Interface Config->Opers.push_back(user->Account()->o); } - if (!user->HasMode(UMODE_OPER)) + if (!user->HasMode("OPER")) { IRCD->SendOper(user); diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index fdde28919..9929c6f15 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -256,7 +256,7 @@ ClientSocket *SSLSocketIO::Accept(ListenSocket *s) if (!SSL_set_fd(io->sslsock, newsocket->GetFD())) throw SocketException("Unable to set SSL fd"); - newsocket->SetFlag(SF_ACCEPTING); + newsocket->flags[SF_ACCEPTING] = true; this->FinishAccept(newsocket); return newsocket; @@ -266,9 +266,9 @@ SocketFlag SSLSocketIO::FinishAccept(ClientSocket *cs) { if (cs->io == &NormalSocketIO) throw SocketException("Attempting to finish connect uninitialized socket with SSL"); - else if (cs->HasFlag(SF_ACCEPTED)) + else if (cs->flags[SF_ACCEPTED]) return SF_ACCEPTED; - else if (!cs->HasFlag(SF_ACCEPTING)) + else if (!cs->flags[SF_ACCEPTING]) throw SocketException("SSLSocketIO::FinishAccept called for a socket not accepted nor accepting?"); SSLSocketIO *io = anope_dynamic_static_cast(cs->io); @@ -286,15 +286,15 @@ SocketFlag SSLSocketIO::FinishAccept(ClientSocket *cs) else { cs->OnError(ERR_error_string(ERR_get_error(), NULL)); - cs->SetFlag(SF_DEAD); - cs->UnsetFlag(SF_ACCEPTING); + cs->flags[SF_DEAD] = true; + cs->flags[SF_ACCEPTING] = false; return SF_DEAD; } } else { - cs->SetFlag(SF_ACCEPTED); - cs->UnsetFlag(SF_ACCEPTING); + cs->flags[SF_ACCEPTED] = true; + cs->flags[SF_ACCEPTING] = false; SocketEngine::Change(cs, false, SF_WRITABLE); SocketEngine::Change(cs, true, SF_READABLE); cs->OnAccept(); @@ -307,8 +307,7 @@ void SSLSocketIO::Connect(ConnectionSocket *s, const Anope::string &target, int if (s->io == &NormalSocketIO) throw SocketException("Attempting to connect uninitialized socket with SSL"); - s->UnsetFlag(SF_CONNECTING); - s->UnsetFlag(SF_CONNECTED); + s->flags[SF_CONNECTING] = s->flags[SF_CONNECTED] = false; s->conaddr.pton(s->IsIPv6() ? AF_INET6 : AF_INET, target, port); int c = connect(s->GetFD(), &s->conaddr.sa, s->conaddr.size()); @@ -317,19 +316,19 @@ void SSLSocketIO::Connect(ConnectionSocket *s, const Anope::string &target, int if (Anope::LastErrorCode() != EINPROGRESS) { s->OnError(Anope::LastError()); - s->SetFlag(SF_DEAD); + s->flags[SF_DEAD] = true; return; } else { SocketEngine::Change(s, true, SF_WRITABLE); - s->SetFlag(SF_CONNECTING); + s->flags[SF_CONNECTING] = true; return; } } else { - s->SetFlag(SF_CONNECTING); + s->flags[SF_CONNECTING] = true; this->FinishConnect(s); } } @@ -338,9 +337,9 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) { if (s->io == &NormalSocketIO) throw SocketException("Attempting to finish connect uninitialized socket with SSL"); - else if (s->HasFlag(SF_CONNECTED)) + else if (s->flags[SF_CONNECTED]) return SF_CONNECTED; - else if (!s->HasFlag(SF_CONNECTING)) + else if (!s->flags[SF_CONNECTING]) throw SocketException("SSLSocketIO::FinishConnect called for a socket not connected nor connecting?"); SSLSocketIO *io = anope_dynamic_static_cast(s->io); @@ -368,15 +367,15 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) else { s->OnError(ERR_error_string(ERR_get_error(), NULL)); - s->UnsetFlag(SF_CONNECTING); - s->SetFlag(SF_DEAD); + s->flags[SF_CONNECTING] = false; + s->flags[SF_DEAD] = true; return SF_DEAD; } } else { - s->UnsetFlag(SF_CONNECTING); - s->SetFlag(SF_CONNECTED); + s->flags[SF_CONNECTING] = false; + s->flags[SF_CONNECTED] = true; SocketEngine::Change(s, false, SF_WRITABLE); SocketEngine::Change(s, true, SF_READABLE); s->OnConnect(); diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp index 807aa626b..e4b761cc7 100644 --- a/modules/extra/m_xmlrpc_main.cpp +++ b/modules/extra/m_xmlrpc_main.cpp @@ -153,21 +153,21 @@ class MyXMLRPCEvent : public XMLRPCEvent if (c) { - request.reply("bancount", stringify(c->HasMode(CMODE_BAN))); + request.reply("bancount", stringify(c->HasMode("BAN"))); int count = 0; - std::pair its = c->GetModeList(CMODE_BAN); + std::pair its = c->GetModeList("BAN"); for (; its.first != its.second; ++its.first) request.reply("ban" + stringify(++count), iface->Sanitize(its.first->second)); - request.reply("exceptcount", stringify(c->HasMode(CMODE_EXCEPT))); + request.reply("exceptcount", stringify(c->HasMode("EXCEPT"))); count = 0; - its = c->GetModeList(CMODE_EXCEPT); + its = c->GetModeList("EXCEPT"); for (; its.first != its.second; ++its.first) request.reply("except" + stringify(++count), iface->Sanitize(its.first->second)); - request.reply("invitecount", stringify(c->HasMode(CMODE_INVITEOVERRIDE))); + request.reply("invitecount", stringify(c->HasMode("INVITEOVERRIDE"))); count = 0; - its = c->GetModeList(CMODE_INVITEOVERRIDE); + its = c->GetModeList("INVITEOVERRIDE"); for (; its.first != its.second; ++its.first) request.reply("invite" + stringify(++count), iface->Sanitize(its.first->second)); diff --git a/modules/extra/webcpanel/pages/chanserv/drop.cpp b/modules/extra/webcpanel/pages/chanserv/drop.cpp index 824b1e58b..0ebb8e7a1 100644 --- a/modules/extra/webcpanel/pages/chanserv/drop.cpp +++ b/modules/extra/webcpanel/pages/chanserv/drop.cpp @@ -29,16 +29,16 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it) { ChannelInfo *ci = it->second; - if ((ci->HasFlag(CI_SECUREFOUNDER) ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop"))) + if ((ci->HasExt("SECUREFOUNDER") ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop"))) { replacements["CHANNEL_NAMES"] = ci->name; replacements["ESCAPED_CHANNEL_NAMES"] = HTTPUtils::URLEncode(ci->name); } } - if (message.get_data.count("channel") > 0) { + 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; diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp index 9cee680eb..af3640e33 100644 --- a/modules/extra/webcpanel/pages/chanserv/set.cpp +++ b/modules/extra/webcpanel/pages/chanserv/set.cpp @@ -29,60 +29,60 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri if (message.post_data.empty() == false) { - if (ci->HasFlag(CI_KEEPTOPIC) != message.post_data.count("keeptopic")) + if (ci->HasExt("KEEPTOPIC") != message.post_data.count("keeptopic")) { - if (!ci->HasFlag(CI_KEEPTOPIC)) - ci->SetFlag(CI_KEEPTOPIC); + if (!ci->HasExt("KEEPTOPIC")) + ci->ExtendMetadata("KEEPTOPIC"); else - ci->UnsetFlag(CI_KEEPTOPIC); + ci->Shrink("KEEPTOPIC"); replacements["MESSAGES"] = "Secure updated"; } - if (ci->HasFlag(CI_PEACE) != message.post_data.count("peace")) + if (ci->HasExt("PEACE") != message.post_data.count("peace")) { - if (!ci->HasFlag(CI_PEACE)) - ci->SetFlag(CI_PEACE); + if (!ci->HasExt("PEACE")) + ci->ExtendMetadata("PEACE"); else - ci->UnsetFlag(CI_PEACE); + ci->Shrink("PEACE"); replacements["MESSAGES"] = "Peace updated"; } - if (ci->HasFlag(CI_PRIVATE) != message.post_data.count("private")) + if (ci->HasExt("PRIVATE") != message.post_data.count("private")) { - if (!ci->HasFlag(CI_PRIVATE)) - ci->SetFlag(CI_PRIVATE); + if (!ci->HasExt("PRIVATE")) + ci->ExtendMetadata("PRIVATE"); else - ci->UnsetFlag(CI_PRIVATE); + ci->Shrink("PRIVATE"); replacements["MESSAGES"] = "Private updated"; } - if (ci->HasFlag(CI_RESTRICTED) != message.post_data.count("restricted")) + if (ci->HasExt("RESTRICTED") != message.post_data.count("restricted")) { - if (!ci->HasFlag(CI_RESTRICTED)) - ci->SetFlag(CI_RESTRICTED); + if (!ci->HasExt("RESTRICTED")) + ci->ExtendMetadata("RESTRICTED"); else - ci->UnsetFlag(CI_RESTRICTED); + ci->Shrink("RESTRICTED"); replacements["MESSAGES"] = "Restricted updated"; } - if (ci->HasFlag(CI_SECURE) != message.post_data.count("secure")) + if (ci->HasExt("SECURE") != message.post_data.count("secure")) { - if (!ci->HasFlag(CI_SECURE)) - ci->SetFlag(CI_SECURE); + if (!ci->HasExt("SECURE")) + ci->ExtendMetadata("SECURE"); else - ci->UnsetFlag(CI_SECURE); + ci->Shrink("SECURE"); replacements["MESSAGES"] = "Secure updated"; } - if (ci->HasFlag(CI_SECUREOPS) != message.post_data.count("secureops")) + if (ci->HasExt("SECUREOPS") != message.post_data.count("secureops")) { - if (!ci->HasFlag(CI_SECUREOPS)) - ci->SetFlag(CI_SECUREOPS); + if (!ci->HasExt("SECUREOPS")) + ci->ExtendMetadata("SECUREOPS"); else - ci->UnsetFlag(CI_SECUREOPS); + ci->Shrink("SECUREOPS"); replacements["MESSAGES"] = "Secureops updated"; } - if (ci->HasFlag(CI_TOPICLOCK) != message.post_data.count("topiclock")) + if (ci->HasExt("TOPICLOCK") != message.post_data.count("topiclock")) { - if (!ci->HasFlag(CI_TOPICLOCK)) - ci->SetFlag(CI_TOPICLOCK); + if (!ci->HasExt("TOPICLOCK")) + ci->ExtendMetadata("TOPICLOCK"); else - ci->UnsetFlag(CI_TOPICLOCK); + ci->Shrink("TOPICLOCK"); replacements["MESSAGES"] = "Topiclock updated"; } } @@ -102,25 +102,25 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri replacements["LAST_TOPIC_SETTER"] = HTTPUtils::Escape(ci->last_topic_setter); } - if (ci->HasFlag(CI_KEEPTOPIC)) + if (ci->HasExt("KEEPTOPIC")) replacements["KEEPTOPIC"]; - if (ci->HasFlag(CI_PEACE)) + if (ci->HasExt("PEACE")) replacements["PEACE"]; - if (ci->HasFlag(CI_PRIVATE)) + if (ci->HasExt("PRIVATE")) replacements["PRIVATE"]; - if (ci->HasFlag(CI_RESTRICTED)) + if (ci->HasExt("RESTRICTED")) replacements["RESTRICTED"]; - if (ci->HasFlag(CI_SECURE)) + if (ci->HasExt("SECURE")) replacements["SECURE"]; - if (ci->HasFlag(CI_SECUREOPS)) + if (ci->HasExt("SECUREOPS")) replacements["SECUREOPS"]; - if (ci->HasFlag(CI_TOPICLOCK)) + if (ci->HasExt("TOPICLOCK")) replacements["TOPICLOCK"]; TemplateFileServer page("chanserv/set.html"); diff --git a/modules/extra/webcpanel/pages/memoserv/memos.cpp b/modules/extra/webcpanel/pages/memoserv/memos.cpp index 7d0dfcecb..9fa36d3c4 100644 --- a/modules/extra/webcpanel/pages/memoserv/memos.cpp +++ b/modules/extra/webcpanel/pages/memoserv/memos.cpp @@ -93,13 +93,9 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st } if (!error && message.get_data["read"] == "1") - { - m->UnsetFlag(MF_UNREAD); - } + m->unread = false; else if (!error && message.get_data["read"] == "2") - { - m->SetFlag(MF_UNREAD); - } + m->unread = true; } for (unsigned i = 0; i < mi->memos->size(); ++i) @@ -109,7 +105,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st replacements["SENDER"] = m->sender; replacements["TIME"] = Anope::strftime(m->time); replacements["TEXT"] = m->text; - if (m->HasFlag(MF_UNREAD)) + if (m->unread) replacements["UNREAD"] = "YES"; else replacements["UNREAD"] = "NO"; diff --git a/modules/extra/webcpanel/pages/nickserv/alist.cpp b/modules/extra/webcpanel/pages/nickserv/alist.cpp index e3fe59ff1..0afe2a4f3 100644 --- a/modules/extra/webcpanel/pages/nickserv/alist.cpp +++ b/modules/extra/webcpanel/pages/nickserv/alist.cpp @@ -24,7 +24,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st ++chan_count; replacements["NUMBERS"] = stringify(chan_count); - replacements["CHANNELS"] = (ci->HasFlag(CI_NO_EXPIRE) ? "!" : "") + ci->name; + replacements["CHANNELS"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name; replacements["ACCESSES"] = "Founder"; continue; } @@ -36,7 +36,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st ++chan_count; replacements["NUMBERS"] = stringify(chan_count); - replacements["CHANNELS"] = (ci->HasFlag(CI_NO_EXPIRE) ? "!" : "") + ci->name; + replacements["CHANNELS"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name; Anope::string access_str; for (unsigned i = 0; i < access.size(); ++i) access_str += ", " + access[i]->AccessSerialize(); diff --git a/modules/extra/webcpanel/pages/nickserv/info.cpp b/modules/extra/webcpanel/pages/nickserv/info.cpp index e83768387..35a4a8a0a 100644 --- a/modules/extra/webcpanel/pages/nickserv/info.cpp +++ b/modules/extra/webcpanel/pages/nickserv/info.cpp @@ -36,46 +36,46 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str replacements["MESSAGES"] = "Greet updated"; } } - if (na->nc->HasFlag(NI_AUTOOP) != message.post_data.count("autoop")) + if (na->nc->HasExt("AUTOOP") != message.post_data.count("autoop")) { - if (!na->nc->HasFlag(NI_AUTOOP)) - na->nc->SetFlag(NI_AUTOOP); + if (!na->nc->HasExt("AUTOOP")) + na->nc->ExtendMetadata("AUTOOP"); else - na->nc->UnsetFlag(NI_AUTOOP); + na->nc->Shrink("AUTOOP"); replacements["MESSAGES"] = "Autoop updated"; } - if (na->nc->HasFlag(NI_PRIVATE) != message.post_data.count("private")) + if (na->nc->HasExt("PRIVATE") != message.post_data.count("private")) { - if (!na->nc->HasFlag(NI_PRIVATE)) - na->nc->SetFlag(NI_PRIVATE); + if (!na->nc->HasExt("PRIVATE")) + na->nc->ExtendMetadata("PRIVATE"); else - na->nc->UnsetFlag(NI_PRIVATE); + na->nc->Shrink("PRIVATE"); replacements["MESSAGES"] = "Private updated"; } - if (na->nc->HasFlag(NI_SECURE) != message.post_data.count("secure")) + if (na->nc->HasExt("SECURE") != message.post_data.count("secure")) { - if (!na->nc->HasFlag(NI_SECURE)) - na->nc->SetFlag(NI_SECURE); + if (!na->nc->HasExt("SECURE")) + na->nc->ExtendMetadata("SECURE"); else - na->nc->UnsetFlag(NI_SECURE); + na->nc->Shrink("SECURE"); replacements["MESSAGES"] = "Secure updated"; } - if (message.post_data["kill"] == "on" && !na->nc->HasFlag(NI_KILLPROTECT)) + if (message.post_data["kill"] == "on" && !na->nc->HasExt("KILLPROTECT")) { - na->nc->SetFlag(NI_KILLPROTECT); - na->nc->UnsetFlag(NI_KILL_QUICK); + na->nc->ExtendMetadata("KILLPROTECT"); + na->nc->Shrink("KILL_QUICK"); replacements["MESSAGES"] = "Kill updated"; } - else if (message.post_data["kill"] == "quick" && !na->nc->HasFlag(NI_KILL_QUICK)) + else if (message.post_data["kill"] == "quick" && !na->nc->HasExt("KILL_QUICK")) { - na->nc->UnsetFlag(NI_KILLPROTECT); - na->nc->SetFlag(NI_KILL_QUICK); + na->nc->Shrink("KILLPROTECT"); + na->nc->ExtendMetadata("KILL_QUICK"); replacements["MESSAGES"] = "Kill updated"; } - else if (message.post_data["kill"] == "off" && (na->nc->HasFlag(NI_KILLPROTECT) || na->nc->HasFlag(NI_KILL_QUICK))) + else if (message.post_data["kill"] == "off" && (na->nc->HasExt("KILLPROTECT") || na->nc->HasExt("KILL_QUICK"))) { - na->nc->UnsetFlag(NI_KILLPROTECT); - na->nc->UnsetFlag(NI_KILL_QUICK); + na->nc->Shrink("KILLPROTECT"); + na->nc->Shrink("KILL_QUICK"); replacements["MESSAGES"] = "Kill updated"; } } @@ -92,17 +92,17 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str replacements["VHOST"] = na->GetVhostHost(); } replacements["GREET"] = HTTPUtils::Escape(na->nc->greet); - if (na->nc->HasFlag(NI_AUTOOP)) + if (na->nc->HasExt("AUTOOP")) replacements["AUTOOP"]; - if (na->nc->HasFlag(NI_PRIVATE)) + if (na->nc->HasExt("PRIVATE")) replacements["PRIVATE"]; - if (na->nc->HasFlag(NI_SECURE)) + if (na->nc->HasExt("SECURE")) replacements["SECURE"]; - if (na->nc->HasFlag(NI_KILLPROTECT)) + if (na->nc->HasExt("KILLPROTECT")) replacements["KILL_ON"]; - if (na->nc->HasFlag(NI_KILL_QUICK)) + if (na->nc->HasExt("KILL_QUICK")) replacements["KILL_QUICK"]; - if (!na->nc->HasFlag(NI_KILLPROTECT) && !na->nc->HasFlag(NI_KILL_QUICK)) + if (!na->nc->HasExt("KILLPROTECT") && !na->nc->HasExt("KILL_QUICK")) replacements["KILL_OFF"]; TemplateFileServer page("nickserv/info.html"); -- cgit