Replace std::deque with std::vector in spanningtree and related modules

[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 048756b6d20290261f2c6aaa1c602667432e1c50..a925e75c3d734a65001b823b3351f07ca2cc22b4 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-2007 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.
@@ -11,49 +11,50 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
 /** Handle /SETHOST
  */
-class cmd_sethost : public command_t
+class CommandSethost : public Command
 {
  private:
        char* hostmap;
  public:
-       cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+       CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST","o",1), hostmap(hmap)
        {
                this->source = "m_sethost.so";
                syntax = "<new-hostname>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *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)+" :*** Invalid characters in hostname");
+                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
                        }
                }
+               if (len == 0)
+               {
+                       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->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
-                       return CMD_SUCCESS;
+                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+                       return CMD_LOCALONLY;
                }
 
                return CMD_FAILURE;
@@ -63,23 +64,20 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-       cmd_sethost* mycommand;
+       CommandSethost cmd;
        char hostmap[256];
  public:
        ModuleSetHost(InspIRCd* Me)
-               : Module::Module(Me)
-       {       
-               OnRehash("");
-               mycommand = new cmd_sethost(ServerInstance, hostmap);
-               ServerInstance->AddCommand(mycommand);
-       }
-
-       void Implements(char* List)
+               : Module(Me), cmd(Me, hostmap)
        {
-               List[I_OnRehash] = 1;
+               OnRehash(NULL);
+               ServerInstance->AddCommand(&cmd);
+               Implementation eventlist[] = { I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void OnRehash(const std::string &parameter)
+
+       void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
                std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
@@ -87,7 +85,7 @@ class ModuleSetHost : public Module
                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;
        }
@@ -95,35 +93,12 @@ class ModuleSetHost : public Module
        virtual ~ModuleSetHost()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-       
-};
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-       ModuleSetHostFactory()
-       {
-       }
-       
-       ~ModuleSetHostFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSetHost(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)