Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[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 d929efd4a25f79c0a1ecd4bec9d859edb06b89e0..0ce9338a43f4feff165e23a64416d80b37064536 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -1,43 +1,98 @@
-// Sanick and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *         the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
+
+/* $ModDesc: Provides support for SANICK command */
+
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
-        
-void handle_sanick(char **parameters, int pcnt, userrec *user)
+
+class cmd_sanick : public command_t
 {
-       userrec* source = Srv->FindNick(std::string(parameters[0]));
-       if (source)
+ public:
+ cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
        {
-               Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::String(dest->nick)+" to "+parameters[1]);
-               Srv->ChangeUserNick(source,std::String(parameters[1]));
+               this->source = "m_sanick.so";
+               syntax = "<nick> <new-nick>";
        }
-}
+
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       {
+               userrec* source = ServerInstance->FindNick(parameters[0]);
+               if (source)
+               {
+                       if (ServerInstance->ULine(source->server))
+                       {
+                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               return CMD_FAILURE;
+                       }
+                       if (ServerInstance->IsNick(parameters[1]))
+                       {
+                               if (source->ForceNickChange(parameters[1]))
+                               {
+                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
+                               {
+                                       /* We couldnt change the nick */
+                                       ServerInstance->WriteOpers(std::string(user->nick)+" 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;
+               }
+
+               return CMD_FAILURE;
+       }
+};
 
 
 class ModuleSanick : public Module
 {
+       cmd_sanick*     mycommand;
  public:
-       ModuleSanick()
+       ModuleSanick(InspIRCd* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SANICK",handle_sanick,'o',2);
+               
+               mycommand = new cmd_sanick(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSanick()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               return Version(1,0,0,1,VF_VENDOR);
        }
        
 };
@@ -55,9 +110,9 @@ class ModuleSanickFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleSanick;
+               return new ModuleSanick(Me);
        }
        
 };