OnRehash changes: split to multiple hooks to clarify use and prevent explosion of...

[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 e927ca69ae0da8be7fa28292b45fbd994e54bc74..e29bb1bed915b853c08f795ef19cbeacceba7b27 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.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.
@@ -28,7 +28,7 @@ class CommandChghost : public Command
                syntax = "<nick> <newhost>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
- 
+
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                const char * x = parameters[1].c_str();
@@ -41,12 +41,12 @@ class CommandChghost : public Command
                                return CMD_FAILURE;
                        }
                }
-               if (parameters[0].empty())
+               if (parameters[1].empty())
                {
                        user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str());
                        return CMD_FAILURE;
                }
-               
+
                if ((parameters[1].c_str() - x) > 63)
                {
                        user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str());
@@ -56,7 +56,7 @@ class CommandChghost : public Command
 
                if (!dest)
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
@@ -65,7 +65,7 @@ class CommandChghost : public Command
                        if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
                        {
                                // fix by brain - ulines set hosts silently
-                               ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+                               ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
                        }
 
                        /* ChangeDisplayedHost fixes it for us */
@@ -87,15 +87,15 @@ class ModuleChgHost : public Module
        ModuleChgHost(InspIRCd* Me)
                : Module(Me)
        {
-               OnRehash(NULL,"");
+               OnRehash(NULL);
                mycommand = new CommandChghost(ServerInstance, hostmap);
                ServerInstance->AddCommand(mycommand);
                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);
                std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
@@ -103,7 +103,7 @@ class ModuleChgHost : 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;
        }
@@ -111,12 +111,12 @@ class ModuleChgHost : public Module
        ~ModuleChgHost()
        {
        }
-       
+
        Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleChgHost)