Merge pull request #574 from SaberUK/master+build-comment-cleanup

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

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 2677e66df3d66998f82100c5b62b5fa5e4117455..e3f8191172f6e119043019297057dc33045d4010 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -1,20 +1,24 @@
-/*       +------------------------------------+
- *       | 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>
  *
- * 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"
 
-/* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */
+#include "inspircd.h"
+#include "listmode.h"
 
 /** Handles channel mode +X
  */
@@ -35,10 +39,9 @@ class ExemptChanOps : public ListModeBase
                return true;
        }
 
-       bool TellListTooLong(User* user, Channel* chan, std::string &word)
+       void TellListTooLong(User* user, Channel* chan, std::string &word)
        {
                user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
-               return true;
        }
 
        void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
@@ -52,41 +55,11 @@ class ExemptChanOps : public ListModeBase
        }
 };
 
-class ModuleExemptChanOps : public Module
+class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std::string&>
 {
-       ExemptChanOps ec;
-       std::string defaults;
-
  public:
-
-       ModuleExemptChanOps() : ec(this)
-       {
-       }
-
-       void init()
-       {
-               ServerInstance->Modules->AddService(ec);
-               Implementation eventlist[] = { I_OnChannelDelete, I_OnChannelRestrictionApply, I_OnRehash, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
-
-               OnRehash(NULL);
-       }
-
-       Version GetVersion()
-       {
-               return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);
-       }
-
-       void OnRehash(User* user)
-       {
-               defaults = ServerInstance->Config->ConfValue("exemptchanops")->getString("defaults");
-               ec.DoRehash();
-       }
-
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-       {
-               ec.DoSyncChannel(chan, proto, opaque);
-       }
+       ExemptChanOps ec;
+       ExemptHandler(Module* me) : ec(me) {}
 
        ModeHandler* FindMode(const std::string& mid)
        {
@@ -101,26 +74,16 @@ class ModuleExemptChanOps : public Module
                return NULL;
        }
 
-       ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction)
+       ModResult Call(User* user, Channel* chan, const std::string& restriction)
        {
                unsigned int mypfx = chan->GetPrefixValue(user);
-               irc::spacesepstream defaultstream(defaults);
                std::string minmode;
-               std::string current;
 
-               while (defaultstream.GetToken(current))
-               {
-                       std::string::size_type pos = current.find(':');
-                       if (pos == std::string::npos)
-                               continue;
-                       if (current.substr(0,pos) == restriction)
-                               minmode = current[pos+1];
-               }
-               modelist* list = ec.extItem.get(chan);
+               ListModeBase::ModeList* list = ec.GetList(chan);
 
                if (list)
                {
-                       for (modelist::iterator i = list->begin(); i != list->end(); ++i)
+                       for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); ++i)
                        {
                                std::string::size_type pos = (*i).mask.find(':');
                                if (pos == std::string::npos)
@@ -135,7 +98,49 @@ class ModuleExemptChanOps : public Module
                        return MOD_RES_ALLOW;
                if (mh || minmode == "*")
                        return MOD_RES_DENY;
-               return MOD_RES_PASSTHRU;
+
+               return ServerInstance->HandleOnCheckExemption.Call(user, chan, restriction);
+       }
+};
+
+class ModuleExemptChanOps : public Module
+{
+       std::string defaults;
+       ExemptHandler eh;
+
+ public:
+       ModuleExemptChanOps() : eh(this)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(eh.ec);
+               Implementation eventlist[] = { I_OnRehash, I_OnSyncChannel };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               ServerInstance->OnCheckExemption = &eh;
+
+               OnRehash(NULL);
+       }
+
+       ~ModuleExemptChanOps()
+       {
+               ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption;
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);
+       }
+
+       void OnRehash(User* user) CXX11_OVERRIDE
+       {
+               eh.ec.DoRehash();
+       }
+
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
+       {
+               eh.ec.DoSyncChannel(chan, proto, opaque);
        }
 };