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

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 513f357f9..90e515d33 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -2,24 +2,20 @@
  *       | 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 "inspircd.h"
+#include "xline.h"
 
 /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */
 
@@ -44,13 +40,38 @@ class ModuleAntiBear : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserRegister] = 1;
+		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
 	}
-	
-	virtual void OnUserRegister(userrec* user)
+
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	{
+		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;
 	}
 };