X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_gecosban.cpp;h=09f3c9dc7f4870fcfb0aa33b40cb8547b76153e8;hb=4995417f59c91cf62c13f1d1dcfdbf4f67714b83;hp=9d1550b38c6f7893770f5fea953ad98b56af4a04;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 9d1550b38..09f3c9dc7 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -1,54 +1,65 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Implements extban +b r: - realname (gecos) bans */
+#include "inspircd.h"
 
 class ModuleGecosBan : public Module
 {
- private:
  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_COMMON|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)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
-		if (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::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');
 	}
 };
 
-
 MODULE_INIT(ModuleGecosBan)
-