DOH! Fix my muppetry of a segfault, and fix some warnings

[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 38ef873d8eaef31d329288a9200b18d992ecba8a..9831730eff442c79d4af4dc34568f0d122fbab38 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()
@@ -39,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, 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," ");
@@ -83,7 +78,7 @@ class ModuleAntiBottler : public Module
                        if (!not_bottler)
                        {
                                std::string strgecos = std::string(gecos) + "[Possible bottler, ident: " + std::string(ident) + "]";
-                               const char* modified[3];
+                               const char* modified[4];
                                modified[0] = "bottler";
                                modified[1] = local;
                                modified[2] = remote;
@@ -96,28 +91,4 @@ class ModuleAntiBottler : public Module
        }
 };
 
-
-class ModuleAntiBottlerFactory : public ModuleFactory
-{
- public:
-       ModuleAntiBottlerFactory()
-       {
-       }
-       
-       ~ModuleAntiBottlerFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAntiBottler(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleAntiBottlerFactory;
-}
-
+MODULE_INIT(ModuleAntiBottler)