Fix user->host not being assigned correctly for new connections

[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 cef990a71e0119235196dd3068ab630bfb15620c..bafd422da37475dd1856fb97ddd85674f8f7688f 100644 (file)
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.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
@@ -22,12 +22,10 @@ class ModuleAntiBottler : public Module
                : Module(Me)
        {
                
+               Implementation eventlist[] = { I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnPreCommand] = 1;
-       }
 
        
        virtual ~ModuleAntiBottler()
@@ -36,10 +34,10 @@ class ModuleAntiBottler : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,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 int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                char data[MAXBUF];
                strlcpy(data,original_line.c_str(),MAXBUF);
@@ -57,7 +55,7 @@ class ModuleAntiBottler : public Module
                                }
                        }
                        // Bug Fix (#14) -- FCS
-                       if (!(data) || !(*data))
+                       if (!*data)
                                return 0;
 
                        strtok(data," ");
@@ -80,12 +78,12 @@ 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);
+                               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 1;
                        }
                }