OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

[user/henk/code/inspircd.git] / src / modules / m_antibear.cpp

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 2c0ae79a37ee4773c92073740438fa94f952aafd..2718cbb4ce6b4db2a005259697aab864492830b4 100644 (file)
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #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 */
@@ -24,7 +24,7 @@ class ModuleAntiBear : public Module
  private:
 
  public:
-       ModuleAntiBear(InspIRCd* Me) : Module::Module(Me)
+       ModuleAntiBear(InspIRCd* Me) : Module(Me)
        {
                
        }
@@ -45,9 +45,9 @@ class ModuleAntiBear : public Module
 
        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 (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
                {
-                       if (!strcmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006\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()))
                                {
@@ -56,14 +56,12 @@ class ModuleAntiBear : public Module
                                        return 1;
                                }
                        }
-                       else
-                       {
-                               ServerInstance->Log(DEBUG,"Into other part of if, parameters[0]='%s'",parameters[0]);
-                               /* 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;
        }
 
@@ -72,35 +70,9 @@ class ModuleAntiBear : public Module
                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;
        }
 };
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-       ModuleAntiBearFactory()
-       {
-       }
-       
-       ~ModuleAntiBearFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAntiBear(Me);
-       }
-       
-};
-
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear)