X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibear.cpp;h=930ebafbb33617e35f96fd21c07ca5d4303af9ae;hb=697098bb47651b40ed9c768361d1a3b1ca452856;hp=f72d607b57a943f2f4d5b608868b1c10fc86d4e6;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index f72d607b5..930ebafbb 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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 */
@@ -26,80 +23,54 @@ class ModuleAntiBear : public Module
  public:
 	ModuleAntiBear(InspIRCd* Me) : Module(Me)
 	{
-		
+
+		Implementation eventlist[] = { I_OnUserRegister, I_OnPreCommand };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
+
 	virtual ~ModuleAntiBear()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
-	}
 
-	void Implements(char* List)
+	virtual Version GetVersion()
 	{
-		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
-		if (command == "NOTICE" && !validated && pcnt > 1)
+		if (command == "NOTICE" && !validated && parameters.size() > 1 && user->GetExt("antibear_timewait"))
 		{
-			if (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30))
+			if (!strncmp(parameters[1].c_str(), "\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()))
+				ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), 86400, ServerInstance->Config->ServerName,
+						"Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString());
+				if (ServerInstance->XLines->AddLine(zl,NULL))
 				{
-					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->ApplyLines();
 				}
+				else
+					delete zl;
+
+				return 1;
 			}
-			else
-			{
-				/* Theyre not registered and the notice is targetted at a server. */
-				if ((user->registered != REG_ALL) && (strchr(parameters[0], '.')))
-					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 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;
 	}
-};
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBearFactory()
-	{
-	}
-	
-	~ModuleAntiBearFactory()
+	virtual int OnUserRegister(User* user)
 	{
+		user->WriteNumeric(439, "%s :This server has anti-spambot mechanisms enabled.", user->nick.c_str());
+		user->WriteNumeric(931, "%s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick.c_str());
+		user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick.c_str());
+		user->Extend("antibear_timewait");
+		return 0;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAntiBear(Me);
-	}
-	
 };
 
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear)