Merge pull request #1139 from johanna-a/master

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

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index a1b72714beba1a23a6d096ee0ce1429dab7e43f8..2b9c2e1c21c28edfaf62adc6d3513a1ffa0ee08f 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -37,14 +37,8 @@ class AutoOpList : public ListModeBase
                if (mid.length() == 1)
                        return ServerInstance->Modes->FindPrefixMode(mid[0]);
 
-               const ModeParser::PrefixModeList& pmlist = ServerInstance->Modes->GetPrefixModes();
-               for (ModeParser::PrefixModeList::const_iterator i = pmlist.begin(); i != pmlist.end(); ++i)
-               {
-                       PrefixMode* mh = *i;
-                       if (mh->name == mid)
-                               return mh;
-               }
-               return NULL;
+               ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL);
+               return mh ? mh->IsPrefixMode() : NULL;
        }
 
        ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -53,13 +47,13 @@ class AutoOpList : public ListModeBase
                if (pos == 0 || pos == std::string::npos)
                        return adding ? MOD_RES_DENY : MOD_RES_PASSTHRU;
                unsigned int mylevel = channel->GetPrefixValue(source);
-               std::string mid = parameter.substr(0, pos);
+               std::string mid(parameter, 0, pos);
                PrefixMode* mh = FindMode(mid);
 
                if (adding && !mh)
                {
-                       source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop",
-                               source->nick.c_str(), mid.c_str(), mid.c_str());
+                       source->WriteNumeric(415, "%s :Cannot find prefix mode '%s' for autoop",
+                               mid.c_str(), mid.c_str());
                        return MOD_RES_DENY;
                }
                else if (!mh)
@@ -70,8 +64,8 @@ class AutoOpList : public ListModeBase
                        return MOD_RES_DENY;
                if (mh->GetLevelRequired() > mylevel)
                {
-                       source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop",
-                               source->nick.c_str(), channel->name.c_str(), mid.c_str());
+                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be able to set mode '%s' to include it in an autoop",
+                               channel->name.c_str(), mid.c_str());
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
@@ -95,9 +89,7 @@ class ModuleAutoOp : public Module
                ListModeBase::ModeList* list = mh.GetList(memb->chan);
                if (list)
                {
-                       std::string modeline("+");
-                       std::vector<std::string> modechange;
-                       modechange.push_back(memb->chan->name);
+                       Modes::ChangeList changelist;
                        for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
                                std::string::size_type colon = it->mask.find(':');
@@ -107,22 +99,13 @@ class ModuleAutoOp : public Module
                                {
                                        PrefixMode* given = mh.FindMode(it->mask.substr(0, colon));
                                        if (given)
-                                               modeline.push_back(given->GetModeChar());
+                                               changelist.push_add(given, memb->user->nick);
                                }
                        }
-                       modechange.push_back(modeline);
-                       for(std::string::size_type i = modeline.length(); i > 1; --i) // we use "i > 1" instead of "i" so we skip the +
-                               modechange.push_back(memb->user->nick);
-                       if(modechange.size() >= 3)
-                               ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
+                       ServerInstance->Modes->Process(ServerInstance->FakeClient, memb->chan, NULL, changelist);
                }
        }
 
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-       {
-               mh.DoSyncChannel(chan, proto, opaque);
-       }
-
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                mh.DoRehash();