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

[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 c2989d39051d3a708658b5961d6fa6dca076a9da..cd93377c8a2b99911c417586978c0d5ffa785fb3 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -20,48 +20,48 @@
 class CommandSanick : public Command
 {
  public:
-       CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
+       CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
        {
                this->source = "m_sanick.so";
                syntax = "<nick> <new-nick>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               User* source = ServerInstance->FindNick(parameters[0]);
-               if (source)
+               User* target = ServerInstance->FindNick(parameters[0]);
+               if (target)
                {
-                       if (ServerInstance->ULine(source->server))
+                       if (ServerInstance->ULine(target->server))
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%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]))
+                       if (ServerInstance->IsNick(parameters[1].c_str()))
                        {
-                               if (source->ForceNickChange(parameters[1]))
+                               if (target->ForceNickChange(parameters[1].c_str()))
                                {
-                                       ServerInstance->WriteOpers("*** " + oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+parameters[0]+" to "+parameters[1]);
                                        return CMD_SUCCESS;
                                }
                                else
                                {
                                        /* We couldnt change the nick */
-                                       ServerInstance->WriteOpers("*** " + oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+                                       ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+parameters[0]+" to "+parameters[1]+")");
                                        return CMD_FAILURE;
                                }
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
                        }
 
                        return CMD_FAILURE;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
                }
 
                return CMD_FAILURE;
@@ -88,7 +88,7 @@ class ModuleSanick : 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);
        }
        
 };