X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_autoop.cpp;h=828bef14c06bb60ee320cc1a964c91492af3d9dc;hb=2cffabe0c7375a15c702aeaea5d553d90a549860;hp=8ecee9578c4c1d35797c9de74eaa6563f381ccbd;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 8ecee9578..828bef14c 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -32,17 +32,13 @@ class AutoOpList : public ListModeBase
 		tidy = false;
 	}
 
-	ModeHandler* FindMode(const std::string& mid)
+	PrefixMode* FindMode(const std::string& mid)
 	{
 		if (mid.length() == 1)
-			return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
-		for(char c='A'; c < 'z'; c++)
-		{
-			ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
-			if (mh && mh->name == mid)
-				return mh;
-		}
-		return NULL;
+			return ServerInstance->Modes->FindPrefixMode(mid[0]);
+
+		ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL);
+		return mh ? mh->IsPrefixMode() : NULL;
 	}
 
 	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -52,12 +48,12 @@ class AutoOpList : public ListModeBase
 			return adding ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 		unsigned int mylevel = channel->GetPrefixValue(source);
 		std::string mid = parameter.substr(0, pos);
-		ModeHandler* mh = FindMode(mid);
+		PrefixMode* mh = FindMode(mid);
 
-		if (adding && (!mh || !mh->GetPrefixRank()))
+		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)
@@ -68,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;
@@ -103,8 +99,8 @@ class ModuleAutoOp : public Module
 					continue;
 				if (memb->chan->CheckBan(memb->user, it->mask.substr(colon+1)))
 				{
-					ModeHandler* given = mh.FindMode(it->mask.substr(0, colon));
-					if (given && given->GetPrefixRank())
+					PrefixMode* given = mh.FindMode(it->mask.substr(0, colon));
+					if (given)
 						modeline.push_back(given->GetModeChar());
 				}
 			}
@@ -116,11 +112,6 @@ class ModuleAutoOp : public Module
 		}
 	}
 
-	void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-	{
-		mh.DoSyncChannel(chan, proto, opaque);
-	}
-
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		mh.DoRehash();