X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=a925e75c3d734a65001b823b3351f07ca2cc22b4;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=981efbbd810a7c77cba114834b89c03975bcf735;hpb=c2957516bca0fe70622c7668a12ade68576ddab2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 981efbbd8..a925e75c3 100644 --- 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. @@ -29,12 +29,12 @@ class CommandSethost : public Command TRANSLATE2(TR_TEXT, TR_END); } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& 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,18 +42,19 @@ 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('A', 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,21 +64,20 @@ 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); + : Module(Me), cmd(Me, hostmap) + { + OnRehash(NULL); + ServerInstance->AddCommand(&cmd); Implementation eventlist[] = { I_OnRehash }; ServerInstance->Modules->Attach(eventlist, this, 1); } - void OnRehash(User* user, const std::string ¶meter) + void OnRehash(User* user) { ConfigReader Conf(ServerInstance); std::string hmap = Conf.ReadValue("hostname", "charmap", 0); @@ -85,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; } @@ -93,12 +93,12 @@ class ModuleSetHost : public Module virtual ~ModuleSetHost() { } - + virtual Version GetVersion() { - return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - + }; MODULE_INIT(ModuleSetHost)