Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 5a1e9a361a8df2b14fdaa62a6c29f6e1edded00f..cd177fd8ef2965336532d1a9c537a20a2b418b00 100644 (file)
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -21,23 +21,23 @@ class ModuleAntiBottler : public Module
        ModuleAntiBottler(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                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(1,2,0,1,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)
        {
                char data[MAXBUF];
                strlcpy(data,original_line.c_str(),MAXBUF);
@@ -48,7 +48,7 @@ class ModuleAntiBottler : public Module
                        {
                                if (*j == ':')
                                        break;
-                                       
+
                                if (*j == '"')
                                {
                                        not_bottler = true;
@@ -78,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;
                        }
                }