1 files changed, 26 insertions, 19 deletions

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 1497c1b87..09f3c9dc7 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -19,39 +19,46 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements extban +b r: - realname (gecos) bans */
-
 class ModuleGecosBan : public Module
 {
  public:
-	void init()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		return Version("Provides a way to ban users by their real name with the 'a' and 'r' extbans", VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	~ModuleGecosBan()
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
-	}
+		if ((mask.length() > 2) && (mask[1] == ':'))
+		{
+			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;
 
-	Version GetVersion()
-	{
-		return Version("Extban 'r' - realname (gecos) ban", VF_OPTCOMMON|VF_VENDOR);
-	}
+				// Check whether the user's mask matches.
+				if (!c->CheckBan(user, mask.substr(2, divider - 2)))
+					return MOD_RES_PASSTHRU;
 
-	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
-	{
-		if ((mask.length() > 2) && (mask[0] == 'r') && (mask[1] == ':'))
-		{
-			if (InspIRCd::Match(user->fullname, mask.substr(2)))
-				return MOD_RES_DENY;
+				// 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::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('r');
+		tokens["EXTBAN"].push_back('a');
+		tokens["EXTBAN"].push_back('r');
 	}
 };