X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=901aac06c97efd4f1d7c44fdf1fba22cb5e9d47a;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=be06cd79cbcdfddb9b03df3fd1c5d1cddc622adb;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index be06cd79c..901aac06c 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -20,12 +20,11 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
-extern InspIRCd* ServerInstance;
+
 
 class NoKicks : public ModeHandler
 {
@@ -57,27 +56,22 @@ class NoKicks : public ModeHandler
 
 class ModuleNoKicks : public Module
 {
-	Server *Srv;
+	
 	NoKicks* nk;
 	
  public:
  
-	ModuleNoKicks(Server* Me)
+	ModuleNoKicks(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		nk = new NoKicks(ServerInstance);
-		Srv->AddMode(nk, 'Q');
+		ServerInstance->AddMode(nk, 'Q');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnAccessCheck] = 1;
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->ModeGrok->InsertMode(output,"Q",4);
+		List[I_OnAccessCheck] = 1;
 	}
 
 	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
@@ -86,7 +80,7 @@ class ModuleNoKicks : public Module
 		{
 			if (channel->IsModeSet('Q'))
 			{
-				if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
+				if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
 				{
 					// ulines can still kick with +Q in place
 					return ACR_ALLOW;
@@ -104,12 +98,13 @@ class ModuleNoKicks : public Module
 
 	virtual ~ModuleNoKicks()
 	{
+		ServerInstance->Modes->DelMode(nk);
 		DELETE(nk);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
@@ -125,7 +120,7 @@ class ModuleNoKicksFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleNoKicks(Me);
 	}