X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=fd9a825dda7f58361ae56bc02fc3b11133648905;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=81cb7dc3732bc94b4e6eec5e389e124628ca771f;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 81cb7dc37..fd9a825dd 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -1,125 +1,105 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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 */
-
 /** Handle /SANICK
  */
-class cmd_sanick : public command_t
+class CommandSanick : public Command
 {
  public:
- cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
+	CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
 	{
-		this->source = "m_sanick.so";
-		syntax = "<nick> <new-nick>";
+		allow_empty_last_param = false;
+		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <new-nick>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
-		if (source)
+		User* target = ServerInstance->FindNick(parameters[0]);
+
+		/* Do local sanity checks and bails */
+		if (IS_LOCAL(user))
 		{
-			if (ServerInstance->ULine(source->server))
+			if (target && target->server->IsULine())
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client");
+				return CMD_FAILURE;
+			}
+
+			if ((!target) || (target->registered != REG_ALL))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 				return CMD_FAILURE;
 			}
+
+			if (!ServerInstance->IsNick(parameters[1]))
+			{
+				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
+				return CMD_FAILURE;
+			}
+		}
+
+		/* Have we hit target's server yet? */
+		if (target && IS_LOCAL(target))
+		{
 			std::string oldnick = user->nick;
-			if (ServerInstance->IsNick(parameters[1]))
+			std::string newnick = target->nick;
+			if (target->ChangeNick(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;
-				}
+				ServerInstance->SNO->WriteGlobalSno('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
 			}
 			else
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+				ServerInstance->SNO->WriteGlobalSno('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
 			}
-
-			return CMD_FAILURE;
 		}
 
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
-};
-
 
-class ModuleSanick : public Module
-{
-	cmd_sanick*	mycommand;
- public:
-	ModuleSanick(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-		
-		mycommand = new cmd_sanick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSanick()
-	{
-	}
-	
-	virtual Version GetVersion()
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSanickFactory : public ModuleFactory
+class ModuleSanick : public Module
 {
+	CommandSanick cmd;
  public:
-	ModuleSanickFactory()
-	{
-	}
-	
-	~ModuleSanickFactory()
+	ModuleSanick()
+		: cmd(this)
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleSanick(Me);
+		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSanickFactory;
-}
-
+MODULE_INIT(ModuleSanick)