Some more text fixes and improvements (#1618).

[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 1ecec735e0ac69ef00fd1556940f1692774253c3..b12c98b5da42eaf82bbc589817e9341360f0a89c 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -22,10 +22,7 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides support for the +I channel mode */
-/* $ModDep: ../../include/u_listmode.h */
+#include "listmode.h"
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -42,41 +39,36 @@
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(Module* Creator) : ListModeBase(Creator, "invex", '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
 {
+       bool invite_bypass_key;
        InviteException ie;
 public:
        ModuleInviteException() : ie(this)
        {
-               if (!ServerInstance->Modes->AddMode(&ie))
-                       throw ModuleException("Could not add new modes!");
-
-               ie.DoImplements(this);
-               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" INVEX=I");
+               tokens["INVEX"] = ConvToStr(ie.GetModeChar());
        }
 
-       ModResult OnCheckInvite(User* user, Channel* chan)
+       ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE
        {
-               if(chan != NULL)
+               ListModeBase::ModeList* list = ie.GetList(chan);
+               if (list)
                {
-                       modelist* list = ie.extItem.get(chan);
-                       if (list)
+                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                               if (chan->CheckBan(user, it->mask))
                                {
-                                       if (chan->CheckBan(user, it->mask))
-                                       {
-                                               return MOD_RES_ALLOW;
-                                       }
+                                       return MOD_RES_ALLOW;
                                }
                        }
                }
@@ -84,31 +76,22 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE
        {
-               if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+               if (invite_bypass_key)
                        return OnCheckInvite(user, chan);
                return MOD_RES_PASSTHRU;
        }
 
-       void OnCleanup(int target_type, void* item)
-       {
-               ie.DoCleanup(target_type, item);
-       }
-
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-       {
-               ie.DoSyncChannel(chan, proto, opaque);
-       }
-
-       void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ie.DoRehash();
+               invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the +I channel mode", VF_VENDOR);
+               return Version("Provides channel mode +I, invite exceptions", VF_VENDOR);
        }
 };