Merge insp20

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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index aac8fe7763e99117b30ce425b461b0508b68b4f2..63f0085eda4de188720dba0c16cd907d362f659a 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,21 +1,30 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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"
-#include "u_listmode.h"
+#include "listmode.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
-/* $ModDep: ../../include/u_listmode.h */
 
 /* Written by Om<om@inspircd.org>, April 2005. */
 /* Rewritten to use the listmode utility by Om, December 2005 */
@@ -39,34 +48,35 @@ class ModuleBanException : public Module
 {
        BanException be;
 
-public:
+ public:
        ModuleBanException() : be(this)
        {
-               if (!ServerInstance->Modes->AddMode(&be))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(be);
 
                be.DoImplements(this);
                Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
-               ServerInstance->Modules->Attach(list, this, 4);
-
+               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               output.append(" EXCEPTS=e");
+               tokens["EXCEPTS"] = "e";
        }
 
        ModResult OnExtBanCheck(User *user, Channel *chan, char type)
        {
                if (chan != NULL)
                {
-                       modelist *list = be.extItem.get(chan);
+                       ListModeBase::ModeList *list = be.GetList(chan);
 
                        if (!list)
                                return MOD_RES_PASSTHRU;
 
-                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
                                if (it->mask[0] != type || it->mask[1] != ':')
                                        continue;
@@ -86,7 +96,7 @@ public:
        {
                if (chan)
                {
-                       modelist *list = be.extItem.get(chan);
+                       ListModeBase::ModeList *list = be.GetList(chan);
 
                        if (!list)
                        {
@@ -94,7 +104,7 @@ public:
                                return MOD_RES_PASSTHRU;
                        }
 
-                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
                                if (chan->CheckBan(user, it->mask))
                                {
@@ -106,11 +116,6 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       void OnCleanup(int target_type, void* item)
-       {
-               be.DoCleanup(target_type, item);
-       }
-
        void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be.DoSyncChannel(chan, proto, opaque);
@@ -123,12 +128,7 @@ public:
 
        Version GetVersion()
        {
-               return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
-       }
-
-       ~ModuleBanException()
-       {
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +e channel mode", VF_VENDOR);
        }
 };