Bah

[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 5690572ce7d0de53a1d340d5a32eba8cf84b9f79..72eff0f9fdd54d2ab5dbb061d13b3298c814888d 100644 (file)
--- 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
@@ -24,6 +24,8 @@ class ModuleAntiBear : public Module
        ModuleAntiBear(InspIRCd* Me) : Module(Me)
        {
                
+               Implementation eventlist[] = { I_OnUserRegister, I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
        
        virtual ~ModuleAntiBear()
@@ -32,26 +34,26 @@ class ModuleAntiBear : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
-       }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* 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))
                        {
-                               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;
                        }
                        
                        user->Shrink("antibear_timewait");
@@ -64,8 +66,8 @@ class ModuleAntiBear : public Module
 
        virtual int OnUserRegister(User* 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->WriteNumeric(439, "%s :This server has anti-spambot mechanisms enabled.", user->nick);
+               user->WriteNumeric(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;