Change allocation of commands/modes

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

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index be57f8af1a9b1b30275128109be6ab2c45a6bc6c..923783e4bc49e0c3a73ee18164ec61057ef47f5b 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -31,19 +31,19 @@ class CommandCycle : public Command
        {
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                std::string reason = ConvToStr("Cycling");
-                       
+
                if (parameters.size() > 1)
                {
                        /* reason provided, use it */
                        reason = reason + ": " + parameters[1];
                }
-               
+
                if (!channel)
                {
                        user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
-               
+
                if (channel->HasUser(user))
                {
                        /*
@@ -57,11 +57,11 @@ class CommandCycle : public Command
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not cycle, as you are banned on channel " + channel->name);
                                        return CMD_FAILURE;
                                }
-                               
+
                                /* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */
-                               if (!channel->PartUser(user, reason.c_str()))
+                               if (!channel->PartUser(user, reason))
                                        delete channel;
-                               
+
                                Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
@@ -79,26 +79,23 @@ class CommandCycle : public Command
 
 class ModuleCycle : public Module
 {
-       CommandCycle*   mycommand;
+       CommandCycle cmd;
  public:
        ModuleCycle(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me)
        {
-               
-               mycommand = new CommandCycle(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleCycle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCycle)