Revert automated conversion by Special, as it (unfortunately) neglects some details...

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

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 8c251b2bcee269081e191934154f1c6209d47384..192a7e8a092dc27c659800c88d5fa489c4167b57 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.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
@@ -11,42 +11,54 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include "users.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
 /** Handle /CHGIDENT
  */
-class cmd_chgident : public command_t
+class CommandChgident : public Command
 {
  public:
-       cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
+       CommandChgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", "o", 2)
        {
                this->source = "m_chgident.so";
                syntax = "<nick> <newident>";
+               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 :*** CHGIDENT: Ident must be specified", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
+               if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
+               {
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
-               if(!ServerInstance->IsIdent(parameters[1]))
+               if (!ServerInstance->IsIdent(parameters[1].c_str()))
                {
-                       user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
-               dest->ChangeIdent(parameters[1]);
-               ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+               dest->ChangeIdent(parameters[1].c_str());
+
+               if (!ServerInstance->ULine(user->server))
+                       ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str());
 
                /* route it! */
                return CMD_SUCCESS;
@@ -56,50 +68,27 @@ class cmd_chgident : public command_t
 
 class ModuleChgIdent : public Module
 {
-       cmd_chgident* mycommand;
-       
-       
+       CommandChgident* mycommand;
+
+
 public:
        ModuleChgIdent(InspIRCd* Me) : Module(Me)
        {
-               mycommand = new cmd_chgident(ServerInstance);
+               mycommand = new CommandChgident(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
-       
+
        virtual ~ModuleChgIdent()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-       ModuleChgIdentFactory()
-       {
-       }
-       
-       ~ModuleChgIdentFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgIdent(Me);
-       }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)