X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_antibear.cpp;h=f18aa6883df3e218904ee8af5cc533336ac4d0d8;hb=ce9b1289c672d3d6b9cadec865754710bc1b80f7;hp=6b40407a51412228041c0cb6a00a9bb949e64f15;hpb=8583a707d655a1f0866c3c2d6aae27d5ee2d7133;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 6b40407a5..f18aa6883 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "xline.h"
 
 /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */
@@ -40,21 +37,20 @@ class ModuleAntiBear : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserRegister] = List[I_OnPreCommand] = List[I_OnUserConnect] = 1;
+		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
 		{
 			if (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30))
 			{
-				if (ServerInstance->XLines->add_zline(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()))
-				{
-					ServerInstance->XLines->apply_lines(APPLY_ZLINES);
-					FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()));
-					return 1;
-				}
+				ServerInstance->XLines->AddZLine(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString());
+				// XXX move events into the damn XLineManager stuff
+				FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()));
+				ServerInstance->XLines->ApplyLines();
+				return 1;
 			}
 			
 			user->Shrink("antibear_timewait");
@@ -65,7 +61,7 @@ class ModuleAntiBear : public Module
 		return 0;
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		user->WriteServ("439 %s :This server has anti-spambot mechanisms enabled.", user->nick);
 		user->WriteServ("931 %s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick);
@@ -73,11 +69,6 @@ class ModuleAntiBear : public Module
 		user->Extend("antibear_timewait");
 		return 0;
 	}
-	
-	virtual void OnUserConnect(userrec *user)
-	{
-		user->Shrink("antibear_timewait");
-	}
 };
 
 MODULE_INIT(ModuleAntiBear)