Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_serverban.cpp

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index ec38b475482d1634f6d2b41dd9962c1fd5d60015..bd512f58bb23e3d7de5228137f878d9d29dc5b30 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -19,42 +19,28 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements extban +b s: - server name bans */
-
 class ModuleServerBan : public Module
 {
- private:
  public:
-       ModuleServerBan()       {
-               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-       ~ModuleServerBan()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR);
+               return Version("Provides extban 's' to ban users connected to a specified server", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
                if ((mask.length() > 2) && (mask[0] == 's') && (mask[1] == ':'))
                {
-                       if (InspIRCd::Match(user->server, mask.substr(2)))
+                       if (InspIRCd::Match(user->server->GetName(), mask.substr(2)))
                                return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('s');
+               tokens["EXTBAN"].push_back('s');
        }
 };
 
-
 MODULE_INIT(ModuleServerBan)
-