Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 56ad9da053339072d28c8655e81d8ccd60a1c21a..8d4931e3b17e8ff66359d6d164d3b024d1fad09c 100644 (file)
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.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,28 +18,25 @@
 class ModuleAntiBottler : public Module
 {
  public:
-       ModuleAntiBottler(InspIRCd* Me)
-               : Module(Me)
-       {
-               
-       }
+       ModuleAntiBottler()
+                       {
 
-       void Implements(char* List)
-       {
-               List[I_OnPreCommand] = 1;
+               Implementation eventlist[] = { I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       
+
+
        virtual ~ModuleAntiBottler()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Changes the ident of connecting bottler clients to 'bottler'",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 ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                char data[MAXBUF];
                strlcpy(data,original_line.c_str(),MAXBUF);
@@ -50,15 +47,15 @@ class ModuleAntiBottler : public Module
                        {
                                if (*j == ':')
                                        break;
-                                       
+
                                if (*j == '"')
                                {
                                        not_bottler = true;
                                }
                        }
                        // Bug Fix (#14) -- FCS
-                       if (!(data) || !(*data))
-                               return 0;
+                       if (!*data)
+                               return MOD_RES_PASSTHRU;
 
                        strtok(data," ");
                        char *ident = strtok(NULL," ");
@@ -67,7 +64,7 @@ class ModuleAntiBottler : public Module
                        char *gecos = strtok(NULL,"\r\n");
 
                        if (!ident || !local || !remote || !gecos)
-                               return 0;
+                               return MOD_RES_PASSTHRU;
 
                        for (char* j = remote; *j; j++)
                        {
@@ -80,16 +77,16 @@ class ModuleAntiBottler : public Module
                        if (!not_bottler)
                        {
                                std::string strgecos = std::string(gecos) + "[Possible bottler, ident: " + std::string(ident) + "]";
-                               const char* modified[4];
-                               modified[0] = "bottler";
-                               modified[1] = local;
-                               modified[2] = remote;
-                               modified[3] = strgecos.c_str();
-                               ServerInstance->Parser->CallHandler("USER", modified, 4, user);
-                               return 1;
+                               std::vector<std::string> modified;
+                               modified.push_back("bottler");
+                               modified.push_back(local);
+                               modified.push_back(remote);
+                               modified.push_back(strgecos);
+                               ServerInstance->Parser->CallHandler("USER", modified, user);
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };