Change to Duration for second param

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

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index a7ae0c4317fec4f3de4b9f9e3d35af6b21087eef..9d0e0f54ecf1bde906450ecf16f7a09c98a629ba 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -27,29 +27,26 @@
  * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
 /** Handles channel mode +I
  */
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+       InviteException(Module* Creator) : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
        InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me, this)
+       ModuleInviteException() : ie(this)
        {
                if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
                ie.DoImplements(this);
-               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        void On005Numeric(std::string &output)
@@ -64,7 +61,6 @@ public:
                        modelist* list = ie.extItem.get(chan);
                        if (list)
                        {
-                               std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
                                        if (chan->CheckBan(user, it->mask))
@@ -73,17 +69,11 @@ public:
                                        }
                                }
                        }
-                       // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
                }
 
                return MOD_RES_PASSTHRU;
        }
 
-       const char* OnRequest(Request* request)
-       {
-               return ie.DoOnRequest(request);
-       }
-
        void OnCleanup(int target_type, void* item)
        {
                ie.DoCleanup(target_type, item);
@@ -101,13 +91,7 @@ public:
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
-       }
-
-       ~ModuleInviteException()
-       {
-               ServerInstance->Modes->DelMode(&ie);
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON);
        }
 };