Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 5f7860677726ae5a37311f69061ab06566dcbb2a..11dc50ddcd69da3ed463f9183f8471ac5041e5e7 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -29,20 +29,20 @@ class CommandSanick : public Command
        CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <new-nick>";
+               flags_needed = 'o'; syntax = "<nick> <newnick>";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                User* target = ServerInstance->FindNick(parameters[0]);
 
                /* Do local sanity checks and bails */
                if (IS_LOCAL(user))
                {
-                       if (target && ServerInstance->ULine(target->server))
+                       if (target && target->server->IsULine())
                        {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client");
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
                                return CMD_FAILURE;
                        }
 
@@ -54,7 +54,7 @@ class CommandSanick : public Command
 
                        if (!ServerInstance->IsNick(parameters[1]))
                        {
-                               user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
+                               user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
                                return CMD_FAILURE;
                        }
                }
@@ -64,7 +64,7 @@ class CommandSanick : public Command
                {
                        std::string oldnick = user->nick;
                        std::string newnick = target->nick;
-                       if (target->ChangeNick(parameters[1], true))
+                       if (target->ChangeNick(parameters[1]))
                        {
                                ServerInstance->SNO->WriteGlobalSno('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
                        }
@@ -77,12 +77,9 @@ class CommandSanick : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               User* dest = ServerInstance->FindNick(parameters[0]);
-               if (dest)
-                       return ROUTE_OPT_UCAST(dest->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };
 
@@ -98,9 +95,8 @@ class ModuleSanick : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the SANICK command, allows opers to change the nicknames of users", VF_OPTCOMMON | VF_VENDOR);
        }
 };
 
 MODULE_INIT(ModuleSanick)
-