X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibottler.cpp;h=8d4931e3b17e8ff66359d6d164d3b024d1fad09c;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=27225edac9df49df6d0cf06c9878d663718b92e3;hpb=6ea84e21f87606058bc88a6083932f4876ef07e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 27225edac..8d4931e3b 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Changes the ident of connecting bottler clients to 'bottler' */
@@ -21,28 +18,25 @@
 class ModuleAntiBottler : public Module
 {
  public:
-	ModuleAntiBottler(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-		
-	}
+	ModuleAntiBottler()
+			{
 
-	void Implements(char* List)
-	{
-		List[I_OnPreCommand] = 1;
+		Implementation eventlist[] = { I_OnPreCommand };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	
+
+
 	virtual ~ModuleAntiBottler()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Changes the ident of connecting bottler clients to 'bottler'",VF_VENDOR,API_VERSION);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
 		char data[MAXBUF];
 		strlcpy(data,original_line.c_str(),MAXBUF);
@@ -53,15 +47,15 @@ class ModuleAntiBottler : public Module
 			{
 				if (*j == ':')
 					break;
-					
+
 				if (*j == '"')
 				{
 					not_bottler = true;
 				}
 			}
 			// Bug Fix (#14) -- FCS
-			if (!(data) || !(*data))
-				return 0;
+			if (!*data)
+				return MOD_RES_PASSTHRU;
 
 			strtok(data," ");
 			char *ident = strtok(NULL," ");
@@ -70,7 +64,7 @@ class ModuleAntiBottler : public Module
 			char *gecos = strtok(NULL,"\r\n");
 
 			if (!ident || !local || !remote || !gecos)
-				return 0;
+				return MOD_RES_PASSTHRU;
 
 			for (char* j = remote; *j; j++)
 			{
@@ -83,41 +77,17 @@ class ModuleAntiBottler : public Module
 			if (!not_bottler)
 			{
 				std::string strgecos = std::string(gecos) + "[Possible bottler, ident: " + std::string(ident) + "]";
-				const char* modified[3];
-				modified[0] = "bottler";
-				modified[1] = local;
-				modified[2] = remote;
-				modified[3] = strgecos.c_str();
-				ServerInstance->Parser->CallHandler("USER", modified, 4, user);
-				return 1;
+				std::vector<std::string> modified;
+				modified.push_back("bottler");
+				modified.push_back(local);
+				modified.push_back(remote);
+				modified.push_back(strgecos);
+				ServerInstance->Parser->CallHandler("USER", modified, user);
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
  	}
 };
 
-
-class ModuleAntiBottlerFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBottlerFactory()
-	{
-	}
-	
-	~ModuleAntiBottlerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAntiBottler(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleAntiBottlerFactory;
-}
-
+MODULE_INIT(ModuleAntiBottler)