X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=02f0c3fa5c10f7b73b24912d9f13acb5d0282ca6;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=1299332feb230762a3d75f425e7ffe976858080e;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 1299332fe..02f0c3fa5 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,63 +2,71 @@
  *       | 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 "inspircd.h"
 #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;
+				return CMD_FAILURE;
 			}
-			if (Srv->IsNick(std::string(parameters[1])))
+			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.
-				Srv->SendOpers(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(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;
 	}
 };
 
@@ -67,12 +75,12 @@ class ModuleSanick : public Module
 {
 	cmd_sanick*	mycommand;
  public:
-	ModuleSanick(Server* Me)
-		: Module::Module(Me)
+	ModuleSanick(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_sanick();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_sanick(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSanick()
@@ -81,34 +89,9 @@ class ModuleSanick : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSanickFactory : public ModuleFactory
-{
- public:
-	ModuleSanickFactory()
-	{
-	}
-	
-	~ModuleSanickFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleSanick(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSanickFactory;
-}
-
+MODULE_INIT(ModuleSanick)