Merge pull request #92 from Robby-/insp20-headers

[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 0d509b7d9558c203ac2be0fcf7bf15317915620b..c5f9e5da5899961c0172d54ac6d266cb661accf2 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
@@ -22,15 +30,22 @@ class CommandChghost : public Command
  private:
        char* hostmap;
  public:
-       CommandChghost (InspIRCd* Instance, Module* Creator, char* hmap) : Command(Instance,Creator,"CHGHOST","o",2), hostmap(hmap)
+       CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
        {
+               flags_needed = 'o';
                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();
+               const char* x = parameters[1].c_str();
+
+               if (parameters[1].length() > 63)
+               {
+                       user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
 
                for (; *x; x++)
                {
@@ -40,17 +55,7 @@ class CommandChghost : public Command
                                return CMD_FAILURE;
                        }
                }
-               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());
-                       return CMD_FAILURE;
-               }
                User* dest = ServerInstance->FindNick(parameters[0]);
 
                if (!dest)
@@ -86,8 +91,7 @@ class ModuleChgHost : public Module
        CommandChghost cmd;
        char hostmap[256];
  public:
-       ModuleChgHost(InspIRCd* Me)
-               : Module(Me), cmd(Me, this, hostmap)
+       ModuleChgHost() : cmd(this, hostmap)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmd);
@@ -98,7 +102,7 @@ class ModuleChgHost : public Module
 
        void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
                if (hmap.empty())
@@ -115,7 +119,7 @@ class ModuleChgHost : public Module
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };