X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibear.cpp;h=90e515d33a9d9405c2b904138a1f8d1c686689d1;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=ea4dcc611b3b173953c228ba33136a9ac23fd7d8;hpb=99c2964bca779f2bae8d6e9e04d4d31ca37ea1e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index ea4dcc611..90e515d33 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -2,37 +2,31 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-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(Server* Me)
-		: Module::Module(Me)
+	ModuleAntiBear(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
+		
 	}
 	
 	virtual ~ModuleAntiBear()
@@ -41,17 +35,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_OnUserConnect] = 1;
+		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
 	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
 	{
-		WriteServ(user->fd,"439 %s :This server has anti-spambot mechanisms enabled.", user->nick);
+		if (command == "NOTICE" && !validated && pcnt > 1)
+		{
+			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;
+				}
+			}
+			else
+			{
+				/* Theyre not registered and the notice is targetted at a server. */
+				if ((user->registered != REG_ALL) && (strchr(parameters[0], '.')))
+					return 1;
+			}
+		}
+		return 0;
+	}
+
+	virtual int 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);
+		user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick);
+		return 0;
 	}
 };
 
@@ -66,7 +86,7 @@ class ModuleAntiBearFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleAntiBear(Me);
 	}
@@ -83,4 +103,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleAntiBearFactory;
 }
-