X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noinvite.cpp;h=34f33f40af86b113dcb53db17af6efd50cbc3048;hb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;hp=cb1597527034a0b2d48375e66f3c2f996691eca7;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index cb1597527..34f33f40a 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -16,17 +16,13 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
-extern InspIRCd* ServerInstance;
-
 class NoInvite : public ModeHandler
 {
  public:
@@ -57,67 +53,58 @@ class NoInvite : public ModeHandler
 
 class ModuleNoInvite : public Module
 {
-	
 	NoInvite *ni;
-	
-	public:
- 
-		ModuleNoInvite(InspIRCd* Me) : Module::Module(Me)
-		{
-			
-			ni = new NoInvite(ServerInstance);
-			ServerInstance->AddMode(ni, 'V');
-		}
-
-		void Implements(char* List)
-		{
-			List[I_On005Numeric] = List[I_OnUserPreInvite] = 1;
-		}
+ public:
 
-		virtual void On005Numeric(std::string &output)
-		{
-			ServerInstance->ModeGrok->InsertMode(output,"V",4);
-		}
+	ModuleNoInvite(InspIRCd* Me) : Module::Module(Me)
+	{
+		ni = new NoInvite(ServerInstance);
+		ServerInstance->AddMode(ni, 'V');
+	}
 
+	void Implements(char* List)
+	{
+		List[I_OnUserPreInvite] = 1;
+	}
 
-		virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+	virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+	{
+		if (channel->IsModeSet('V'))
 		{
-			if (channel->IsModeSet('V'))
-			{
-				user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
-				return 1;
-			}
-			return 0;
+			user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+			return 1;
 		}
+		return 0;
+	}
 
-		virtual ~ModuleNoInvite()
-		{
-			DELETE(ni);
-		}
+	virtual ~ModuleNoInvite()
+	{
+		ServerInstance->Modes->DelMode(ni);
+		DELETE(ni);
+	}
 	
-		virtual Version GetVersion()
-		{
-			return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-		}
+	virtual Version GetVersion()
+	{
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+	}
 };
 
 
 class ModuleNoInviteFactory : public ModuleFactory
 {
-	public:
-		ModuleNoInviteFactory()
-		{
-		}
-	
-		~ModuleNoInviteFactory()
-		{
-		}
-	
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleNoInvite(Me);
-		}
-	
+ public:
+	ModuleNoInviteFactory()
+	{
+	}
+
+	~ModuleNoInviteFactory()
+	{
+	}
+
+	virtual Module * CreateModule(InspIRCd* Me)
+	{
+		return new ModuleNoInvite(Me);
+	}
 };