Remove InspIRCd* parameters and fields

[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 079c2bfd48ffbf0587eeb623cb473b4721483451..cd9368d3c258cdbf1aa8e1cb16a7cebbdc77cda9 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -22,19 +22,18 @@ class CommandSethost : public Command
  private:
        char* hostmap;
  public:
-       CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
+       CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
        {
-               this->source = "m_sethost.so";
-               syntax = "<new-hostname>";
+               flags_needed = 'o'; syntax = "<new-hostname>";
                TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                size_t len = 0;
-               for (const char* x = parameters[0]; *x; x++, len++)
+               for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
                {
-                       if (!hostmap[(unsigned char)*x])
+                       if (!hostmap[(const unsigned char)*x])
                        {
                                user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
@@ -42,17 +41,18 @@ class CommandSethost : public Command
                }
                if (len == 0)
                {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick.c_str());
                        return CMD_FAILURE;
                }
                if (len > 64)
                {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick.c_str());
                        return CMD_FAILURE;
                }
-               if (user->ChangeDisplayedHost(parameters[0]))
+
+               if (user->ChangeDisplayedHost(parameters[0].c_str()))
                {
-                       ServerInstance->SNO->WriteToSnoMask('O', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
                        return CMD_SUCCESS;
                }
 
@@ -63,29 +63,28 @@ class CommandSethost : public Command
 
 class ModuleSetHost : public Module
 {
-       CommandSethost* mycommand;
+       CommandSethost cmd;
        char hostmap[256];
  public:
-       ModuleSetHost(InspIRCd* Me)
-               : Module(Me)
-       {       
-               OnRehash(NULL,"");
-               mycommand = new CommandSethost(ServerInstance, hostmap);
-               ServerInstance->AddCommand(mycommand);
+       ModuleSetHost()
+               : cmd(this, hostmap)
+       {
+               OnRehash(NULL);
+               ServerInstance->AddCommand(&cmd);
                Implementation eventlist[] = { I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
 
-       void OnRehash(User* user, const std::string &parameter)
+       void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
                if (hmap.empty())
                        hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-               memset(&hostmap, 0, 255);
+               memset(hostmap, 0, sizeof(hostmap));
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        hostmap[(unsigned char)*n] = 1;
        }
@@ -93,12 +92,12 @@ class ModuleSetHost : public Module
        virtual ~ModuleSetHost()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for the SETHOST command", VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSetHost)