Remove InspIRCd* parameters and fields

[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..a89e9dd4d2901b0e053139c8f52cf8bd303fd9c2 100644 (file)
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,57 +18,57 @@
 
 class ModuleAntiBear : public Module
 {
- private:
-
+       LocalIntExt bearExt;
  public:
-       ModuleAntiBear(InspIRCd* Me) : Module(Me)
+       ModuleAntiBear() : bearExt("antibear_timewait", this)
        {
-               
+               Extensible::Register(&bearExt);
+               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("Sends a numeric on connect which cripples a common type of trojan/spambot",VF_VENDOR,API_VERSION);
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
-               if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
+               if (command == "NOTICE" && !validated && parameters.size() > 1 && bearExt.get(user))
                {
-                       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->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 MOD_RES_DENY;
                        }
-                       
-                       user->Shrink("antibear_timewait");
+
+                       bearExt.set(user, 0);
                        // Block the command, so the user doesn't receive a no such nick notice
-                       return 1;
+                       return MOD_RES_DENY;
                }
-               
-               return 0;
+
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult 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->WriteServ("PRIVMSG %s :\1TIME\1", user->nick);
-               user->Extend("antibear_timewait");
-               return 0;
+               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());
+               bearExt.set(user, 1);
+               return MOD_RES_PASSTHRU;
        }
 };