m_mlock Remove unnecessary iteration

[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 9e3c596ccc4a64dbb5aec1d765039963bdf1aeb6..3fb60a3d273ae029aa50209a7a6e2059999532d1 100644 (file)
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,9 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/* $ModDesc: Implements the ability to have server-side MLOCK enforcement. */
+
 #include "inspircd.h"
 
-class ModuleMLock : public Module {
+class ModuleMLock : public Module
+{
 private:
        StringExtItem mlock;
 
@@ -27,8 +31,8 @@ public:
 
        void init()
        {
-               Implementation eventlist[] = { I_OnPreMode };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(I_OnPreMode, this);
+               ServerInstance->Extensions.Register(&this->mlock);
        }
 
        Version GetVersion()
@@ -50,17 +54,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 = parameters[1].find_first_of(*mlock_str);
+               if (p != std::string::npos)
                {
-                       if (mlock_str->find(*modes))
-                       {
-                               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(), parameters[1][p], mlock_str->c_str());
+                       return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;