m_namedmodes Only show chan key to members and opers with channels/auspex

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

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index e9ca3bfd0c0dc042f2a5b81466df755d977de252..d1df81354b65e7ce9c64b5b9cbbbe1b4026488e4 100644 (file)
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -31,8 +31,8 @@ public:
 
        void init()
        {
-               ServerInstance->Modules->Attach(I_OnPreMode, this);
-               ServerInstance->Extensions.Register(&this->mlock);
+               ServerInstance->Modules->Attach(I_OnRawMode, this);
+               ServerInstance->Modules->AddService(this->mlock);
        }
 
        Version GetVersion()
@@ -40,12 +40,7 @@ public:
                return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
        }
 
-       void Prioritize()
-       {
-               ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
-       }
-
-       ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
+       ModResult OnRawMode(User* source, Channel* channel, const char mode, const std::string& parameter, bool adding, int pcnt)
        {
                if (!channel)
                        return MOD_RES_PASSTHRU;
@@ -54,17 +49,15 @@ public:
                        return MOD_RES_PASSTHRU;
 
                std::string *mlock_str = mlock.get(channel);
-               if (!mlock_str || mlock_str->empty())
+               if (!mlock_str)
                        return MOD_RES_PASSTHRU;
 
-               for (const char *modes = parameters[1].c_str(); *modes; modes++)
+               std::string::size_type p = mlock_str->find(mode);
+               if (p != std::string::npos)
                {
-                       if (mlock_str->find(*modes) != std::string::npos)
-                       {
-                               source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
-                                                    channel->name.c_str(), *modes, mlock_str->c_str());
-                               return MOD_RES_DENY;
-                       }
+                       source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
+                                            channel->name.c_str(), mode, mlock_str->c_str());
+                       return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;