X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nopartmsg.cpp;h=bd738a2da24b6bbe419888e7e546cd81d12133e6;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=19d2206d97dfe0ece7c00f7ba515bf317af6ac67;hpb=08496283c0d472e452b790671cb7d82df43a5bc7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index 19d2206d9..bd738a2da 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -1,60 +1,51 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   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 p: - part message bans */
+#include "inspircd.h"
 
 class ModulePartMsgBan : public Module
 {
- private:
  public:
-	ModulePartMsgBan(InspIRCd* Me) : Module(Me)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		Implementation eventlist[] = { I_OnUserPart, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		return Version("Adds the p: extended ban which blocks the part message of matching users.", VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	virtual ~ModulePartMsgBan()
+	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE
 	{
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
-	}
-
-
-	virtual void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
-	{
-		if (!IS_LOCAL(user))
+		if (!IS_LOCAL(memb->user))
 			return;
 
-		if (channel->IsExtBanned(user, 'p'))
-			partmessage = "";
-
-		return;
+		if (memb->chan->GetExtBanStatus(memb->user, 'p') == MOD_RES_DENY)
+			partmessage.clear();
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		if (output.find(" EXTBAN=:") == std::string::npos)
-			output.append(" EXTBAN=:p");
-		else
-			output.insert(output.find(" EXTBAN=:") + 9, "p");
+		tokens["EXTBAN"].push_back('p');
 	}
 };
 
-
 MODULE_INIT(ModulePartMsgBan)
-