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 bf208518238b6c940419b1d3a2df8357e07f0568..63f0085eda4de188720dba0c16cd907d362f659a 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -22,10 +22,9 @@
 
 
 #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 */
@@ -49,33 +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!");
+       }
+
+       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;
@@ -95,7 +96,7 @@ public:
        {
                if (chan)
                {
-                       modelist *list = be.extItem.get(chan);
+                       ListModeBase::ModeList *list = be.GetList(chan);
 
                        if (!list)
                        {
@@ -103,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))
                                {
@@ -115,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);