X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_allowinvite.cpp;h=0de9925015184107406cd975a44b98344a3f0c09;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;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..0de992501 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -18,18 +18,17 @@
 class AllowInvite : public SimpleChannelModeHandler
 {
  public:
-	AllowInvite(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'A') { }
+	AllowInvite(Module* Creator) : SimpleChannelModeHandler(Creator, '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))
+		if (!ServerInstance->Modes->AddMode(&ni))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -40,29 +39,35 @@ 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;
+		ServerInstance->Modes->DelMode(&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 allow specific users it)",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };