Tidy up strlens which are not required

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

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 0afffd6c15220f6d2d262c7f098a4da3323deae4..6787867577d38ba997053e7d0f4d53bce81b480c 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,52 +14,79 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
-Server *Srv;
-        
-void handle_sethost(char **parameters, int pcnt, userrec *user)
+
+
+
+class cmd_sethost : public command_t
 {
-       for (int x = 0; x < strlen(parameters[0]); x++)
+ public:
+       cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
+       {
+               this->source = "m_sethost.so";
+               syntax = "<new-hostname>";
+       }
+
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               if (((tolower(parameters[0][x]) < 'a') || (tolower(parameters[0][x]) > 'z')) && (parameters[0][x] != '.'))
+               size_t len = 0;
+               for (const char* x = parameters[0]; *x; x++, len++)
                {
-                       if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][x] != '-'))
+                       if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
                        {
-                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-                               return;
+                               if (((*x < '0') || (*x> '9')) && (*x != '-'))
+                               {
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+                                       return CMD_FAILURE;
+                               }
                        }
                }
+               if (len > 64)
+               {
+                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+                       return CMD_FAILURE;
+               }
+               if (user->ChangeDisplayedHost(parameters[0]))
+               {
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+                       return CMD_SUCCESS;
+               }
+
+               return CMD_FAILURE;
        }
-       Srv->ChangeHost(user,parameters[0]);
-       Srv->SendOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
-}
+};
 
 
 class ModuleSetHost : public Module
 {
+       cmd_sethost*    mycommand;
  public:
-       ModuleSetHost()
+       ModuleSetHost(InspIRCd* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SETHOST",handle_sethost,'o',1,"m_sethost.so");
+               
+               mycommand = new cmd_sethost(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSetHost()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,0,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
@@ -77,9 +104,9 @@ class ModuleSetHostFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleSetHost;
+               return new ModuleSetHost(Me);
        }
        
 };