X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_autoop.cpp;h=3eab189f28cabb43115fae07715e0ef66f95928e;hb=124c17e14134a4999afc1a5e981ab7c75b3694b9;hp=801cf6c741747b4628c62b6f52679b91415746a8;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 801cf6c74..3eab189f2 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -28,7 +28,7 @@ class AutoOpList : public ListModeBase
  public:
 	AutoOpList(Module* Creator) : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true)
 	{
-		levelrequired = OP_VALUE;
+		ranktoset = ranktounset = OP_VALUE;
 		tidy = false;
 	}
 
@@ -41,19 +41,18 @@ class AutoOpList : public ListModeBase
 		return mh ? mh->IsPrefixMode() : NULL;
 	}
 
-	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
+	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding) CXX11_OVERRIDE
 	{
 		std::string::size_type pos = parameter.find(':');
 		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)
@@ -62,10 +61,9 @@ class AutoOpList : public ListModeBase
 		std::string dummy;
 		if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
 			return MOD_RES_DENY;
-		if (mh->GetLevelRequired() > mylevel)
+		if (mh->GetLevelRequired(true) > 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;