X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgname.cpp;h=86e01ad33cef16a9dbafca09aa8d78e32d28fed8;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=ed366a13fe50f530d474c47a8ee04238b8c1abf0;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index ed366a13f..86e01ad33 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,70 +20,67 @@
 class CommandChgname : public Command
 {
  public:
-	CommandChgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", "o", 2)
+	CommandChgname(Module* Creator) : Command(Creator,"CHGNAME", 2, 2)
 	{
-		this->source = "m_chgname.so";
+		flags_needed = 'o';
 		syntax = "<nick> <newname>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
-	
-	CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, parameters[0]);
-			return CMD_FAILURE;
-		}
-		
-		if (!*parameters[1])
-		{
-			user->WriteServ("NOTICE %s :*** GECOS must be specified", user->nick);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
-		
-		if (strlen(parameters[1]) > MAXGECOS)
+
+		if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
 		{
-			user->WriteServ("NOTICE %s :*** GECOS too long", user->nick);
+			user->WriteServ("NOTICE %s :*** GECOS too long", user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		
+
 		if (IS_LOCAL(dest))
 		{
-			dest->ChangeName(parameters[1]);
-			ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGNAME to change %s's real name to '%s'", user->nick, dest->nick, dest->fullname);
-			return CMD_LOCALONLY; /* name change routed by FNAME in spanningtree now */
+			dest->ChangeName(parameters[1].c_str());
+			ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
 		}
 
-		/* route it! */
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 
 class ModuleChgName : public Module
 {
-	CommandChgname* mycommand;
-	
-	
+	CommandChgname cmd;
+
 public:
-	ModuleChgName(InspIRCd* Me) : Module(Me)
+	ModuleChgName() : cmd(this)
 	{
-		mycommand = new CommandChgname(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleChgName()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleChgName)