This will royally fuck 1.2's linking right now, but..

[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 039eb1022a847d6e25387ab030a73b7e293688bd..e13d211f4de1ed72e1145e71c925454a3a00be1a 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,41 +1,66 @@
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
-extern InspIRCd* ServerInstance;
-
+/** 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(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
 
-               if(dest)
+               if (!dest)
+               {
+                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
+               }
+
+               if (!*parameters[1])
                {
-                       if(!ServerInstance->IsIdent(parameters[1]))
-                       {
-                               user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-                               return;
-                       }
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
                
-                       ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-                       strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+               if (strlen(parameters[1]) > IDENTMAX)
+               {
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick);
+                       return CMD_FAILURE;
                }
-               else
+               
+               if (!ServerInstance->IsIdent(parameters[1]))
                {
-                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick);
+                       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);
+
+               /* route it! */
+               return CMD_SUCCESS;
        }
 };
 
@@ -46,9 +71,9 @@ class ModuleChgIdent : public Module
        
        
 public:
-       ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
+       ModuleChgIdent(InspIRCd* Me) : Module(Me)
        {
-               mycommand = new cmd_chgident();
+               mycommand = new cmd_chgident(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
        
@@ -58,34 +83,10 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
-       }
-       
-};
-
-// 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);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)