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 7daccb293d803a5e612ba277cc302d972b15d420..6787867577d38ba997053e7d0f4d53bce81b480c 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,43 +21,49 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 
 class cmd_sethost : public command_t
 {
  public:
-       cmd_sethost() : command_t("SETHOST",'o',1)
+       cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
        {
                this->source = "m_sethost.so";
                syntax = "<new-hostname>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               if (strlen(parameters[0]) > 64)
-               {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
-                       return;
-               }
-               for (unsigned int x = 0; x < strlen(parameters[0]); x++)
+               size_t len = 0;
+               for (const char* x = parameters[0]; *x; x++, len++)
                {
-                       if (((tolower(parameters[0][x]) < 'a') || (tolower(parameters[0][x]) > 'z')) && (parameters[0][x] != '.'))
+                       if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
                        {
-                               if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][x] != '-'))
+                               if (((*x < '0') || (*x> '9')) && (*x != '-'))
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-                                       return;
+                                       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 "+std::string(parameters[0]));
+               {
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+                       return CMD_SUCCESS;
+               }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -70,8 +76,8 @@ class ModuleSetHost : public Module
                : Module::Module(Me)
        {
                
-               mycommand = new cmd_sethost();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_sethost(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSetHost()
@@ -80,7 +86,7 @@ class ModuleSetHost : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,0,0,1,VF_VENDOR,API_VERSION);
        }
        
 };