Fix access checks on chanprotect preventing use of SAMODE

[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 327598faefc847a17399b610be1b038005aee45d..55548be952e0bdeec4b5d9d0857e4c984012fd83 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -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,7 +50,7 @@ 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);
@@ -65,7 +64,7 @@ class CommandCycle : public Command
                                Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
@@ -79,15 +78,12 @@ class CommandCycle : public Command
 
 class ModuleCycle : public Module
 {
-       CommandCycle*   mycommand;
+       CommandCycle cmd;
  public:
        ModuleCycle(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(this)
        {
-
-               mycommand = new CommandCycle(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleCycle()