Simplify /SAJOIN syntax and add permission for joining other users.

[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 5d89586656fa66e5fe525b005e565ebe2b3a1f2a..14050430fa3a32df4db026252ed5bcec4f30b382 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -29,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;
                }
 
@@ -41,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());
        }
 };
 
@@ -65,13 +64,9 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
        {
                if (mid.length() == 1)
                        return ServerInstance->Modes->FindPrefixMode(mid[0]);
-               for(char c='A'; c < 'z'; c++)
-               {
-                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(c);
-                       if (mh && mh->name == mid)
-                               return mh;
-               }
-               return NULL;
+
+               ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL);
+               return mh ? mh->IsPrefixMode() : NULL;
        }
 
        ModResult Call(User* user, Channel* chan, const std::string& restriction)
@@ -105,7 +100,6 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 
 class ModuleExemptChanOps : public Module
 {
-       std::string defaults;
        ExemptHandler eh;
 
  public:
@@ -132,11 +126,6 @@ class ModuleExemptChanOps : public Module
        {
                eh.ec.DoRehash();
        }
-
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-       {
-               eh.ec.DoSyncChannel(chan, proto, opaque);
-       }
 };
 
 MODULE_INIT(ModuleExemptChanOps)