X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_allowinvite.cpp;h=0ec9359da2966c80b2bcc1da7976ee2686dc9947;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=cbab0bd2f1d94a81a1fd8392b84108bb6c26d006;hpb=bd12e3a4e6501496f6eeb7aeb5245162020d6e6c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index cbab0bd2f..0ec9359da 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -1,68 +1,69 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Matt Smith <dz@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: Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it) */
 
-class AllowInvite : public SimpleChannelModeHandler
-{
- public:
-	AllowInvite(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'A') { }
-};
+#include "inspircd.h"
 
 class ModuleAllowInvite : public Module
 {
-	AllowInvite *ni;
+	SimpleChannelModeHandler ni;
  public:
 
-	ModuleAllowInvite(InspIRCd* Me) : Module(Me)
+	ModuleAllowInvite()
+		: ni(this, "allowinvite", 'A')
 	{
-		ni = new AllowInvite(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(ni))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('A');
+		tokens["EXTBAN"].push_back('A');
 	}
 
-	virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
+	ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE
 	{
 		if (IS_LOCAL(user))
 		{
-			if (channel->IsModeSet('A') && channel->GetExtBanStatus(user, 'A') < 0)
+			ModResult res = channel->GetExtBanStatus(user, 'A');
+			if (res == MOD_RES_DENY)
+			{
+				// Matching extban, explicitly deny /invite
+				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You are banned from using INVITE");
+				return res;
+			}
+			if (channel->IsModeSet(ni) || res == MOD_RES_ALLOW)
 			{
 				// Explicitly allow /invite
-				return -1;
+				return MOD_RES_ALLOW;
 			}
 		}
 
-		return 0;
-	}
-
-	virtual ~ModuleAllowInvite()
-	{
-		ServerInstance->Modes->DelMode(ni);
-		delete ni;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Adds channel mode A (allowinvite) which allows unprivileged users to use the /INVITE command and extended ban A which bans specific masks from using the /INVITE command.", VF_VENDOR);
 	}
 };