Of course, it DOES help to actually initialise the Mutex objects, and delete them...

[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 8d1c46fb35717cddf8f3e99d95c3b4cb50526b19..a7c24df63189ef78e352f58a7f9b1c2af9a7e71f 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -27,23 +27,23 @@ class CommandCycle : public Command
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                std::string reason = ConvToStr("Cycling");
-                       
-               if (pcnt > 1)
+
+               if (parameters.size() > 1)
                {
                        /* reason provided, use it */
                        reason = reason + ": " + parameters[1];
                }
-               
+
                if (!channel)
                {
-                       user->WriteServ("403 %s %s :No such channel", user->nick, parameters[0]);
+                       user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
-               
+
                if (channel->HasUser(user))
                {
                        /*
@@ -57,19 +57,19 @@ 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], true, "", false, ServerInstance->Time());
+
+                               Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
                        return CMD_LOCALONLY;
                }
                else
                {
-                       user->WriteServ("442 %s %s :You're not on that channel", user->nick, channel->name);
+                       user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick.c_str(), channel->name.c_str());
                }
 
                return CMD_FAILURE;
@@ -84,21 +84,21 @@ class ModuleCycle : public Module
        ModuleCycle(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                mycommand = new CommandCycle(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleCycle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCycle)