m_messageflood Ask to be the last to handle OnUserPreMessage/OnUserPreNotice

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

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ad6e8000b7c041a408b17b12dbd896aace422fb5..90e814a187d2af00c5e42e341fe16d6768593a6b 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * 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/>.
  */
 
+
 /* $ModDesc: Adds timed bans */
 
 #include "inspircd.h"
@@ -56,7 +65,7 @@ class CommandTban : public Command
                }
                if (!ServerInstance->IsValidMask(parameters[2]))
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
+                       user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
                        return CMD_FAILURE;
                }
                TimedBan T;
@@ -65,7 +74,7 @@ class CommandTban : public Command
                unsigned long expire = duration + ServerInstance->Time();
                if (duration < 1)
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
+                       user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
                        return CMD_FAILURE;
                }
                std::string mask = parameters[2];
@@ -73,9 +82,9 @@ class CommandTban : public Command
                setban.push_back(parameters[0]);
                setban.push_back("+b");
                setban.push_back(parameters[2]);
-               // use CallCommandHandler to make it so that the user sets the mode
+               // use CallHandler to make it so that the user sets the mode
                // themselves
-               ServerInstance->CallCommandHandler("MODE",setban,user);
+               ServerInstance->Parser->CallHandler("MODE",setban,user);
                for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
                        if (!strcasecmp(i->data.c_str(), mask.c_str()))
                                goto found;
@@ -103,15 +112,13 @@ class ModuleTimedBans : public Module
        ModuleTimedBans()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               TimedBanList.clear();
-               Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleTimedBans()
+       void init()
        {
-               TimedBanList.clear();
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ModResult OnDelBan(User* source, Channel* chan, const std::string &banmask)