X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=076445644ba2bfa84644d94eadff7b170a3ea5ed;hb=bd1471bc08be28bc2554d35fdaeb078338b14266;hp=8a18c46c69f6c12deefd060b38e303c1221b390b;hpb=58d7827bb1bd3d90f38a1c199f6f41ae9f24885c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 8a18c46c6..076445644 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -29,10 +29,23 @@ class ExemptChanOps : public ListModeBase
 
 	bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
-		// TODO actually make sure there's a prop for this
-		if ((word.length() > 35) || (word.empty()))
+		std::string::size_type p = word.find(':');
+		if (p == std::string::npos)
 		{
-			user->WriteNumeric(955, "%s %s %s :word is too %s for exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
+			user->WriteNumeric(955, "%s %s :Invalid exemptchanops entry, format is <restriction>:<prefix>", chan->name.c_str(), word.c_str());
+			return false;
+		}
+
+		std::string restriction(word, 0, p);
+		// If there is a '-' in the restriction string ignore it and everything after it
+		// to support "auditorium-vis" and "auditorium-see" in m_auditorium
+		p = restriction.find('-');
+		if (p != std::string::npos)
+			restriction.erase(p);
+
+		if (!ServerInstance->Modes->FindMode(restriction, MODETYPE_CHANNEL))
+		{
+			user->WriteNumeric(955, "%s %s :Unknown restriction", chan->name.c_str(), restriction.c_str());
 			return false;
 		}
 
@@ -41,17 +54,17 @@ class ExemptChanOps : public ListModeBase
 
 	void TellListTooLong(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
+		user->WriteNumeric(959, "%s %s :Channel exemptchanops list is full", chan->name.c_str(), word.c_str());
 	}
 
 	void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteNumeric(957, "%s %s :The word %s is already on the exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str());
+		user->WriteNumeric(957, "%s :The word %s is already on the exemptchanops list", chan->name.c_str(), word.c_str());
 	}
 
 	void TellNotSet(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteNumeric(958, "%s %s :No such exemptchanops word is set",user->nick.c_str(), chan->name.c_str());
+		user->WriteNumeric(958, "%s :No such exemptchanops word is set", chan->name.c_str());
 	}
 };
 
@@ -66,14 +79,8 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 		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 Call(User* user, Channel* chan, const std::string& restriction)
@@ -90,8 +97,8 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 				std::string::size_type pos = (*i).mask.find(':');
 				if (pos == std::string::npos)
 					continue;
-				if ((*i).mask.substr(0,pos) == restriction)
-					minmode = (*i).mask.substr(pos + 1);
+				if (!i->mask.compare(0, pos, restriction))
+					minmode.assign(i->mask, pos + 1, std::string::npos);
 			}
 		}
 
@@ -107,7 +114,6 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
 
 class ModuleExemptChanOps : public Module
 {
-	std::string defaults;
 	ExemptHandler eh;
 
  public: