Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 6c07d08cec55140a43826fb04f23ab08c29beeac..81cb7dc3732bc94b4e6eec5e389e124628ca771f 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -21,37 +21,55 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for SANICK command */
 
-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 = Srv->FindNick(std::string(parameters[0]));
+               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 CMD_FAILURE;
+                       }
+                       std::string oldnick = user->nick;
+                       if (ServerInstance->IsNick(parameters[1]))
                        {
-                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               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 */
+                                       ServerInstance->WriteOpers(oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+                                       return CMD_FAILURE;
+                               }
                        }
-                       if (Srv->IsNick(std::string(parameters[1])))
+                       else
                        {
-                               // 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.
-                               Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-                               Srv->ChangeUserNick(source,std::string(parameters[1]));
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
                        }
+
+                       return CMD_FAILURE;
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -60,12 +78,12 @@ class ModuleSanick : public Module
 {
        cmd_sanick*     mycommand;
  public:
-       ModuleSanick(Server* Me)
+       ModuleSanick(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_sanick();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_sanick(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSanick()
@@ -74,7 +92,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);
        }
        
 };
@@ -92,7 +110,7 @@ class ModuleSanickFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSanick(Me);
        }