X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibottler.cpp;h=9831730eff442c79d4af4dc34568f0d122fbab38;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=89effc607c3de76fec2a2c4afe41ba71525e6dd2;hpb=9fd6aff54fa4b554a45841e2f13b401cb34466ab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 89effc607..9831730ef 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -2,41 +2,30 @@
  *       | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Changes the ident of connecting bottler clients to 'bottler' */
 
 class ModuleAntiBottler : public Module
 {
- private:
-	 
-	 Server *Srv;
  public:
-	ModuleAntiBottler(Server* Me)
-		: Module::Module(Me)
+	ModuleAntiBottler(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
+		
+		Implementation eventlist[] = { I_OnPreCommand };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-        void Implements(char* List)
-        {
-                List[I_OnServerRaw] = 1;
-        }
 
 	
 	virtual ~ModuleAntiBottler()
@@ -45,81 +34,61 @@ class ModuleAntiBottler : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
+	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
-		if (inbound)
+		char data[MAXBUF];
+		strlcpy(data,original_line.c_str(),MAXBUF);
+		bool not_bottler = false;
+		if (!strncmp(data,"user ",5))
 		{
-			char data[MAXBUF];
-			strlcpy(data,raw.c_str(),MAXBUF);
-			bool not_bottler = false;
-			if (!strncmp(data,"user ",5))
+			for (char* j = data; *j; j++)
 			{
-				for (char* j = data; *j; j++)
+				if (*j == ':')
+					break;
+					
+				if (*j == '"')
 				{
-					if (*j == ':')
-						break;
-						
-					if (*j == '"')
-					{
-						not_bottler = true;
-					}
+					not_bottler = true;
 				}
-				// Bug Fix (#14) -- FCS
-
-				if (!(data) || !(*data))
-					return;
+			}
+			// Bug Fix (#14) -- FCS
+			if (!*data)
+				return 0;
 
-				strtok(data," ");
-				char *ident = strtok(NULL," ");
-				char *local = strtok(NULL," ");
-				char *remote = strtok(NULL," :");
-				char *gecos = strtok(NULL,"\r\n");
+			strtok(data," ");
+			char *ident = strtok(NULL," ");
+			char *local = strtok(NULL," ");
+			char *remote = strtok(NULL," :");
+			char *gecos = strtok(NULL,"\r\n");
 
-				if (!ident || !local || !remote || !gecos)
-					return;
+			if (!ident || !local || !remote || !gecos)
+				return 0;
 
-				for (char* j = remote; *j; j++)
+			for (char* j = remote; *j; j++)
+			{
+				if (((*j < '0') || (*j > '9')) && (*j != '.'))
 				{
-					if (((*j < '0') || (*j > '9')) && (*j != '.'))
-					{
-						not_bottler = true;
-					}
+					not_bottler = true;
 				}
+			}
 
-				if (!not_bottler)
-				{
-					raw = "USER bottler "+std::string(local)+" "+std::string(remote)+" "+std::string(gecos)+" [Possible bottler, ident: "+std::string(ident)+"]";
-				}
+			if (!not_bottler)
+			{
+				std::string strgecos = std::string(gecos) + "[Possible bottler, ident: " + std::string(ident) + "]";
+				const char* modified[4];
+				modified[0] = "bottler";
+				modified[1] = local;
+				modified[2] = remote;
+				modified[3] = strgecos.c_str();
+				ServerInstance->Parser->CallHandler("USER", modified, 4, user);
+				return 1;
 			}
 		}
- 	}	
+		return 0;
+ 	}
 };
 
-
-class ModuleAntiBottlerFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBottlerFactory()
-	{
-	}
-	
-	~ModuleAntiBottlerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleAntiBottler(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleAntiBottlerFactory;
-}
-
+MODULE_INIT(ModuleAntiBottler)