Textual improvements and fixes such as typos, casing, etc. (#1612)

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

diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 5fcec36f1777d9567a7dc8d9b9d2a41fe97d665d..859da46a40f3f38809f001c9aec74e9c6796ab6d 100644 (file)
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -28,14 +28,14 @@ class CommandClearChan : public Command
        CommandClearChan(Module* Creator)
                : Command(Creator, "CLEARCHAN", 1, 3)
        {
-               syntax = "<channel> [<KILL|KICK|G|Z>] [<reason>]";
+               syntax = "<channel> [KILL|KICK|G|Z] [:<reason>]";
                flags_needed = 'o';
 
                // Stop the linking mod from forwarding ENCAP'd CLEARCHAN commands, see below why
                force_manual_route = true;
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                Channel* chan = activechan = ServerInstance->FindChan(parameters[0]);
                if (!chan)
@@ -79,7 +79,7 @@ class CommandClearChan : public Command
                        // The idea is that by the time our QUITs reach the next hop, it has already removed all their
                        // clients from the channel, meaning victims on other servers won't see the victims on this
                        // server quitting.
-                       std::vector<std::string> eparams;
+                       CommandBase::Params eparams;
                        eparams.push_back(chan->name);
                        eparams.push_back(method);
                        eparams.push_back(":");
@@ -116,10 +116,10 @@ class CommandClearChan : public Command
                                XLine* xline;
                                try
                                {
-                                       mask = ((method[0] == 'Z') ? curr->GetIPString() : "*@" + curr->host);
+                                       mask = ((method[0] == 'Z') ? curr->GetIPString() : "*@" + curr->GetRealHost());
                                        xline = xlf->Generate(ServerInstance->Time(), 60*60, user->nick, reason, mask);
                                }
-                               catch (ModuleException& ex)
+                               catch (ModuleException&)
                                {
                                        // Nothing, move on to the next user
                                        continue;
@@ -150,7 +150,7 @@ class ModuleClearChan : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                // Only attached while we are working; don't react to events otherwise
                ServerInstance->Modules->DetachAll(this);
@@ -211,7 +211,7 @@ class ModuleClearChan : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Adds /CLEARCHAN that allows opers to masskick, masskill or mass-G/ZLine users on a channel", VF_VENDOR|VF_OPTCOMMON);
+               return Version("Provides the CLEARCHAN command that allows opers to masskick, masskill or mass G/Z-line users on a channel", VF_VENDOR|VF_OPTCOMMON);
        }
 };