X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=ef3801ab6c29990fdf08adc5266b0ff211c8171a;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=dfa846364f95366e969ec67cae99346fc750f17f;hpb=74c8913f72e6d48c88a01155ef5fe5ca20cc2bb1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index dfa846364..4478dce73 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "inspstring.h"
-#include "mode.h"
 
 /* +s (secret) */
 #include "modes/cmode_s.h"
@@ -41,19 +40,18 @@
 #include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
-/* +s (server notices) */
-#include "modes/umode_s.h"
 /* +w (see wallops) */
 #include "modes/umode_w.h"
 /* +i (invisible) */
 #include "modes/umode_i.h"
 /* +o (operator) */
 #include "modes/umode_o.h"
-/* +n (notice mask - our implementation of snomasks) */
-#include "modes/umode_n.h"
+/* +s (server notice masks) */
+#include "modes/umode_s.h"
 
-ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix)
-	: ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix)
+ModeHandler::ModeHandler(Module* Creator, char modeletter, ParamSpec Params, ModeType type)
+	: mode(modeletter), parameters_taken(Params), list(false), m_type(type), m_paramtype(TR_TEXT),
+	oper(false), prefix(0), count(0), levelrequired(HALFOP_VALUE), creator(Creator)
 {
 }
 
@@ -71,24 +69,29 @@ unsigned int ModeHandler::GetPrefixRank()
 	return 0;
 }
 
-ModeType ModeHandler::GetModeType()
-{
-	return m_type;
-}
-
-bool ModeHandler::NeedsOper()
+unsigned int ModeHandler::GetCount()
 {
-	return oper;
+	return 0;
 }
 
-char ModeHandler::GetPrefix()
+void ModeHandler::ChangeCount(int modifier)
 {
-	return prefix;
+	count += modifier;
+	ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count);
 }
 
 int ModeHandler::GetNumParams(bool adding)
 {
-	return adding ? n_params_on : n_params_off;
+	switch (parameters_taken)
+	{
+		case PARAM_ALWAYS:
+			return 1;
+		case PARAM_SETONLY:
+			return adding ? 1 : 0;
+		case PARAM_NONE:
+			break;
+	}
+	return 0;
 }
 
 char ModeHandler::GetModeChar()
@@ -96,12 +99,22 @@ char ModeHandler::GetModeChar()
 	return mode;
 }
 
-ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+std::string ModeHandler::GetUserParameter(User* user)
+{
+	return "";
+}
+
+ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool)
+{
+	return MOD_RES_PASSTHRU;
+}
+
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
 {
 	return MODEACTION_DENY;
 }
 
-ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&)
 {
 	if (dest)
 	{
@@ -113,16 +126,69 @@ ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel,
 	}
 }
 
-void ModeHandler::DisplayList(userrec* user, chanrec* channel)
+void ModeHandler::DisplayList(User*, Channel*)
+{
+}
+
+void ModeHandler::DisplayEmptyList(User*, Channel*)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
-	return (ours < theirs);
 }
 
-ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
+bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*)
+{
+	return (theirs < ours);
+}
+
+ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+	if (adding)
+	{
+		if (!dest->IsModeSet(this->GetModeChar()))
+		{
+			dest->SetMode(this->GetModeChar(),true);
+			return MODEACTION_ALLOW;
+		}
+	}
+	else
+	{
+		if (dest->IsModeSet(this->GetModeChar()))
+		{
+			dest->SetMode(this->GetModeChar(),false);
+			return MODEACTION_ALLOW;
+		}
+	}
+
+	return MODEACTION_DENY;
+}
+
+
+ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+	if (adding)
+	{
+		if (!channel->IsModeSet(this->GetModeChar()))
+		{
+			channel->SetMode(this->GetModeChar(),true);
+			return MODEACTION_ALLOW;
+		}
+	}
+	else
+	{
+		if (channel->IsModeSet(this->GetModeChar()))
+		{
+			channel->SetMode(this->GetModeChar(),false);
+			return MODEACTION_ALLOW;
+		}
+	}
+
+	return MODEACTION_DENY;
+}
+
+ModeWatcher::ModeWatcher(char modeletter, ModeType type) : mode(modeletter), m_type(type)
 {
 }
 
@@ -140,18 +206,18 @@ ModeType ModeWatcher::GetModeType()
 	return m_type;
 }
 
-bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding, ModeType type)
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
 {
 	return true;
 }
 
