This is better now.

[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 89ae02a08e66fed96a2da4a602d769006675e847..e36b5332980797386adeee9597d336f981069dce 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,42 +1,42 @@
 #include <string>
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
-/* $ModDesc: Provides support for the CHGIDENT command */
-
-Server *Srv;
+#include "inspircd.h"
 
+/* $ModDesc: Provides support for the CHGIDENT command */
 
+/** Handle /CHGIDENT
+ */
 class cmd_chgident : public command_t
 {
  public:
-       cmd_chgident() : command_t("CHGIDENT", 'o', 2)
+       cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
        {
                this->source = "m_chgident.so";
+               syntax = "<nick> <newident>";
        }
        
-       void Handle(char **parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
-               
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
+
                if(dest)
                {
-                       for(unsigned int x = 0; x < strlen(parameters[1]); x++)
+                       if(!ServerInstance->IsIdent(parameters[1]))
                        {
-                               if(((parameters[1][x] >= 'A') && (parameters[1][x] <= '}')) || strchr(".-0123456789", parameters[1][x]))
-                                       continue;
-                       
-                               WriteServ(user->fd, "NOTICE %s :*** Invalid characters in ident", user->nick);
-                               return;
+                               user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+                               return CMD_FAILURE;
                        }
-               
-                       WriteOpers("%s used CHGIDENT to change %s's host from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-                       strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+
+                       dest->ChangeIdent(parameters[1]);
+                       ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+                       return CMD_SUCCESS;
                }
                else
                {
-                       WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
                }
        }
 };
@@ -46,12 +46,12 @@ class ModuleChgIdent : public Module
 {
        cmd_chgident* mycommand;
        
+       
 public:
-       ModuleChgIdent(Server* Me) : Module::Module(Me)
+       ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_chgident();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_chgident(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleChgIdent()
@@ -60,7 +60,7 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
        
 };
@@ -78,7 +78,7 @@ class ModuleChgIdentFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleChgIdent(Me);
        }