X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=e337ed6300466beef173ab4c78f1a90306894a87;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=1452c137647920f4d5bd49f271c5e3a05c0b8db4;hpb=c597795590536f96434913dbe3ba9026081d445e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 1452c1376..e337ed630 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -1,48 +1,102 @@
-// 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 */
 
-Server *Srv;
-	 
-void handle_sanick(char **parameters, int pcnt, userrec *user)
+/** Handle /SANICK
+ */
+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)
+	{
+		this->source = "m_sanick.so";
+		syntax = "<nick> <new-nick>";
+	}
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		if (Srv->IsNick(std::string(parameters[1])))
+		userrec* source = ServerInstance->FindNick(parameters[0]);
+		if (source)
 		{
-			// 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]));
+			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]))
+			{
+				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;
+				}
+			}
+			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;
 	}
-}
+};
 
 
 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,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -60,9 +114,9 @@ class ModuleSanickFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleSanick;
+		return new ModuleSanick(Me);
 	}
 	
 };