X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_gecosban.cpp;h=db62663b1d698b2a2e9a83342da2686f18d13816;hb=ad797e3a77c69791c02db6d238817d3e23821dec;hp=9b449da06a05477df15fad97ab525696b882ff43;hpb=e3f22fcf31cd2e789d1be90cf0edf3e82829b54e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 9b449da06..db62663b1 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -1,6 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2015 Renegade334 <contact.caaeed4f@renegade334.me.uk>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -24,21 +30,40 @@ class ModuleGecosBan : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Extban 'r' - real name ban", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Adds the r: extended ban which checks whether users have a real name (gecos) matching the specified glob pattern.", 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->fullname, 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');
 	}
 };