Only valid targets for encap are now server ids

[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 3aa5592ccd985d69e4c0fabe43926c8bf600cddd..5a1e9a361a8df2b14fdaa62a6c29f6e1edded00f 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
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Changes the ident of connecting bottler clients to 'bottler' */
 
@@ -25,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()
@@ -42,7 +37,7 @@ class ModuleAntiBottler : public Module
                return Version(1,1,0,1,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 int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                char data[MAXBUF];
                strlcpy(data,original_line.c_str(),MAXBUF);
@@ -60,7 +55,7 @@ class ModuleAntiBottler : public Module
                                }
                        }
                        // Bug Fix (#14) -- FCS
-                       if (!(data) || !(*data))
+                       if (!*data)
                                return 0;
 
                        strtok(data," ");