-void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter, bool adding, ModeType type)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
 {
 }
 
-userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status)
+User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 {
-	userrec *d;
+	User *d;
 	if ((!user) || (!dest) || (!chan) || (!*dest))
 	{
 		return NULL;
@@ -159,397 +225,353 @@ userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,i
 	d = ServerInstance->FindNick(dest);
 	if (!d)
 	{
-		user->WriteServ("401 %s %s :No such nick/channel",user->nick, dest);
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), dest);
 		return NULL;
 	}
 	return d;
 }
 
-const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text)
 {
-	if (!chan)
-		return "";
-
-	UCListIter n = d->chans.find(chan);
-	if (n != d->chans.end())
+	if (targetchannel)
+	{
+		/* Display channel's current mode string */
+		user->WriteNumeric(RPL_CHANNELMODEIS, "%s %s +%s",user->nick.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
+		user->WriteNumeric(RPL_CHANNELCREATED, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age);
+		return;
+	}
+	else
 	{
-		if (n->second & MASK)
+		if (targetuser == user || user->HasPrivPermission("users/auspex"))
 		{
-			return "";
+			/* Display user's current mode string */
+			user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
+			if (IS_OPER(targetuser))
+				user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
+			return;
 		}
-		n->second = n->second | MASK;
-		switch (MASK)
+		else
 		{
-			case UCMODE_OP:
-				n->first->AddOppedUser(d);
-			break;
-			case UCMODE_HOP:
-				n->first->AddHalfoppedUser(d);
-			break;
-			case UCMODE_VOICE:
-				n->first->AddVoicedUser(d);
-			break;
+			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't view modes for other users", user->nick.c_str());
+			return;
 		}
-		ServerInstance->Log(DEBUG,"grant: %s %s",n->first->name,d->nick);
-		return d->nick;
 	}
-	return "";
 }
 
-const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
+ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool adding, const unsigned char modechar,
+		std::string &parameter, bool SkipACL)
 {
-	if (!chan)
-		return "";
+	ModeType type = chan ? MODETYPE_CHANNEL : MODETYPE_USER;
+	unsigned char mask = chan ? MASK_CHANNEL : MASK_USER;
+
+	ModeHandler *mh = FindMode(modechar, type);
+	int pcnt = mh->GetNumParams(adding);
+
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt));
 
-	UCListIter n = d->chans.find(chan);
-	if (n != d->chans.end())
+	if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY))
+		return MODEACTION_DENY;
+
+	if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW))
 	{
-		if ((n->second & MASK) == 0)
-		{
-			return "";
-		}
-		n->second ^= MASK;
-		switch (MASK)
+		MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding);
+
+		if (MOD_RESULT == MOD_RES_DENY)
+			return MODEACTION_DENY;
+		if (MOD_RESULT == MOD_RES_PASSTHRU)
 		{
-			case UCMODE_OP:
-				n->first->DelOppedUser(d);
-			break;
-			case UCMODE_HOP:
-				n->first->DelHalfoppedUser(d);
-			break;
-			case UCMODE_VOICE:
-				n->first->DelVoicedUser(d);
-			break;
+			unsigned int neededrank = mh->GetLevelRequired();
+			/* Compare our rank on the channel against the rank of the required prefix,
+			 * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
+			 * in NAMES(X) are not in rank order, we know the most powerful mode is listed
+			 * first, so we don't need to iterate, we just look up the first instead.
+			 */
+			unsigned int ourrank = chan->GetPrefixValue(user);
+			if (ourrank < neededrank)
+			{
+				/* Bog off */
+				// TODO replace with a real search for the proper prefix
+				char needed = neededrank > HALFOP_VALUE ? '@' : '%';
+				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
+						user->nick.c_str(), chan->name.c_str(), needed, adding ? "" : "un", modechar);
+				return MODEACTION_DENY;
+			}
 		}
-		ServerInstance->Log(DEBUG,"revoke: %s %s",n->first->name,d->nick);
-		return d->nick;
 	}
-	return "";
-}
 
-void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text)
-{
-	if (targetchannel)
+	unsigned char handler_id = (modechar - 'A') | mask;
+
+	for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
 	{
-		/* Display channel's current mode string */
-		user->WriteServ("324 %s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
-		user->WriteServ("329 %s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age);
-		return;
+		if ((*watchers)->BeforeMode(user, targetuser, chan, parameter, adding, type) == false)
+			return MODEACTION_DENY;
+		/* A module whacked the parameter completely, and there was one. abort. */
+		if (pcnt && parameter.empty())
+			return MODEACTION_DENY;
 	}
-	else if (targetuser)
+
+	if (IS_LOCAL(user) && !IS_OPER(user))
 	{
-		if ((targetuser == user) || (*user->oper))
+		char* disabled = (type == MODETYPE_CHANNEL) ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes;
+		if (disabled[modechar - 'A'])
 		{
-			/* Display user's current mode string */
-			user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes());
-			if (*targetuser->oper)
-				user->WriteServ("008 %s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
-			return;
+			user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator",
+				user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
+			return MODEACTION_DENY;
+		}
+	}
+
+	if (adding && IS_LOCAL(user) && mh->NeedsOper() && !user->HasModePermission(modechar, type))
+	{
+		/* It's an oper only mode, and they don't have access to it. */
+		if (IS_OPER(user))
+		{
+			user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
+					user->nick.c_str(), irc::Spacify(user->oper.c_str()), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
 		}
 		else
 		{
-			user->WriteServ("502 %s :Can't change mode for other users", user->nick);
-			return;
+			user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c",
+					user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
 		}
+		return MODEACTION_DENY;
 	}
 
-	/* No such nick/channel */
-	user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
-	return;
-}
+	/* Call the handler for the mode */
+	ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding);
 
-void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
-{
-	std::string target = parameters[0];
-	ModeType type = MODETYPE_USER;
-	unsigned char mask = 0;
-	chanrec* targetchannel = ServerInstance->FindChan(parameters[0]);
-	userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
+	if (pcnt && parameter.empty())
+		return MODEACTION_DENY;
 
-	ServerInstance->Log(DEBUG,"ModeParser::Process start: pcnt=%d",pcnt);
+	if (ma != MODEACTION_ALLOW)
+		return ma;
 
-	LastParse = "";
+	mh->ChangeCount(adding ? 1 : -1);
 
-	/* Special case for displaying the list for listmodes,
-	 * e.g. MODE #chan b, or MODE #chan +b without a parameter
-	 */
-	if ((targetchannel) && (pcnt == 2))
+	if (mh->GetPrefixRank() && chan)
 	{
-		ServerInstance->Log(DEBUG,"Spool list");
-		const char* mode = parameters[1];
+		User* user_to_prefix = ServerInstance->FindNick(parameter);
+		if (user_to_prefix)
+			chan->SetPrefix(user_to_prefix, modechar, adding);
+	}
 
-		while (mode && *mode)
-		{
-			if (*mode == '+')
-			{
-				mode++;
-				continue;
-			}
+	for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+		(*watchers)->AfterMode(user, targetuser, chan, parameter, adding, type);
 
-			ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL);
+	return MODEACTION_ALLOW;
+}
 
-			if ((mh) && (mh->IsListMode()))
-			{
-				mh->DisplayList(user, targetchannel);
-			}
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool merge)
+{
+	std::string target = parameters[0];
+	Channel* targetchannel = ServerInstance->FindChan(target);
+	User* targetuser  = ServerInstance->FindNick(target);
+	ModeType type = targetchannel ? MODETYPE_CHANNEL : MODETYPE_USER;
 
-			mode++;
-		}
+	LastParse.clear();
+	LastParseParams.clear();
+	LastParseTranslate.clear();
+
+	if (!targetchannel && !targetuser)
+	{
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(),target.c_str());
+		return;
 	}
+	if (parameters.size() == 1)
+	{
+		this->DisplayCurrentModes(user, targetuser, targetchannel, target.c_str());
+		return;
+	}
+
+	std::string mode_sequence = parameters[1];
 
-	if (pcnt == 1)
+	bool SkipAccessChecks = false;
+
+	if (!IS_LOCAL(user) || ServerInstance->ULine(user->server))
 	{
-		ServerInstance->Log(DEBUG,"Mode list request");
-		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+		SkipAccessChecks = true;
 	}
-	else if (pcnt > 1)
+	else
 	{
-		ServerInstance->Log(DEBUG,"More than one parameter");
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
+		if (MOD_RESULT == MOD_RES_DENY)
+			return;
+		SkipAccessChecks = (MOD_RESULT == MOD_RES_ALLOW);
+	}
 
