Improved to avoid strlen

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

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 366166e4c7bd9297cfd420fcf5e48f23d1d80fd9..d77ddf515488212c73027ea66c54c4f6a78cc226 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.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,54 +14,84 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
 
-Server *Srv;
-        
-void handle_chghost(char **parameters, int pcnt, userrec *user)
+static Server *Srv;
+
+class cmd_chghost : public command_t
 {
-       for (int x = 0; x < strlen(parameters[1]); x++)
+ public:
+         cmd_chghost () : command_t("CHGHOST",'o',2)
+        {
+                this->source = "m_chghost.so";
+        }
+        
+        void Handle(char **parameters, int pcnt, userrec *user)
        {
-               if (((tolower(parameters[1][x]) < 'a') || (tolower(parameters[1][x]) > 'z')) && (parameters[1][x] != '.'))
+               char * x = parameters[1];
+
+               for (; *x; x++)
                {
-                       if (((parameters[1][x] < '0') || (parameters[1][x]> '9')) && (parameters[1][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 != '-'))
+                               {
+                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+                                       return;
+                               }
+                       }
+               }
+               if ((parameters[1] - x) > 63)
+               {
+                       WriteServ(user->fd,"NOTICE %s :*** CHGHOST: Host too long",user->nick);
+                       return;
+               }
+               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               if (dest)
+               {
+                       Srv->ChangeHost(dest,parameters[1]);
+                       if (!Srv->IsUlined(user->server))
+                       {
+                               // fix by brain - ulines set hosts silently
+                               Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1]));
                        }
                }
-       }       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
-       {
-               Srv->ChangeHost(dest,parameters[1]);
-               Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1]));
        }
-}
+};
 
 
 class ModuleChgHost : public Module
 {
+       cmd_chghost* mycommand;
  public:
-       ModuleChgHost()
+       ModuleChgHost(Server* Me)
+               : Module::Module(Me)
+       {
+               Srv = Me;
+               mycommand = new cmd_chghost();
+               Srv->AddCommand(mycommand);
+       }
+
+       void Implements(char* List)
        {
-               Srv = new Server;
-               Srv->AddCommand("CHGHOST",handle_chghost,'o',2,"m_chghost.so");
        }
        
        virtual ~ModuleChgHost()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,2,0,1,VF_VENDOR);
        }
        
 };
@@ -79,9 +109,9 @@ class ModuleChgHostFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleChgHost;
+               return new ModuleChgHost(Me);
        }
        
 };