m_remove Recognize /REMOVE <chan> <nick>

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

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index e7eca6d8fd20a7ac4a8f6561ef4fda7e8c7992e0..a15f1941844ae04e79a349d7ba54beed1eca7981 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -19,29 +19,17 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements extban +b r: - realname (gecos) bans */
-
 class ModuleGecosBan : public Module
 {
  public:
-       ModuleGecosBan()
-       {
-               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-       ~ModuleGecosBan()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Extban 'r' - realname (gecos) ban", 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[0] == 'r' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 'r') && (mask[1] == ':'))
                {
                        if (InspIRCd::Match(user->fullname, mask.substr(2)))
                                return MOD_RES_DENY;
@@ -49,9 +37,9 @@ class ModuleGecosBan : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('r');
+               tokens["EXTBAN"].push_back('r');
        }
 };