X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=93ab2bd1daea88e67443555dc4014b81926c2352;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=0d7ad81da13ddecc6cc1362d56498c33d7239c4c;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 0d7ad81da..93ab2bd1d 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,31 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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 +Q */
 
-extern InspIRCd* ServerInstance;
-
 class NoKicks : public ModeHandler
 {
  public:
@@ -63,21 +51,17 @@ class ModuleNoKicks : public Module
  public:
  
 	ModuleNoKicks(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nk = new NoKicks(ServerInstance);
-		ServerInstance->AddMode(nk, 'Q');
+		if (!ServerInstance->AddMode(nk, 'Q'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	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 +70,7 @@ class ModuleNoKicks : public Module
 		{
 			if (channel->IsModeSet('Q'))
 			{
-				if ((ServerInstance->IsUlined(source->nick)) || (ServerInstance->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,37 +88,15 @@ 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);
-	}
-};
-
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
-	{
-	}
-	
-	~ModuleNoKicksFactory()
-	{
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoKicks(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)