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

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 60e83a172..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,9 +20,8 @@ using namespace std;
 
 /* $ModDesc: Provides support for SANICK command */
 
-
-
-
+/** Handle /SANICK
+ */
 class cmd_sanick : public command_t
 {
  public:
@@ -47,18 +41,18 @@ class cmd_sanick : public command_t
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
 				return CMD_FAILURE;
 			}
+			std::string oldnick = user->nick;
 			if (ServerInstance->IsNick(parameters[1]))
 			{
 				if (source->ForceNickChange(parameters[1]))
 				{
-					ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+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(std::string(user->nick)+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
-					userrec::QuitUser(ServerInstance, source, "Nickname collision");
+					ServerInstance->WriteOpers(oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
 					return CMD_FAILURE;
 				}
 			}
@@ -69,6 +63,10 @@ class cmd_sanick : public command_t
 
 			return CMD_FAILURE;
 		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+		}
 
 		return CMD_FAILURE;
 	}
@@ -93,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);
 	}
 	
 };