-		if (targetchannel)
+	if (targetuser && !SkipAccessChecks && user != targetuser)
+	{
+		user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
+		return;
+	}
+
+	std::string output_mode;
+	std::ostringstream output_parameters;
+	LastParseParams.push_back(output_mode);
+	LastParseTranslate.push_back(TR_TEXT);
+
+	bool adding = true;
+	char output_pm = '\0'; // current output state, '+' or '-'
+	unsigned int param_at = 2;
+
+	for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
+	{
+		unsigned char modechar = *letter;
+		if (modechar == '+' || modechar == '-')
 		{
-			type = MODETYPE_CHANNEL;
-			mask = MASK_CHANNEL;
+			adding = (modechar == '+');
+			continue;
+		}
 
-			/* Extra security checks on channel modes
-			 * (e.g. are they a (half)op?
-			 */
+		ModeHandler *mh = this->FindMode(modechar, type);
+		if (!mh)
+		{
+			/* No mode handler? Unknown mode character then. */
+			user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
+			continue;
+		}
 
-			if ((IS_LOCAL(user)) && (targetchannel->GetStatus(user) < STATUS_HOP))
+		std::string parameter = "";
+		int pcnt = mh->GetNumParams(adding);
+		if (pcnt && param_at == parameters.size())
+		{
+			/* No parameter, continue to the next mode */
+			mh->OnParameterMissing(user, targetuser, targetchannel);
+			continue;
+		}
+		else if (pcnt)
+		{
+			parameter = parameters[param_at++];
+			/* Make sure the user isn't trying to slip in an invalid parameter */
+			if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+				continue;
+			if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
 			{
-				/* We don't have halfop */
-				ServerInstance->Log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
+				std::string ours = targetchannel->GetModeParameter(modechar);
+				if (!mh->CheckTimeStamp(parameter, ours, targetchannel))
+					/* we won the mode merge, don't apply this mode */
+					continue;
+			}
+		}
 
-				int MOD_RESULT = 0;
-				FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
-				if (MOD_RESULT == ACR_DENY)
-					return;
+		ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, SkipAccessChecks);
 
-				if (MOD_RESULT == ACR_DEFAULT)
-				{
-					/* Are we a uline or is it a servermode? */
-					if ((!ServerInstance->ULine(user->server)) && (!servermode))
-					{
-						/* Not enough permission:
-						 * NOT a uline and NOT a servermode,
-						 * OR, NOT halfop or above.
-						 */
-						user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
-						return;
-					}
-				}
-			}
+		if (ma != MODEACTION_ALLOW)
+			continue;
+
+		char needed_pm = adding ? '+' : '-';
+		if (needed_pm != output_pm)
+		{
+			output_pm = needed_pm;
+			output_mode.append(1, output_pm);
 		}
-		else if (targetuser)
+		output_mode.append(1, modechar);
+
+		if (pcnt)
 		{
-			type = MODETYPE_USER;
-			mask = MASK_USER;
-			if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
+			TranslateType tt = mh->GetTranslateType();
+			if (tt == TR_NICK)
 			{
-				user->WriteServ("502 %s :Can't change mode for other users", user->nick);
-				return;
+				User* u = ServerInstance->FindNick(parameter);
+				if (u)
+					parameter = u->nick;
 			}
+			output_parameters << " " << parameter;
+			LastParseParams.push_back(parameter);
+			LastParseTranslate.push_back(tt);
 		}
-		else
+
+		if ( (output_mode.length() + output_parameters.str().length() > 450)
+				|| (output_mode.length() > 100)
+				|| (LastParseParams.size() > ServerInstance->Config->Limits.MaxModes))
 		{
-			/* No such nick/channel */
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
-			return;
+			/* mode sequence is getting too long */
+			break;
 		}
+	}
 
-		std::string mode_sequence = parameters[1];
-		std::string parameter = "";
-		std::ostringstream parameter_list;
-		std::string output_sequence = "";
-		bool adding = true, state_change = false;
-		unsigned char handler_id = 0;
-		int parameter_counter = 2; /* Index of first parameter */
-		int parameter_count = 0;
+	LastParseParams[0] = output_mode;
 
