X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=31813bedf93e41579ab2d01fdc676da15008eebf;hb=78db7544d26cdeffeb2bd8045529fe90bd5d852d;hp=d681fb01a6fc04ac840d32088b0caddf881ae2da;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index d681fb01a..31813bedf 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -1,96 +1,107 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for SANICK command */
+#include "inspircd.h"
 
 /** Handle /SANICK
  */
 class CommandSanick : public Command
 {
  public:
-	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
+	CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
 	{
-		this->source = "m_sanick.so";
-		syntax = "<nick> <new-nick>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		allow_empty_last_param = false;
+		flags_needed = 'o';
+		syntax = "<nick> <newnick>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
-		if (target)
+
+		/* Do local sanity checks and bails */
+		if (IS_LOCAL(user))
 		{
-			if (ServerInstance->ULine(target->server))
+			if (target && target->server->IsULine())
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
 				return CMD_FAILURE;
 			}
-			std::string oldnick = user->nick;
-			if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+
+			if ((!target) || (target->registered != REG_ALL))
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
+				return CMD_FAILURE;
 			}
-			else
+
+			if (!ServerInstance->IsNick(parameters[1]))
 			{
-				if (target->ForceNickChange(parameters[1].c_str()))
-				{
-					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+parameters[0]+" to "+parameters[1]);
-					return CMD_SUCCESS;
-				}
-				else
-				{
-					/* We couldnt change the nick */
-					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+parameters[0]+" to "+parameters[1]+")");
-					return CMD_FAILURE;
-				}
+				user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
+				return CMD_FAILURE;
 			}
-
-			return CMD_FAILURE;
 		}
-		else
+
+		/* Have we hit target's server yet? */
+		if (target && IS_LOCAL(target))
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+			const std::string oldnick = target->nick;
+			const std::string newnick = parameters[1];
+			if (!ServerInstance->FindNickOnly(newnick) && target->ChangeNick(newnick))
+			{
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SANICK to change " + oldnick + " to " + newnick);
+			}
+			else
+			{
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick + " failed SANICK (from " + oldnick + " to " + newnick + ")");
+			}
 		}
 
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
+	{
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
 };
 
 
 class ModuleSanick : public Module
 {
-	CommandSanick*	mycommand;
+	CommandSanick cmd;
  public:
-	ModuleSanick(InspIRCd* Me)
-		: Module(Me)
-	{
-
-		mycommand = new CommandSanick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
-	}
-
-	virtual ~ModuleSanick()
+	ModuleSanick()
+		: cmd(this)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Adds the /SANICK command which allows server operators to change the nickname of a user.", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSanick)