Add extban 'a' to m_gecosban.

[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 ae399a81f713375ffae6c982dcd9ff2d074e6fd3..09f3c9dc7f4870fcfb0aa33b40cb8547b76153e8 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -24,21 +24,40 @@ class ModuleGecosBan : public Module
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Extban 'r' - real name ban", VF_OPTCOMMON|VF_VENDOR);
+               return Version("Provides a way to ban users by their real name with the 'a' and 'r' extbans", VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
-               if ((mask.length() > 2) && (mask[0] == 'r') && (mask[1] == ':'))
+               if ((mask.length() > 2) && (mask[1] == ':'))
                {
-                       if (InspIRCd::Match(user->GetRealName(), mask.substr(2)))
-                               return MOD_RES_DENY;
+                       if (mask[0] == 'r')
+                       {
+                               if (InspIRCd::Match(user->GetRealName(), mask.substr(2)))
+                                       return MOD_RES_DENY;
+                       }
+                       else if (mask[0] == 'a')
+                       {
+                               // Check that the user actually specified a real name.
+                               const size_t divider = mask.find('+', 1);
+                               if (divider == std::string::npos)
+                                       return MOD_RES_PASSTHRU;
+
+                               // Check whether the user's mask matches.
+                               if (!c->CheckBan(user, mask.substr(2, divider - 2)))
+                                       return MOD_RES_PASSTHRU;
+
+                               // Check whether the user's real name matches.
+                               if (InspIRCd::Match(user->GetRealName(), mask.substr(divider + 1)))
+                                       return MOD_RES_DENY;
+                       }
                }
                return MOD_RES_PASSTHRU;
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
+               tokens["EXTBAN"].push_back('a');
                tokens["EXTBAN"].push_back('r');
        }
 };