-		/* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
-		if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
-			mode_sequence.insert(0, "+");
+	if (!output_mode.empty())
+	{
+		LastParse = targetchannel ? targetchannel->name : targetuser->nick;
+		LastParse.append(" ");
+		LastParse.append(output_mode);
+		LastParse.append(output_parameters.str());
 
-		for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
+		if (targetchannel)
+		{
+			targetchannel->WriteChannel(user, "MODE %s", LastParse.c_str());
+			FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
+		}
+		else
 		{
-			unsigned char modechar = *letter;
+			targetuser->WriteFrom(user, "MODE %s", LastParse.c_str());
+			FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
+		}
+	}
+	else if (targetchannel && parameters.size() == 2)
+	{
+		/* Special case for displaying the list for listmodes,
+		 * e.g. MODE #chan b, or MODE #chan +b without a parameter
+		 */
+		this->DisplayListModes(user, targetchannel, mode_sequence);
+	}
+}
 
-			switch (modechar)
-			{
-				/* NB:
-				 * For + and - mode characters, we don't just stick the character into the output sequence.
-				 * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this
-				 * appearing in the output sequence, we store a flag which says there was a state change,
-				 * which is set on any + or -, however, the + or - that we finish on is only appended to
-				 * the output stream in the event it is followed by a non "+ or -" character, such as o or v.
-				 */
-				case '+':
-					/* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick,
-					 * however, will allow the + if it is the first item in the sequence, regardless.
-					 */
-					if ((!adding) || (!output_sequence.length()))
-						state_change = true;
-					adding = true;
-					continue;
-				break;
-				case '-':
-					if ((adding) || (!output_sequence.length()))
-						state_change = true;
-					adding = false;
-					continue;
-				break;
-				default:
-
-					/**
-					 * Watch carefully for the sleight of hand trick.
-					 * 65 is the ascii value of 'A'. We take this from
-					 * the char we're looking at to get a number between
-					 * 1 and 127. We then logic-or it to get the hashed
-					 * position, dependent on wether its a channel or
-					 * a user mode. This is a little stranger, but a lot
-					 * faster, than using a map of pairs.
-					 */
-					handler_id = (modechar - 65) | mask;
-
-					if (modehandlers[handler_id])
-					{
-						bool abort = false;
+void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_sequence)
+{
+	seq++;
 
-						for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
-						{
-							if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY)
-								abort = true;
-						}
-						if ((modehandlers[handler_id]->GetModeType() == type) && (!abort))
-						{
-							if (modehandlers[handler_id]->GetNumParams(adding))
-							{
-								/* This mode expects a parameter, do we have any parameters left in our list to use? */
-								if (parameter_counter < pcnt)
-								{
-									ServerInstance->Log(DEBUG,"parameter_counter = %d, pcnt = %d", parameter_counter, pcnt);
-									parameter = parameters[parameter_counter++];
-
-									/* Yerk, invalid! */
-									if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
-										parameter = "";
-								}
-								else
-								{
-									/* No parameter, continue to the next mode */
-									continue;
-								}
-							}
-
-							/* It's an oper only mode, check if theyre an oper. If they arent,
-							 * eat any parameter that  came with the mode, and continue to next
-							 */
-							if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
-							{
-								user->WriteServ("481 %s :Permission Denied- Only IRC operators may %sset %s mode %c", user->nick,
-										adding ? "" : "un", type == MODETYPE_CHANNEL ? "channel" : "user",
-										modehandlers[handler_id]->GetModeChar());
-								continue;
-							}
-
-							/* Call the handler for the mode */
-							ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
-
-							if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == ""))
-							{
-								/* The handler nuked the parameter and they are supposed to have one.
-								 * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
-								 * so we bail to the next mode character.
-								 */
-								continue;
-							}
-
-							if (ma == MODEACTION_ALLOW)
-							{
-								/* We're about to output a valid mode letter - was there previously a pending state-change? */
-								if (state_change)
-									output_sequence.append(adding ? "+" : "-");
-								
-								/* Add the mode letter */
-								output_sequence.push_back(modechar);
-
-								/* Is there a valid parameter for this mode? If so add it to the parameter list */
-								if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != ""))
-								{
-									parameter_list << " " << parameter;
-									parameter_count++;
-									/* Does this mode have a prefix? */
-									if (modehandlers[handler_id]->GetPrefix() && targetchannel)
-									{
-										userrec* user_to_prefix = ServerInstance->FindNick(parameter);
-										if (user_to_prefix)
-											targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(),
-													modehandlers[handler_id]->GetPrefixRank(), adding);
-									}
-								}
-
-								/* Call all the AfterMode events in the mode watchers for this mode */
-								for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
-									(*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
-
-								/* Reset the state change flag */
-								state_change = false;
-
-								if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
-										|| (parameter_count > MAXMODES))
-								{
-									/* We cant have a mode sequence this long */
-									letter = mode_sequence.end() - 1;
-									continue;
-								}
-							}
-						}
-					}
-					else
-					{
-						/* No mode handler? Unknown mode character then. */
-						user->WriteServ("472 %s %c :is unknown mode char to me",user->nick, modechar);
-					}
-				break;
-			}
+	for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
+	{
+		unsigned char mletter = *letter;
+		if (mletter == '+')
+			continue;
+
+		/* Ensure the user doesnt request the same mode twice,
+		 * so they cant flood themselves off out of idiocy.
+		 */
+		if (sent[mletter] == seq)
+			continue;
+
+		sent[mletter] = seq;
+
+		ModeHandler *mh = this->FindMode(mletter, MODETYPE_CHANNEL);
+
+		if (!mh || !mh->IsListMode())
+			return;
+
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mletter, "", true, 0));
+		if (MOD_RESULT == MOD_RES_DENY)
+			continue;
+
+		bool display = true;
+		if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE))
+		{
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",
+				user->nick.c_str(), chan->name.c_str(), mletter);
+			display = false;
 		}
-		/* Was there at least one valid mode in the sequence? */
-		if (output_sequence != "")
+
+		/** See below for a description of what craq this is :D
+		 */
+		unsigned char handler_id = (mletter - 'A') | MASK_CHANNEL;
+
+		for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
 		{
-			if (servermode)
-			{
-				if (type == MODETYPE_CHANNEL)
-				{
-					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
-					this->LastParse = targetchannel->name;
-				}
-				else
-				{
-					targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
-					this->LastParse = targetuser->nick;
-				}
-			}
-			else
-			{
-				if (type == MODETYPE_CHANNEL)
-				{
-					ServerInstance->Log(DEBUG,"Write output sequence and parameters to channel: %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
-					targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
-					FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
-					this->LastParse = targetchannel->name;
-				}
-				else
-				{
-					user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
-					FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
-					this->LastParse = targetuser->nick;
-				}
-			}
+			std::string dummyparam;
 
-			LastParse.append(" ");
-			LastParse.append(output_sequence);
-			LastParse.append(parameter_list.str());
+			if (!((*watchers)->BeforeMode(user, NULL, chan, dummyparam, true, MODETYPE_CHANNEL)))
+				display = false;
 		}
+		if (display)
+			mh->DisplayList(user, chan);
+		else
+			mh->DisplayEmptyList(user, chan);
 	}
 }
 
@@ -563,12 +585,15 @@ void ModeParser::CleanMask(std::string &mask)
 	std::string::size_type pos_of_pling = mask.find_first_of('!');
 	std::string::size_type pos_of_at = mask.find_first_of('@');
 	std::string::size_type pos_of_dot = mask.find_first_of('.');
-	std::string::size_type pos_of_colon = mask.find_first_of(':'); /* Because ipv6 addresses are colon delimited */
+	std::string::size_type pos_of_colons = mask.find("::"); /* Because ipv6 addresses are colon delimited -- double so it treats extban as nick */
+
+	if (mask.length() >= 2 && mask[1] == ':')
+		return; // if it's an extban, don't even try guess how it needs to be formed.
 
 	if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
 	{
-		/* Just a nick, or just a host */
-		if ((pos_of_dot == std::string::npos) && (pos_of_colon == std::string::npos))
+		/* Just a nick, or just a host - or clearly ipv6 (starting with :) */
+		if ((pos_of_dot == std::string::npos) && (pos_of_colons == std::string::npos) && mask[0] != ':')
 		{
 			/* It has no '.' in it, it must be a nick. */
 			mask.append("!*@*");
@@ -591,7 +616,7 @@ void ModeParser::CleanMask(std::string &mask)
 	}
 }
 
-bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
+bool ModeParser::AddMode(ModeHandler* mh)
 {
 	unsigned char mask = 0;
 	unsigned char pos = 0;
@@ -600,7 +625,7 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 	 * If they do that, thats their problem, and if i ever EVER see an
 	 * official InspIRCd developer do that, i'll beat them with a paddle!
 	 */
-	if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+	if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z') || (mh->GetPrefix() > 126))
 		return false;
 
 	/* A mode prefix of ',' is not acceptable, it would fuck up server to server.
@@ -617,7 +642,6 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 		return false;
 
 	modehandlers[pos] = mh;
-	ServerInstance->Log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar());
 	return true;
 }
 
@@ -635,10 +659,13 @@ bool ModeParser::DelMode(ModeHandler* mh)
 	if (!modehandlers[pos])
 		return false;
 
+	/* Note: We can't stack here, as we have modes potentially being removed across many different channels.
+	 * To stack here we have to make the algorithm slower. Discuss.
+	 */
 	switch (mh->GetModeType())
 	{
 		case MODETYPE_USER:
-			for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+			for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
 			{
 				mh->RemoveMode(i->second);
 			}
@@ -732,7 +759,7 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
 	return NULL;
 }
 
-std::string ModeParser::ModeString(userrec* user, chanrec* channel)
+std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix)
 {
 	std::string types;
 	std::string pars;
@@ -750,17 +777,23 @@ std::string ModeParser::ModeString(userrec* user, chanrec* channel)
 			ret = mh->ModeSet(NULL, user, channel, user->nick);
 			if ((ret.first) && (ret.second == user->nick))
 			{
-				pars.append(" ");
-				pars.append(user->nick);
+				if (nick_suffix)
+				{
+					pars.append(" ");
+					pars.append(user->nick);
+				}
 				types.push_back(mh->GetModeChar());
 			}
 		}
 	}
 
-	return types+pars;
+	if (nick_suffix)
+		return types+pars;
+	else
+		return types;
 }
 
-std::string ModeParser::ChanModes()
+std::string ModeParser::GiveModeList(ModeMasks m)
 {
 	std::string type1;	/* Listmodes EXCEPT those with a prefix */
 	std::string type2;	/* Modes that take a param when adding or removing */
@@ -769,10 +802,10 @@ std::string ModeParser::ChanModes()
 
 	for (unsigned char mode = 'A'; mode <= 'z'; mode++)
 	{
-		unsigned char pos = (mode-65) | MASK_CHANNEL;
+		unsigned char pos = (mode-65) | m;
 		 /* One parameter when adding */
 		if (modehandlers[pos])
-		{	
+		{
 			if (modehandlers[pos]->GetNumParams(true))
 			{
 				if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
@@ -802,23 +835,16 @@ std::string ModeParser::ChanModes()
 				type4 += modehandlers[pos]->GetModeChar();
 			}
 		}
-			 
 	}
 
 	return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
-bool ModeParser::PrefixComparison(const prefixtype one, const prefixtype two)
-{       
-	return one.second > two.second;
-}
-
 std::string ModeParser::BuildPrefixes()
 {
-	std::string mletters = "";
-	std::string mprefixes = "";
-	pfxcontainer pfx;
-	std::map<char,char> prefix_to_mode;
+	std::string mletters;
+	std::string mprefixes;
+	std::map<int,std::pair<char,char> > prefixes;
 
 	for (unsigned char mode = 'A'; mode <= 'z'; mode++)
 	{
@@ -826,17 +852,15 @@ std::string ModeParser::BuildPrefixes()
 
 		if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
 		{
-			pfx.push_back(std::make_pair<char,unsigned int>(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank()));
-			prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar();
+			prefixes[modehandlers[pos]->GetPrefixRank()] = std::make_pair(
+				modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetModeChar());
 		}
 	}
 
-	sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison);
-
-	for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++)
+	for(std::map<int,std::pair<char,char> >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++)
 	{
-		mletters = mletters + n->first;
-		mprefixes = mprefixes + prefix_to_mode.find(n->first)->second;
+		mletters = mletters + n->second.first;
+		mprefixes = mprefixes + n->second.second;
 	}
 
 	return "(" + mprefixes + ")" + mletters;
@@ -857,7 +881,6 @@ bool ModeParser::AddModeWatcher(ModeWatcher* mw)
 	pos = (mw->GetModeChar()-65) | mask;
 
 	modewatchers[pos].push_back(mw);
-	ServerInstance->Log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar());
 
 	return true;
 }
@@ -880,84 +903,113 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 
 	if (a == modewatchers[pos].end())
 	{
-		ServerInstance->Log(DEBUG, "ModeParser::DelModeWatcher: Couldn't find watcher for mode %c in list", mw->GetModeChar());
 		return false;
 	}
 
 	modewatchers[pos].erase(a);
-	ServerInstance->Log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
 
 	return true;
 }
 
 /** This default implementation can remove simple user modes
  */
-void ModeHandler::RemoveMode(userrec* user)
+void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { user->nick, moderemove };
+	std::vector<std::string> parameters;
 
 	if (user->IsModeSet(this->GetModeChar()))
 	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
+		if (stack)
+		{
+			stack->Push(this->GetModeChar());
+		}
+		else
+		{
+			sprintf(moderemove,"-%c",this->GetModeChar());
+			parameters.push_back(user->nick);
+			parameters.push_back(moderemove);
+			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
+		}
 	}
 }
 
 /** This default implementation can remove simple channel modes
  * (no parameters)
  */
-void ModeHandler::RemoveMode(chanrec* channel)
+void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { channel->name, moderemove };
+	std::vector<std::string> parameters;
 
 	if (channel->IsModeSet(this->GetModeChar()))
 	{
-		userrec* n = new userrec(ServerInstance);
-
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		n->SetFd(FD_MAGIC_NUMBER);
-
-		ServerInstance->SendMode(parameters, 2, n);
-
-		delete n;
+		if (stack)
+		{
+			stack->Push(this->GetModeChar());
+		}
+		else
+		{
+			sprintf(moderemove,"-%c",this->GetModeChar());
+			parameters.push_back(channel->name);
+			parameters.push_back(moderemove);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+		}
 	}
 }
 
-ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
+ModeParser::ModeParser()
 {
-	/* Clear mode list */
+	ModeHandler* modes[] =
+	{
+		new ModeChannelSecret,
+		new ModeChannelPrivate,
+		new ModeChannelModerated,
+		new ModeChannelTopicOps,
+
+		new ModeChannelNoExternal,
+		new ModeChannelInviteOnly,
+		new ModeChannelKey,
+		new ModeChannelLimit,
+
+		new ModeChannelBan,
+		new ModeChannelOp,
+		new ModeChannelHalfOp,
+		new ModeChannelVoice,
+
+		new ModeUserWallops,
+		new ModeUserInvisible,
+		new ModeUserOperator,
+		new ModeUserServerNoticeMask,
+#define BUILTIN_MODE_COUNT 16
+	};
+
+	/* Clear mode handler list */
 	memset(modehandlers, 0, sizeof(modehandlers));
-	memset(modewatchers, 0, sizeof(modewatchers));
 
 	/* Last parse string */
-	LastParse = "";
+	LastParse.clear();
 
 	/* Initialise the RFC mode letters */
+	for (int index = 0; index < BUILTIN_MODE_COUNT; index++)
+		this->AddMode(modes[index]);
 
-	/* Start with channel simple modes, no params */
-	this->AddMode(new ModeChannelSecret(Instance), 's');
-	this->AddMode(new ModeChannelPrivate(Instance), 'p');
-	this->AddMode(new ModeChannelModerated(Instance), 'm');
-	this->AddMode(new ModeChannelTopicOps(Instance), 't');
-	this->AddMode(new ModeChannelNoExternal(Instance), 'n');
-	this->AddMode(new ModeChannelInviteOnly(Instance), 'i');
-
-	/* Cannel modes with params */
-	this->AddMode(new ModeChannelKey(Instance), 'k');
-	this->AddMode(new ModeChannelLimit(Instance), 'l');
-
-	/* Channel listmodes */
-	this->AddMode(new ModeChannelBan(Instance), 'b');
-	this->AddMode(new ModeChannelOp(Instance), 'o');
-	this->AddMode(new ModeChannelHalfOp(Instance), 'h');
-	this->AddMode(new ModeChannelVoice(Instance), 'v');
-
-	/* Now for usermodes */
-	this->AddMode(new ModeUserServerNotice(Instance), 's');
-	this->AddMode(new ModeUserWallops(Instance), 'w');
-	this->AddMode(new ModeUserInvisible(Instance), 'i');
-	this->AddMode(new ModeUserOperator(Instance), 'o');
-	this->AddMode(new ModeUserServerNoticeMask(Instance), 'n');
+	seq = 0;
+	memset(&sent, 0, sizeof(sent));
+}
+
+ModeParser::~ModeParser()
+{
+	int count = 0;
+	for(int i=0; i < 256; i++)
+	{
+		ModeHandler* mh = modehandlers[i];
+		if (mh)
+		{
+			count++;
+			delete mh;
+		}
+	}
+	if (count != BUILTIN_MODE_COUNT)
+		throw CoreException("Mode handler found non-core modes remaining at deallocation");
 }