Conversions

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

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index a98592299aa39615a55a8ab9cc5454a2e6ac54f5..0456a8539f340695a1fb0077807f3326e3b46d3f 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.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
@@ -12,46 +12,43 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
 /** Handle /SETIDENT
  */
-class cmd_setident : public command_t
+class CommandSetident : public Command
 {
  public:
- cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
+ CommandSetident (InspIRCd* Instance) : Command(Instance,"SETIDENT", "o", 1)
        {
                this->source = "m_setident.so";
                syntax = "<new-ident>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user)
        {
-               size_t len = 0;
-               for(const char* x = parameters[0]; *x; x++, len++)
+               if (parameters.size() == 0)
                {
-                       if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
-                               continue;
-
-                       user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick);
                        return CMD_FAILURE;
                }
-               if (len == 0)
+               
+               if (parameters[0].size() > IDENTMAX)
                {
-                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident too short", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
                        return CMD_FAILURE;
                }
-               if (len > IDENTMAX)
+               
+               if (!ServerInstance->IsIdent(parameters[0].c_str()))
                {
-                       user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick);
                        return CMD_FAILURE;
                }
-
-               user->ChangeIdent(parameters[0]);
-               ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
+               
+               user->ChangeIdent(parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('A', "%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
 
                return CMD_SUCCESS;
        }
@@ -60,14 +57,15 @@ class cmd_setident : public command_t
 
 class ModuleSetIdent : public Module
 {
-       cmd_setident*   mycommand;
+       CommandSetident*        mycommand;
        
  public:
        ModuleSetIdent(InspIRCd* Me) : Module(Me)
        {
                
-               mycommand = new cmd_setident(ServerInstance);
+               mycommand = new CommandSetident(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSetIdent()
@@ -76,10 +74,10 @@ class ModuleSetIdent : public Module
        
        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);
        }
        
 };
 
 
-MODULE_INIT(ModuleSetIdent);
+MODULE_INIT(ModuleSetIdent)