The module hook is kinda required.

[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 8ec8fffc081dcb00e0fe7892f5603bbcb5d576eb..930ebafbb33617e35f96fd21c07ca5d4303af9ae 100644 (file)
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -23,26 +23,25 @@ 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);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
-
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *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 && user->GetExt("antibear_timewait"))
+               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))
                        {
                                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());
@@ -55,20 +54,20 @@ class ModuleAntiBear : public Module
 
                                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(User* user)
        {
-               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->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;
        }