Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / modules / m_tline.cpp

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index b08d5b6c0dea0f9a49eec99971697990c9006130..b4e7e5a995941e829ef33ca38969504f84b46b0e 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 2006-2007 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 /tline command used to test who a mask matches */
@@ -20,9 +27,9 @@
 class CommandTline : public Command
 {
  public:
-       CommandTline (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"TLINE", "o", 1)
+       CommandTline(Module* Creator) : Command(Creator,"TLINE", 1)
        {
-               this->syntax = "<mask>";
+               flags_needed = 'o'; this->syntax = "<mask>";
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -42,7 +49,7 @@ class CommandTline : public Command
                        }
                        else
                        {
-                               std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
+                               std::string host = u->second->ident + "@" + u->second->GetIPString();
                                if (InspIRCd::MatchCIDR(host, parameters[0]))
                                {
                                        n_matched++;
@@ -63,12 +70,15 @@ class ModuleTLine : public Module
 {
        CommandTline cmd;
  public:
-       ModuleTLine(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleTLine()
+               : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
        }
 
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
+       }
 
        virtual ~ModuleTLine()
        {
@@ -76,7 +86,7 @@ class ModuleTLine : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
        }
 };