Merge pull request #1185 from SaberUK/master+lockserv

[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 801cf6c741747b4628c62b6f52679b91415746a8..8c7f300daba11b60cbcbd85d79de719edf69e425 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -47,13 +47,12 @@ 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 :Cannot find prefix mode '%s' for autoop",
-                               mid.c_str(), mid.c_str());
+                       source->WriteNumeric(415, mid, InspIRCd::Format("Cannot find prefix mode '%s' for autoop", mid.c_str()));
                        return MOD_RES_DENY;
                }
                else if (!mh)
@@ -64,8 +63,7 @@ class AutoOpList : public ListModeBase
                        return MOD_RES_DENY;
                if (mh->GetLevelRequired() > mylevel)
                {
-                       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());
+                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, InspIRCd::Format("You must be able to set mode '%s' to include it in an autoop", mid.c_str()));
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;