X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_allowinvite.cpp;h=08a5f542aeab68ac8e36e6b469cc615e015d1989;hb=91c34d4e971dcc9370d205ff6d8189cd92f1d556;hp=8e39ad9c63eefbd23d78380bce38fd2961f4460a;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 8e39ad9c6..08a5f542a 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -1,38 +1,46 @@
-/*       +------------------------------------+
- *       | 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: Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it) */
+/* $ModDesc: Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it */
 
 class AllowInvite : public SimpleChannelModeHandler
 {
  public:
-	AllowInvite(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'A') { }
+	AllowInvite(Module* Creator) : SimpleChannelModeHandler(Creator, "allowinvite", 'A') { }
 };
 
 class ModuleAllowInvite : public Module
 {
-	AllowInvite *ni;
+	AllowInvite ni;
  public:
 
-	ModuleAllowInvite(InspIRCd* Me) : Module(Me)
+	ModuleAllowInvite() : ni(this)
 	{
-		ni = new AllowInvite(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(ni))
-			throw ModuleException("Could not add new modes!");
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(ni);
 		Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -40,29 +48,34 @@ class ModuleAllowInvite : public Module
 		ServerInstance->AddExtBanChar('A');
 	}
 
-	virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
+	virtual ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
 	{
 		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, "%s %s :You are banned from using INVITE", user->nick.c_str(), channel->name.c_str());
+				return res;
+			}
+			if (channel->IsModeSet('A') || res == MOD_RES_ALLOW)
 			{
 				// Explicitly allow /invite
-				return -1;
+				return MOD_RES_ALLOW;
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ~ModuleAllowInvite()
 	{
-		ServerInstance->Modes->DelMode(ni);
-		delete ni;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR);
 	}
 };