X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibottler.cpp;h=27225edac9df49df6d0cf06c9878d663718b92e3;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=efa2de7e2a3dcc92cf1d0c12bb82294ed609e1fc;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index efa2de7e2..27225edac 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -2,12 +2,9 @@
  *       | 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-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.
  *
@@ -17,76 +14,86 @@
 #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()
+	ModuleAntiBottler(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		
+	}
+
+	void Implements(char* List)
 	{
-		Srv = new Server;
+		List[I_OnPreCommand] = 1;
 	}
+
 	
 	virtual ~ModuleAntiBottler()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,1,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** parameters, int pcnt, userrec *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];
-			strncpy(data,raw.c_str(),MAXBUF);
-			bool not_bottler = false;
-			if (!strncmp(data,"user ",5))
+			for (char* j = data; *j; j++)
 			{
-				for (int j = 0; j < strlen(data); j++)
-				{
-					if (data[j] = ':')
-						break;
-						
-					if (data[j] = '"')
-					{
-						not_bottler = true;
-					}
-				}
-				// Bug Fix (#14) -- FCS
-				if (!strlen(data)) return;				
-				char *user = strtok(data," ");
-				if (!strlen(data)) return;
-				char *ident = strtok(NULL," ");
-				if (!strlen(data)) return;
-				char *local = strtok(NULL," ");
-				if (!strlen(data)) return;
-				char *remote = strtok(NULL," :");
-				if (!strlen(data)) return;
-				char *gecos = strtok(NULL,"\r\n");
-				for (int j = 0; j < strlen(remote); j++)
+				if (*j == ':')
+					break;
+					
+				if (*j == '"')
 				{
-					if (((remote[j] < '0') || (remote[j] > '9')) && (remote[j] != '.'))
-					{
-						not_bottler = true;
-					}
+					not_bottler = true;
 				}
+			}
+			// Bug Fix (#14) -- FCS
+			if (!(data) || !(*data))
+				return 0;
+
+			strtok(data," ");
+			char *ident = strtok(NULL," ");
+			char *local = strtok(NULL," ");
+			char *remote = strtok(NULL," :");
+			char *gecos = strtok(NULL,"\r\n");
 
-				if (!not_bottler)
+			if (!ident || !local || !remote || !gecos)
+				return 0;
+
+			for (char* j = remote; *j; j++)
+			{
+				if (((*j < '0') || (*j > '9')) && (*j != '.'))
 				{
-					raw = "USER bottler "+std::string(local)+" "+std::string(remote)+" "+std::string(gecos)+" [Possible bottler, ident: "+std::string(ident)+"]";
+					not_bottler = true;
 				}
 			}
+
+			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;
+			}
 		}
- 	}	
+		return 0;
+ 	}
 };
 
 
@@ -101,9 +108,9 @@ class ModuleAntiBottlerFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleAntiBottler;
+		return new ModuleAntiBottler(Me);
 	}
 	
 };