X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=0806b2d56b1094fad9f327879a405be5e117368f;hb=8e8445d1c0744130f232d3c6f56d5fe1079773ad;hp=f3f5d537ac65b6efa5eb311354f9b101c6331dec;hpb=40e990ed06126c1ba6164738527127d1f58fc032;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index f3f5d537a..0806b2d56 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,36 +2,25 @@
  *       | 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-2008 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 "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
-
-
 class NoKicks : public ModeHandler
 {
  public:
 	NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -62,19 +51,18 @@ class ModuleNoKicks : public Module
  public:
  
 	ModuleNoKicks(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nk = new NoKicks(ServerInstance);
-		ServerInstance->AddMode(nk, 'Q');
+		if (!ServerInstance->Modes->AddMode(nk))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnAccessCheck };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnAccessCheck] = 1;
-	}
 
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
 		if (access_type == AC_KICK)
 		{
@@ -88,7 +76,7 @@ class ModuleNoKicks : public Module
 				else
 				{
 					// nobody else can (not even opers with override, and founders)
-					source->WriteServ("484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
+					source->WriteNumeric(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
 					return ACR_DENY;
 				}
 			}
@@ -99,37 +87,14 @@ class ModuleNoKicks : public Module
 	virtual ~ModuleNoKicks()
 	{
 		ServerInstance->Modes->DelMode(nk);
-		DELETE(nk);
+		delete nk;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
-	}
-};
-
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
-	{
-	}
-	
-	~ModuleNoKicksFactory()
-	{
+		return Version(1,2,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)