X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=9daa4c66bfffbaeebcf65e3c1942375002caf189;hb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;hp=121bb63ebb30bda026c6185497658e9fa7e91a37;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 121bb63eb..9daa4c66b 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,63 +2,51 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
  * ---------------------------------------------------
  */
 
-#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 SimpleChannelModeHandler
+{
+ public:
+	NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
+};
+
 class ModuleNoKicks : public Module
 {
-	Server *Srv;
+	
+	NoKicks* nk;
 	
  public:
  
-	ModuleNoKicks()
+	ModuleNoKicks(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
+		
+		nk = new NoKicks(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(nk))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnAccessCheck };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "Q";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-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)
 		{
-			if (channel->IsCustomModeSet('Q'))
+			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;
@@ -66,60 +54,25 @@ class ModuleNoKicks : public Module
 				else
 				{
 					// nobody else can (not even opers with override, and founders)
-					WriteServ(source->fd,"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;
 				}
 			}
 		}
 		return ACR_DEFAULT;
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'Q') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
 
 	virtual ~ModuleNoKicks()
 	{
-		delete Srv;
+		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()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoKicks;
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)