Untested! New m_watch that should be hundreds of times faster (im not joking either)

[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 65c9bcff97b7792e8e717756ddd9b1ddf00b2af5..e337ed6300466beef173ab4c78f1a90306894a87 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -25,41 +25,55 @@ using namespace std;
 
 /* $ModDesc: Provides support for SANICK command */
 
-extern InspIRCd* ServerInstance;
-static Server *Srv;
-
+/** Handle /SANICK
+ */
 class cmd_sanick : public command_t
 {
  public:
-       cmd_sanick () : command_t("SANICK", 'o', 2)
+ cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
        {
                this->source = "m_sanick.so";
                syntax = "<nick> <new-nick>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* source = ServerInstance->FindNick(parameters[0]);
                if (source)
                {
-                       if (Srv->IsUlined(source->server))
+                       if (ServerInstance->ULine(source->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
+                       std::string oldnick = user->nick;
                        if (ServerInstance->IsNick(parameters[1]))
                        {
-                               // FIX by brain: Cant use source->nick here because if it traverses a server link then
-                               // source->nick becomes invalid as the object data moves in memory.
-                               ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-                               if (!source->ForceNickChange(parameters[1]))
+                               if (source->ForceNickChange(parameters[1]))
+                               {
+                                       ServerInstance->WriteOpers(oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
                                {
                                        /* We couldnt change the nick */
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                                       return;
+                                       ServerInstance->WriteOpers(oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+                                       return CMD_FAILURE;
                                }
                        }
+                       else
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+                       }
+
+                       return CMD_FAILURE;
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+               }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -72,8 +86,8 @@ class ModuleSanick : public Module
                : Module::Module(Me)
        {
                
-               mycommand = new cmd_sanick();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_sanick(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSanick()
@@ -82,7 +96,7 @@ class ModuleSanick : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };