diff options
Diffstat (limited to 'modules/m_xmlrpc.cpp')
| -rw-r--r-- | modules/m_xmlrpc.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/modules/m_xmlrpc.cpp b/modules/m_xmlrpc.cpp index 5717d7ec7..2ced4bca9 100644 --- a/modules/m_xmlrpc.cpp +++ b/modules/m_xmlrpc.cpp @@ -39,12 +39,12 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage public: MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname) : XMLRPCServiceInterface(creator, sname), HTTPPage("/xmlrpc", "text/xml") { } - void Register(XMLRPCEvent *event) anope_override + void Register(XMLRPCEvent *event) override { this->events.push_back(event); } - void Unregister(XMLRPCEvent *event) anope_override + void Unregister(XMLRPCEvent *event) override { std::deque<XMLRPCEvent *>::iterator it = std::find(this->events.begin(), this->events.end(), event); @@ -52,7 +52,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage this->events.erase(it); } - Anope::string Sanitize(const Anope::string &string) anope_override + Anope::string Sanitize(const Anope::string &string) override { Anope::string ret = string; for (int i = 0; special[i].character.empty() == false; ++i) @@ -145,7 +145,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage } public: - bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) anope_override + bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) override { Anope::string content = message.content, tname, data; XMLRPCRequest request(reply); @@ -164,10 +164,8 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage request.data.push_back(data); } - for (unsigned i = 0; i < this->events.size(); ++i) + for (auto *e : this->events) { - XMLRPCEvent *e = this->events[i]; - if (!e->Run(this, client, request)) return false; else if (!request.get_replies().empty()) @@ -182,14 +180,14 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage return true; } - void Reply(XMLRPCRequest &request) anope_override + void Reply(XMLRPCRequest &request) override { if (!request.id.empty()) request.reply("id", request.id); Anope::string r = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<methodResponse>\n<params>\n<param>\n<value>\n<struct>\n"; - for (std::map<Anope::string, Anope::string>::const_iterator it = request.get_replies().begin(); it != request.get_replies().end(); ++it) - r += "<member>\n<name>" + it->first + "</name>\n<value>\n<string>" + this->Sanitize(it->second) + "</string>\n</value>\n</member>\n"; + for (const auto &[name, value] : request.get_replies()) + r += "<member>\n<name>" + name + "</name>\n<value>\n<string>" + this->Sanitize(value) + "</string>\n</value>\n</member>\n"; r += "</struct>\n</value>\n</param>\n</params>\n</methodResponse>"; request.r.Write(r); @@ -208,13 +206,13 @@ class ModuleXMLRPC : public Module } - ~ModuleXMLRPC() + ~ModuleXMLRPC() override { if (httpref) httpref->UnregisterPage(&xmlrpcinterface); } - void OnReload(Configuration::Conf *conf) anope_override + void OnReload(Configuration::Conf *conf) override { if (httpref) httpref->UnregisterPage(&xmlrpcinterface); |