Forward port r9782: show IP (not unknown) for unauthed connections

[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 9f20d760accdff2bd233101ad6fcb33a485ddf99..be57f8af1a9b1b30275128109be6ab2c45a6bc6c 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -27,12 +27,12 @@ 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];
@@ -40,7 +40,7 @@ class CommandCycle : public Command
                
                if (!channel)
                {
-                       user->WriteNumeric(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;
                }
                
@@ -62,14 +62,14 @@ class CommandCycle : public Command
                                if (!channel->PartUser(user, reason.c_str()))
                                        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->WriteNumeric(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;
@@ -96,7 +96,7 @@ class ModuleCycle : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };