1 files changed, 66 insertions, 64 deletions

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 5c0ffeea5..7a86c9e3c 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -19,48 +19,60 @@
 
 #include "inspircd.h"
 
-static void DisplayList(User* user, Channel* channel)
+static void DisplayList(LocalUser* user, Channel* channel)
 {
-	std::stringstream items;
+	Numeric::ParamBuilder<1> numeric(user, 961);
+	numeric.AddStatic(channel->name);
+
 	const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
 	for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i)
 	{
 		ModeHandler* mh = i->second;
 		if (!channel->IsModeSet(mh))
 			continue;
-		items << " +" << mh->name;
-		if (mh->GetNumParams(true))
-			items << " " << channel->GetModeParameter(mh);
+		numeric.Add("+" + mh->name);
+		if (mh->NeedsParam(true))
+		{
+			if ((mh->name == "key") && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
+				numeric.Add("<key>");
+			else
+				numeric.Add(channel->GetModeParameter(mh));
+		}
 	}
-	const std::string line = ":" + ServerInstance->Config->ServerName + " 961 " + user->nick + " " + channel->name;
-	user->SendText(line, items);
-	user->WriteNumeric(960, "%s :End of mode list", channel->name.c_str());
+	numeric.Flush();
+	user->WriteNumeric(960, channel->name, "End of mode list");
 }
 
-class CommandProp : public Command
+class CommandProp : public SplitCommand
 {
  public:
-	CommandProp(Module* parent) : Command(parent, "PROP", 1)
+	CommandProp(Module* parent)
+		: SplitCommand(parent, "PROP", 1)
 	{
 		syntax = "<user|channel> {[+-]<mode> [<value>]}*";
 	}
 
-	CmdResult Handle(const std::vector<std::string> &parameters, User *src)
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* src)
 	{
+		Channel* const chan = ServerInstance->FindChan(parameters[0]);
+		if (!chan)
+		{
+			src->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+			return CMD_FAILURE;
+		}
+
 		if (parameters.size() == 1)
 		{
-			Channel* chan = ServerInstance->FindChan(parameters[0]);
-			if (chan)
-				DisplayList(src, chan);
+			DisplayList(src, chan);
 			return CMD_SUCCESS;
 		}
 		unsigned int i = 1;
-		std::vector<std::string> modes;
-		modes.push_back(parameters[0]);
-		modes.push_back("");
+		Modes::ChangeList modes;
 		while (i < parameters.size())
 		{
 			std::string prop = parameters[i++];
+			if (prop.empty())
+				continue;
 			bool plus = prop[0] != '-';
 			if (prop[0] == '+' || prop[0] == '-')
 				prop.erase(prop.begin());
@@ -68,16 +80,16 @@ class CommandProp : public Command
 			ModeHandler* mh = ServerInstance->Modes->FindMode(prop, MODETYPE_CHANNEL);
 			if (mh)
 			{
-				modes[1].push_back(plus ? '+' : '-');
-				modes[1].push_back(mh->GetModeChar());
-				if (mh->GetNumParams(plus))
+				if (mh->NeedsParam(plus))
 				{
 					if (i != parameters.size())
-						modes.push_back(parameters[i++]);
+						modes.push(mh, plus, parameters[i++]);
 				}
+				else
+					modes.push(mh, plus);
 			}
 		}
-		ServerInstance->Modes->Process(modes, src);
+		ServerInstance->Modes->ProcessSingle(src, chan, NULL, modes, ModeParser::MODE_CHECKACCESS);
 		return CMD_SUCCESS;
 	}
 };
@@ -89,6 +101,13 @@ class DummyZ : public ModeHandler
 	{
 		list = true;
 	}
+
+	// Handle /MODE #chan Z
+	void DisplayList(User* user, Channel* chan)
+	{
+		if (IS_LOCAL(user))
+			::DisplayList(static_cast<LocalUser*>(user), chan);
+	}
 };
 
 class ModuleNamedModes : public Module
@@ -110,76 +129,59 @@ class ModuleNamedModes : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
 	}
 
-	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
-		if (parameters[1].find('Z') == std::string::npos)
-			return MOD_RES_PASSTHRU;
-		if (parameters.size() <= 2)
-		{
-			DisplayList(source, channel);
-			return MOD_RES_DENY;
-		}
-
-		std::vector<std::string> newparms;
-		newparms.push_back(parameters[0]);
-		newparms.push_back(parameters[1]);
 
-		std::string modelist = newparms[1];
-		bool adding = true;
-		unsigned int param_at = 2;
-		for(unsigned int i = 0; i < modelist.length(); i++)
+		Modes::ChangeList::List& list = modes.getlist();
+		for (Modes::ChangeList::List::iterator i = list.begin(); i != list.end(); )
 		{
-			unsigned char modechar = modelist[i];
-			if (modechar == '+' || modechar == '-')
-			{
-				adding = (modechar == '+');
-				continue;
-			}
-			ModeHandler *mh = ServerInstance->Modes->FindMode(modechar, MODETYPE_CHANNEL);
-			if (modechar == 'Z')
+			Modes::Change& curr = *i;
+			// Replace all namebase (dummyZ) modes being changed with the actual
+			// mode handler and parameter. The parameter format of the namebase mode is
+			// <modename>[=<parameter>].
+			if (curr.mh == &dummyZ)
 			{
-				std::string name, value;
-				if (param_at < parameters.size())
-					name = parameters[param_at++];
+				std::string name = curr.param;
+				std::string value;
 				std::string::size_type eq = name.find('=');
 				if (eq != std::string::npos)
 				{
-					value = name.substr(eq + 1);
-					name = name.substr(0, eq);
+					value.assign(name, eq + 1, std::string::npos);
+					name.erase(eq);
 				}
 
-				mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL);
+				ModeHandler* mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL);
 				if (!mh)
 				{
 					// Mode handler not found
-					modelist.erase(i--, 1);
+					i = list.erase(i);
 					continue;
 				}
 
-				if (mh->GetNumParams(adding))
+				curr.param.clear();
+				if (mh->NeedsParam(curr.adding))
 				{
 					if (value.empty())
 					{
 						// Mode needs a parameter but there wasn't one
-						modelist.erase(i--, 1);
+						i = list.erase(i);
 						continue;
 					}
 
-					newparms.push_back(value);
+					// Change parameter to the text after the '='
+					curr.param = value;
 				}
 
-				modelist[i] = mh->GetModeChar();
-			}
-			else if (mh && mh->GetNumParams(adding) && param_at < parameters.size())
-			{
-				newparms.push_back(parameters[param_at++]);
+				// Put the actual ModeHandler in place of the namebase handler
+				curr.mh = mh;
 			}
+
+			++i;
 		}
-		newparms[1] = modelist;
-		ServerInstance->Modes->Process(newparms, source);
-		return MOD_RES_DENY;
+
+		return MOD_RES_PASSTHRU;
 	}
 };