diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/os_stats.cpp | 7 | ||||
| -rw-r--r-- | modules/extra/m_xmlrpc_main.cpp | 7 | ||||
| -rw-r--r-- | modules/protocol/bahamut.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/inspircd11.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/inspircd12.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/inspircd20.cpp | 2 |
6 files changed, 10 insertions, 12 deletions
diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp index 813e59f5f..8f41947a6 100644 --- a/modules/commands/os_stats.cpp +++ b/modules/commands/os_stats.cpp @@ -122,11 +122,8 @@ class CommandOSStats : public Command void DoStatsUplink(CommandSource &source) { Anope::string buf; - - for (unsigned j = 0; !Capab_Info[j].Token.empty(); ++j) - if (Capab.HasFlag(Capab_Info[j].Flag)) - buf += " " + Capab_Info[j].Token; - + for (std::set<Anope::string>::iterator it = Capab.begin(); it != Capab.end(); ++it) + buf += *it; if (!buf.empty()) buf.erase(buf.begin()); diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp index a8294b576..98677761c 100644 --- a/modules/extra/m_xmlrpc_main.cpp +++ b/modules/extra/m_xmlrpc_main.cpp @@ -135,9 +135,10 @@ class MyXMLRPCEvent : public XMLRPCEvent request->reply("uplinkname", Me->GetLinks().front()->GetName()); { Anope::string buf; - for (unsigned j = 0; !Capab_Info[j].Token.empty(); ++j) - if (Capab.HasFlag(Capab_Info[j].Flag)) - buf += " " + Capab_Info[j].Token; + for (std::set<Anope::string>::iterator it = Capab.begin(); it != Capab.end(); ++it) + buf += " " + *it; + if (!buf.empty()) + buf.erase(buf.begin()); request->reply("uplinkcapab", buf); } request->reply("usercount", stringify(usercnt)); diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index c4b7b1bf0..b4e4467dc 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -49,7 +49,7 @@ class BahamutIRCdProto : public IRCDProto { void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) { - if (Capab.HasFlag(CAPAB_TSMODE)) + if (Capab.count("TSMODE") > 0) UplinkSocket::Message(source ? source->nick : Config->ServerName) << "MODE " << dest->name << " " << dest->creation_time << " " << buf; else UplinkSocket::Message(source ? source->nick : Config->ServerName) << "MODE " << dest->name << " " << buf; diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index adb6ee1fa..63fd7e754 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -921,7 +921,7 @@ class ProtoInspIRCd : public Module pmodule_ircd_proto(&this->ircd_proto); pmodule_ircd_message(&this->ircd_message); - Capab.SetFlag(CAPAB_NOQUIT); + Capab.insert("NOQUIT"); this->AddModes(); diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 1af63c37b..438955bb5 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -712,7 +712,7 @@ class ProtoInspIRCd : public Module pmodule_ircd_proto(&this->ircd_proto); pmodule_ircd_message(&this->ircd_message); - Capab.SetFlag(CAPAB_NOQUIT); + Capab.insert("NOQUIT"); Implementation i[] = { I_OnUserNickChange, I_OnServerSync }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 1e1eff8fd..a3db7f7a3 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -725,7 +725,7 @@ class ProtoInspIRCd : public Module pmodule_ircd_proto(&this->ircd_proto); pmodule_ircd_message(&this->ircd_message); - Capab.SetFlag(CAPAB_NOQUIT); + Capab.insert("NOQUIT"); Implementation i[] = { I_OnUserNickChange, I_OnServerSync }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); |