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

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index f322b0b9a..f18aa6883 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -2,34 +2,26 @@
  *       | 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-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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
+#include "xline.h"
 
 /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */
 
 class ModuleAntiBear : public Module
 {
  private:
-	 
-	 Server *Srv;
+
  public:
-	ModuleAntiBear(InspIRCd* Me) : Module::Module(Me)
+	ModuleAntiBear(InspIRCd* Me) : Module(Me)
 	{
 		
 	}
@@ -40,46 +32,43 @@ class ModuleAntiBear : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserRegister] = 1;
-	}
-	
-	virtual void OnUserRegister(userrec* 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);
+		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
 	}
-};
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBearFactory()
-	{
-	}
-	
-	~ModuleAntiBearFactory()
+	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))
+			{
+				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");
+			// Block the command, so the user doesn't receive a no such nick notice
+			return 1;
+		}
+		
+		return 0;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	virtual int OnUserRegister(User* user)
 	{
-		return new ModuleAntiBear(Me);
+		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);
+		user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick);
+		user->Extend("antibear_timewait");
+		return 0;
 	}
-	
 };
 
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" void * init_module( void )
-{
-	return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear)