X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=8e641abd9be436a2ec70894320e107b2c9249bcd;hb=7c197db72eab03321e4f3e847054e13126520504;hp=42d54731cc0cc90b634e12c01a14f2ac557e496d;hpb=fd2eb26472bcc0b7b144f40523ff820cba82f574;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 42d54731c..8e641abd9 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,20 +2,15 @@
  *       | 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include "users.h"
@@ -25,41 +20,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;
 	}
 };
 
@@ -68,12 +77,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()
@@ -82,7 +91,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);
 	}
 	
 };
@@ -100,7 +109,7 @@ class ModuleSanickFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSanick(Me);
 	}