Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 cd93377c8a2b99911c417586978c0d5ffa785fb3..a14bfc097e543283636764074052a20b147277ea 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -34,11 +34,15 @@ class CommandSanick : public Command
                {
                        if (ServerInstance->ULine(target->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
                        std::string oldnick = user->nick;
-                       if (ServerInstance->IsNick(parameters[1].c_str()))
+                       if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+                       }
+                       else
                        {
                                if (target->ForceNickChange(parameters[1].c_str()))
                                {
@@ -52,10 +56,6 @@ class CommandSanick : public Command
                                        return CMD_FAILURE;
                                }
                        }
-                       else
-                       {
-                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
-                       }
 
                        return CMD_FAILURE;
                }
@@ -76,21 +76,21 @@ class ModuleSanick : public Module
        ModuleSanick(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                mycommand = new CommandSanick(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleSanick()
        {
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSanick)