Eliminate duplicate names between user and channel 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 5b562631d9a3ff06aa8a1e7fe9e1218b5acac950..d4194c75ea6fea2eb2ab571658a79b4838eb42a3 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,10 +20,9 @@
 class CommandCycle : public Command
 {
  public:
-       CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
+       CommandCycle(Module* Creator) : Command(Creator,"CYCLE", 1)
        {
-               this->source = "m_cycle.so";
-               syntax = "<channel> :[reason]";
+               Penalty = 3; syntax = "<channel> :[reason]";
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
@@ -51,21 +50,19 @@ class CommandCycle : public Command
                         */
                        if (IS_LOCAL(user))
                        {
-                               if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
+                               if (channel->GetPrefixValue(user) < VOICE_VALUE && channel->IsBanned(user))
                                {
                                        /* banned, boned. drop the message. */
                                        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))
-                                       delete channel;
+                               channel->PartUser(user, reason);
 
-                               Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
+                               Channel::JoinUser(user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
@@ -79,15 +76,12 @@ class CommandCycle : public Command
 
 class ModuleCycle : public Module
 {
-       CommandCycle*   mycommand;
+       CommandCycle cmd;
  public:
-       ModuleCycle(InspIRCd* Me)
-               : Module(Me)
+       ModuleCycle()
+               : cmd(this)
        {
-
-               mycommand = new CommandCycle(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleCycle()
@@ -96,7 +90,7 @@ class ModuleCycle : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR);
        }
 
 };