Allow support for multiple dns results per request. This is a significant change...

[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 b3bcef53ba598acba6ee758cbb08e2aa61cad6e3..ecdf63fb0b078e512f469d39b2d506d3958022dc 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,35 +1,57 @@
+/*       +------------------------------------+
+ *       | 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 SETIDENT command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-
+/** Handle /SETIDENT
+ */
 class cmd_setident : public command_t
 {
  public:
-       cmd_setident() : command_t("SETIDENT", 'o', 1)
+ cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
        {
                this->source = "m_setident.so";
                syntax = "<new-ident>";
        }
 
-       void Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
-               for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+               if (!*parameters[0])
+               {
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               if (strlen(parameters[0]) > IDENTMAX)
                {
-                       if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
-                               continue;
-                       
-                       user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-                       return;
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
+                       return CMD_FAILURE;
                }
                
-               ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]);
-               strlcpy(user->ident, parameters[0], IDENTMAX+2);
+               if (!ServerInstance->IsIdent(parameters[0]))
+               {
+                       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);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -39,11 +61,11 @@ class ModuleSetIdent : public Module
        cmd_setident*   mycommand;
        
  public:
-       ModuleSetIdent(Server* Me) : Module::Module(Me)
+       ModuleSetIdent(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_setident();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_setident(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSetIdent()
@@ -52,34 +74,10 @@ class ModuleSetIdent : public Module
        
        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 ModuleSetIdentFactory : public ModuleFactory
-{
- public:
-       ModuleSetIdentFactory()
-       {
-       }
-       
-       ~ModuleSetIdentFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleSetIdent(Me);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)