Try this as the ssl crash fix

[user/henk/code/inspircd.git] / src / modules / m_chgname.cpp

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 2e11715268d513f2a41dea5cfcdf8da9b6b4bd29..c05499039a90385560aedffac4fa3242524b3bea 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,36 +12,47 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for the CHGNAME command */
 
 /** Handle /CHGNAME
  */
-class cmd_chgname : public command_t
+class CommandChgname : public Command
 {
  public:
-       cmd_chgname (InspIRCd* Instance) : command_t(Instance,"CHGNAME", 'o', 2)
+       CommandChgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", "o", 2, 2)
        {
                this->source = "m_chgname.so";
                syntax = "<nick> <newname>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
-       
-       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
 
                if (!dest)
                {
-                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       return CMD_FAILURE;
+               }
+
+               if (parameters[1].empty())
+               {
+                       user->WriteServ("NOTICE %s :*** GECOS must be specified", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
+               if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
+               {
+                       user->WriteServ("NOTICE %s :*** GECOS too long", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
                if (IS_LOCAL(dest))
                {
-                       dest->ChangeName(parameters[1]);
-                       ServerInstance->WriteOpers("%s used CHGNAME to change %s's real name to '%s'", user->nick, dest->nick, dest->fullname);
+                       dest->ChangeName(parameters[1].c_str());
+                       ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
                        return CMD_LOCALONLY; /* name change routed by FNAME in spanningtree now */
                }
 
@@ -53,25 +64,26 @@ class cmd_chgname : public command_t
 
 class ModuleChgName : public Module
 {
-       cmd_chgname* mycommand;
-       
-       
+       CommandChgname* mycommand;
+
+
 public:
        ModuleChgName(InspIRCd* Me) : Module(Me)
        {
-               mycommand = new cmd_chgname(ServerInstance);
+               mycommand = new CommandChgname(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
-       
+
        virtual ~ModuleChgName()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
-MODULE_INIT(ModuleChgName);
+MODULE_INIT(ModuleChgName)