Fix m_alias not reconstituting the RFC message properly.

[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 14050430fa3a32df4db026252ed5bcec4f30b382..b1d7b35dfc31aa2066649c81a961723af2b3e829 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -19,6 +19,7 @@
 
 #include "inspircd.h"
 #include "listmode.h"
+#include "modules/exemption.h"
 
 /** Handles channel mode +X
  */
@@ -27,38 +28,55 @@ class ExemptChanOps : public ListModeBase
  public:
        ExemptChanOps(Module* Creator) : ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", 954, 953, false, "exemptchanops") { }
 
-       bool ValidateParam(User* user, Channel* chan, std::string &word)
-       {
-               if (!ServerInstance->Modes->FindMode(word, MODETYPE_CHANNEL))
+       bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE {
+               std::string::size_type p = word.find(':');
+               if (p == std::string::npos)
                {
-                       user->WriteNumeric(955, "%s %s :Mode doesn't exist", chan->name.c_str(), word.c_str());
+                       user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Invalid exemptchanops entry, format is <restriction>:<prefix>"));
+                       return false;
+               }
+
+               std::string restriction(word, 0, p);
+               // If there is a '-' in the restriction string ignore it and everything after it
+               // to support "auditorium-vis" and "auditorium-see" in m_auditorium
+               p = restriction.find('-');
+               if (p != std::string::npos)
+                       restriction.erase(p);
+
+               if (!ServerInstance->Modes->FindMode(restriction, MODETYPE_CHANNEL))
+               {
+                       user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Unknown restriction"));
                        return false;
                }
 
                return true;
        }
 
-       void TellListTooLong(User* user, Channel* chan, std::string &word)
+       void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
        {
-               user->WriteNumeric(959, "%s %s :Channel exemptchanops list is full", chan->name.c_str(), word.c_str());
+               user->WriteNumeric(959, chan->name, word, "Channel exemptchanops list is full");
        }
 
-       void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
+       void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
        {
-               user->WriteNumeric(957, "%s :The word %s is already on the exemptchanops list", chan->name.c_str(), word.c_str());
+               user->WriteNumeric(957, chan->name, InspIRCd::Format("The word %s is already on the exemptchanops list", word.c_str()));
        }
 
-       void TellNotSet(User* user, Channel* chan, std::string &word)
+       void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
        {
-               user->WriteNumeric(958, "%s :No such exemptchanops word is set", chan->name.c_str());
+               user->WriteNumeric(958, chan->name, "No such exemptchanops word is set");
        }
 };
 
-class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std::string&>
+class ExemptHandler : public CheckExemption::EventListener
 {
  public:
        ExemptChanOps ec;
-       ExemptHandler(Module* me) : ec(me) {}
+       ExemptHandler(Module* me)
+               : CheckExemption::EventListener(me)
+               , ec(me)
+       {
+       }
 
        PrefixMode* FindMode(const std::string& mid)
        {
@@ -69,7 +87,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
                return mh ? mh->IsPrefixMode() : NULL;
        }
 
-       ModResult Call(User* user, Channel* chan, const std::string& restriction)
+       ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE
        {
                unsigned int mypfx = chan->GetPrefixValue(user);
                std::string minmode;
@@ -83,8 +101,8 @@ 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)
-                                       minmode = (*i).mask.substr(pos + 1);
+                               if (!i->mask.compare(0, pos, restriction))
+                                       minmode.assign(i->mask, pos + 1, std::string::npos);
                        }
                }
 
@@ -94,7 +112,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
                if (mh || minmode == "*")
                        return MOD_RES_DENY;
 
-               return ServerInstance->HandleOnCheckExemption.Call(user, chan, restriction);
+               return MOD_RES_PASSTHRU;
        }
 };
 
@@ -107,16 +125,6 @@ class ModuleExemptChanOps : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->OnCheckExemption = &eh;
-       }
-
-       ~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);