Remove current time parameter of the Timer constructor

[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 1f3dd3afbefb2cb03f58ea90fd96ff88a7865a12..43ae21a1c0330b26b45e35b55cf21f59cd871430 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -20,8 +20,6 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-/* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */
-
 /** Handles channel mode +X
  */
 class ExemptChanOps : public ListModeBase
@@ -31,10 +29,9 @@ class ExemptChanOps : public ListModeBase
 
        bool ValidateParam(User* user, Channel* chan, std::string &word)
        {
-               // TODO actually make sure there's a prop for this
-               if ((word.length() > 35) || (word.empty()))
+               if (!ServerInstance->Modes->FindMode(word, MODETYPE_CHANNEL))
                {
-                       user->WriteNumeric(955, "%s %s %s :word is too %s for exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
+                       user->WriteNumeric(955, "%s %s :Mode doesn't exist", chan->name.c_str(), word.c_str());
                        return false;
                }
 
@@ -43,17 +40,17 @@ class ExemptChanOps : public ListModeBase
 
        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());
+               user->WriteNumeric(959, "%s %s :Channel exemptchanops list is full", chan->name.c_str(), word.c_str());
        }
 
        void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
        {
-               user->WriteNumeric(957, "%s %s :The word %s is already on the exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str());
+               user->WriteNumeric(957, "%s :The word %s is already on the exemptchanops list", chan->name.c_str(), word.c_str());
        }
 
        void TellNotSet(User* user, Channel* chan, std::string &word)
        {
-               user->WriteNumeric(958, "%s %s :No such exemptchanops word is set",user->nick.c_str(), chan->name.c_str());
+               user->WriteNumeric(958, "%s :No such exemptchanops word is set", chan->name.c_str());
        }
 };
 
@@ -63,17 +60,13 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
        ExemptChanOps ec;
        ExemptHandler(Module* me) : ec(me) {}
 
-       ModeHandler* FindMode(const std::string& mid)
+       PrefixMode* FindMode(const std::string& mid)
        {
                if (mid.length() == 1)
-                       return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
-               for(char c='A'; c < 'z'; c++)
-               {
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
-                       if (mh && mh->name == mid)
-                               return mh;
-               }
-               return NULL;
+                       return ServerInstance->Modes->FindPrefixMode(mid[0]);
+
+               ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL);
+               return mh ? mh->IsPrefixMode() : NULL;
        }
 
        ModResult Call(User* user, Channel* chan, const std::string& restriction)
@@ -90,12 +83,12 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
                                std::string::size_type pos = (*i).mask.find(':');
                                if (pos == std::string::npos)
                                        continue;
-                               if ((*i).mask.substr(0,pos) == restriction)
+                               if (!i->mask.compare(0, pos, restriction))
                                        minmode = (*i).mask.substr(pos + 1);
                        }
                }
 
-               ModeHandler* mh = FindMode(minmode);
+               PrefixMode* mh = FindMode(minmode);
                if (mh && mypfx >= mh->GetPrefixRank())
                        return MOD_RES_ALLOW;
                if (mh || minmode == "*")
@@ -107,7 +100,6 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 
 class ModuleExemptChanOps : public Module
 {
-       std::string defaults;
        ExemptHandler eh;
 
  public:
@@ -115,14 +107,9 @@ class ModuleExemptChanOps : public Module
        {
        }
 
-       void init()
+       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()
@@ -130,20 +117,15 @@ class ModuleExemptChanOps : public Module
                ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption;
        }
 
-       Version GetVersion()
+       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)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                eh.ec.DoRehash();
        }
-
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-       {
-               eh.ec.DoSyncChannel(chan, proto, opaque);
-       }
 };
 
 MODULE_INIT(ModuleExemptChanOps)