More stuff so that freebsd users can still use the ports version of openssl if they...

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 22e4b64906f06aec088e35407fe83268f0972347..b87b5d2c129c519d1bcd6e817bd7edbd2da0b25a 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.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
@@ -69,7 +69,7 @@ class RemoveBase
                }
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, User *user, bool neworder)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user, bool neworder)
        {
                const char* channame;
                const char* username;
@@ -99,7 +99,7 @@ class RemoveBase
                /* Fix by brain - someone needs to learn to validate their input! */
                if (!target || !channel)
                {
-                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, !target ? username : channame);
                        return CMD_FAILURE;
                }
 
@@ -203,17 +203,17 @@ class RemoveBase
 
 /** Handle /REMOVE
  */
-class cmd_remove : public Command, public RemoveBase
+class CommandRemove : public Command, public RemoveBase
 {
  public:
-       cmd_remove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+       CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<nick> <channel> [<reason>]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                return RemoveBase::Handle(parameters, pcnt, user, false);
        }
@@ -221,16 +221,16 @@ class cmd_remove : public Command, public RemoveBase
 
 /** Handle /FPART
  */
-class cmd_fpart : public Command, public RemoveBase
+class CommandFpart : public Command, public RemoveBase
 {
  public:
-       cmd_fpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+       CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<channel> <nick> [<reason>]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                return RemoveBase::Handle(parameters, pcnt, user, true);
        }
@@ -238,8 +238,8 @@ class cmd_fpart : public Command, public RemoveBase
 
 class ModuleRemove : public Module
 {
-       cmd_remove* mycommand;
-       cmd_fpart* mycommand2;
+       CommandRemove* mycommand;
+       CommandFpart* mycommand2;
        bool supportnokicks;
        
        
@@ -247,17 +247,15 @@ class ModuleRemove : public Module
        ModuleRemove(InspIRCd* Me)
        : Module(Me)
        {
-               mycommand = new cmd_remove(ServerInstance, supportnokicks);
-               mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+               mycommand = new CommandRemove(ServerInstance, supportnokicks);
+               mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->AddCommand(mycommand2);
                OnRehash(NULL,"");
+               Implementation eventlist[] = { I_On005Numeric, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
-       {
-               List[I_On005Numeric] = List[I_OnRehash] = 1;
-       }
 
        virtual void On005Numeric(std::string &output)
        {
@@ -276,7 +274,7 @@ class ModuleRemove : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };