X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibottler.cpp;h=9c7d75ea26dd971e089d645fb06775a366473374;hb=66098d307c036997e51eaea21724615e27fdc3e9;hp=3b57d9d093e7e9d1bd1a583adcef00990187cdd3;hpb=15ec8bd3773cff3bb8cd36c5890569fdc19e1356;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 3b57d9d09..9c7d75ea2 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -13,6 +13,7 @@
  *
  * ---------------------------------------------------
  */
+using namespace std;
 
 #include "users.h"
 #include "channels.h"
@@ -22,18 +23,21 @@
 
 class ModuleAntiBottler : public Module
 {
- private:
-	 
-	 Server *Srv;
  public:
-	ModuleAntiBottler()
+	ModuleAntiBottler(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		
 	}
+
+	void Implements(char* List)
+	{
+		List[I_OnServerRaw] = 1;
+	}
+
 	
 	virtual ~ModuleAntiBottler()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
@@ -41,40 +45,42 @@ class ModuleAntiBottler : public Module
 		return Version(1,0,0,1,VF_VENDOR);
 	}
 
-
 	virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
 	{
 		if (inbound)
 		{
 			char data[MAXBUF];
-			strncpy(data,raw.c_str(),MAXBUF);
+			strlcpy(data,raw.c_str(),MAXBUF);
 			bool not_bottler = false;
 			if (!strncmp(data,"user ",5))
 			{
-				for (int j = 0; j < strlen(data); j++)
+				for (char* j = data; *j; j++)
 				{
-					if (data[j] == ':')
+					if (*j == ':')
 						break;
 						
-					if (data[j] == '"')
+					if (*j == '"')
 					{
 						not_bottler = true;
 					}
 				}
 				// Bug Fix (#14) -- FCS
-				if (!strlen(data)) return;				
+
+				if (!(data) || !(*data))
+					return;
+
 				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 (!ident || !local || !remote || !gecos)
+					return;
+
+				for (char* j = remote; *j; j++)
 				{
-					if (((remote[j] < '0') || (remote[j] > '9')) && (remote[j] != '.'))
+					if (((*j < '0') || (*j > '9')) && (*j != '.'))
 					{
 						not_bottler = true;
 					}
@@ -101,9 +107,9 @@ class ModuleAntiBottlerFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleAntiBottler;
+		return new ModuleAntiBottler(Me);
 	}
 	
 };