X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=55a6aae941b8598cff8f882be4f7438ea2a5e297;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=b6ec61876fcea87a5ae7a1f6e98111326994ac04;hpb=f90bbd3813bbad7c308a965cd97ff939e9e423c8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index b6ec61876..55a6aae94 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,51 +17,51 @@
 
 /** Handle /SANICK
  */
-class cmd_sanick : public Command
+class CommandSanick : public Command
 {
  public:
-	cmd_sanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
+	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		User* source = ServerInstance->FindNick(parameters[0]);
-		if (source)
+		User* target = ServerInstance->FindNick(parameters[0]);
+		if (target)
 		{
-			if (ServerInstance->ULine(source->server))
+			if (ServerInstance->ULine(target->server))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
 				return CMD_FAILURE;
 			}
 			std::string oldnick = user->nick;
-			if (ServerInstance->IsNick(parameters[1]))
+			if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
 			{
-				if (source->ForceNickChange(parameters[1]))
+				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+			}
+			else
+			{
+				if (target->ForceNickChange(parameters[1].c_str()))
 				{
-					ServerInstance->WriteOpers("*** " + oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+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]+")");
+					ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+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]);
+			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
 		}
 
 		return CMD_FAILURE;
@@ -71,25 +71,26 @@ class cmd_sanick : public Command
 
 class ModuleSanick : public Module
 {
-	cmd_sanick*	mycommand;
+	CommandSanick*	mycommand;
  public:
 	ModuleSanick(InspIRCd* Me)
 		: Module(Me)
 	{
-		
-		mycommand = new cmd_sanick(ServerInstance);
+
+		mycommand = new CommandSanick(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleSanick()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSanick)