X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=a632ab516916f02cf4b37d44a26c90ea64a388aa;hb=db2a4c2c15bb170464bbff464d7cc79cd098df26;hp=c8fecafa5f6d2cb48a81748ab6ea8a2730a15c55;hpb=e35dd5cbb8b7d0d39a83b35c5837c1f062977eea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index c8fecafa5..a632ab516 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "inspstring.h"
 
@@ -36,8 +34,6 @@
 #include "modes/cmode_l.h"
 /* +o (channel op) */
 #include "modes/cmode_o.h"
-/* +h (channel halfop) */
-#include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
 /* +w (see wallops) */
@@ -49,30 +45,29 @@
 /* +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, char prefixrequired, TranslateType translate)
-	: ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), m_paramtype(translate), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired)
-{
-}
-
-ModeHandler::~ModeHandler()
+ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
+	: ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT),
+	parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
+	list(false), m_type(type), levelrequired(HALFOP_VALUE)
 {
 }
 
-bool ModeHandler::IsListMode()
+CullResult ModeHandler::cull()
 {
-	return list;
+	if (ServerInstance->Modes)
+		ServerInstance->Modes->DelMode(this);
+	return classbase::cull();
 }
 
-char ModeHandler::GetNeededPrefix()
+ModeHandler::~ModeHandler()
 {
-	if (prefixneeded == '%' && !ServerInstance->Config->AllowHalfop)
-		return '@';
-	return prefixneeded;
+	if (ServerInstance && ServerInstance->Modes && ServerInstance->Modes->FindMode(mode, m_type) == this)
+		ServerInstance->Logs->Log("MODE", DEFAULT, "ERROR: Destructor for mode %c called while still registered", mode);
 }
 
-void ModeHandler::SetNeededPrefix(char needsprefix)
+bool ModeHandler::IsListMode()
 {
-	prefixneeded = needsprefix;
+	return list;
 }
 
 unsigned int ModeHandler::GetPrefixRank()
@@ -80,45 +75,18 @@ unsigned int ModeHandler::GetPrefixRank()
 	return 0;
 }
 
-unsigned int ModeHandler::GetCount()
-{
-	return 0;
-}
-
-void ModeHandler::ChangeCount(int modifier)
-{
-	count += modifier;
-	ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count);
-}
-
-ModeType ModeHandler::GetModeType()
-{
-	return m_type;
-}
-
-TranslateType ModeHandler::GetTranslateType()
-{
-	return m_paramtype;
-}
-
-bool ModeHandler::NeedsOper()
-{
-	return oper;
-}
-
-char ModeHandler::GetPrefix()
-{
-	return prefix;
-}
-
 int ModeHandler::GetNumParams(bool adding)
 {
-	return adding ? n_params_on : n_params_off;
-}
-
-char ModeHandler::GetModeChar()
-{
-	return mode;
+	switch (parameters_taken)
+	{
+		case PARAM_ALWAYS:
+			return 1;
+		case PARAM_SETONLY:
+			return adding ? 1 : 0;
+		case PARAM_NONE:
+			break;
+	}
+	return 0;
 }
 
 std::string ModeHandler::GetUserParameter(User* user)
@@ -126,21 +94,14 @@ std::string ModeHandler::GetUserParameter(User* user)
 	return "";
 }
 
-ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
+ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool)
 {
-	return MODEACTION_DENY;
+	return MOD_RES_PASSTHRU;
 }
 
-ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&)
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
 {
-	if (dest)
-	{
-		return std::make_pair(dest->IsModeSet(this->mode), "");
-	}
-	else
-	{
-		return std::make_pair(channel->IsModeSet(this->mode), "");
-	}
+	return MODEACTION_DENY;
 }
 
 void ModeHandler::DisplayList(User*, Channel*)
@@ -155,28 +116,12 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
+bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
 {
-	return (ours < theirs);
+	return (theirs < ours);
 }
 
-SimpleUserModeHandler::SimpleUserModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_USER, false)
-{
-}
-
-SimpleUserModeHandler::~SimpleUserModeHandler()
-{
-}
-
-SimpleChannelModeHandler::~SimpleChannelModeHandler()
-{
-}
-
-SimpleChannelModeHandler::SimpleChannelModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_CHANNEL, false)
-{
-}
-
-ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
+ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
@@ -199,7 +144,7 @@ ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel
 }
 
 
-ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
+ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
@@ -221,7 +166,27 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan
 	return MODEACTION_DENY;
 }
 
-ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
+ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+	if (adding && !ParamValidate(parameter))
+		return MODEACTION_DENY;
+	std::string now = channel->GetModeParameter(this);
+	if (parameter == now)
+		return MODEACTION_DENY;
+	if (adding)
+		channel->SetModeParam(this, parameter);
+	else
+		channel->SetModeParam(this, "");
+	return MODEACTION_ALLOW;
+}
+
+bool ParamChannelModeHandler::ParamValidate(std::string& parameter)
+{
+	return true;
+}
+
+ModeWatcher::ModeWatcher(Module* Creator, char modeletter, ModeType type)
+	: mode(modeletter), m_type(type), creator(Creator)
 {
 }
 
@@ -239,12 +204,12 @@ ModeType ModeWatcher::GetModeType()
 	return m_type;
 }
 
-bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool)
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
 {
 	return true;
 }
 
-void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
 {
 }
 
@@ -264,66 +229,6 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 	return d;
 }
 
-const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
-{
-	if (!chan)
-		return "";
-
-	UCListIter n = d->chans.find(chan);
-	if (n != d->chans.end())
-	{
-		if (n->second & MASK)
-		{
-			return "";
-		}
-		n->second = n->second | MASK;
-		switch (MASK)
-		{
-			case UCMODE_OP:
-				n->first->AddOppedUser(d);
-			break;
-			case UCMODE_HOP:
-				n->first->AddHalfoppedUser(d);
-			break;
-			case UCMODE_VOICE:
-				n->first->AddVoicedUser(d);
-			break;
-		}
-		return d->nick.c_str();
-	}
-	return "";
-}
-
-const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
-{
-	if (!chan)
-		return "";
-
-	UCListIter n = d->chans.find(chan);
-	if (n != d->chans.end())
-	{
-		if ((n->second & MASK) == 0)
-		{
-			return "";
-		}
-		n->second ^= MASK;
-		switch (MASK)
-		{
-			case UCMODE_OP:
-				n->first->DelOppedUser(d);
-			break;
-			case UCMODE_HOP:
-				n->first->DelHalfoppedUser(d);
-			break;
-			case UCMODE_VOICE:
-				n->first->DelVoicedUser(d);
-			break;
-		}
-		return d->nick.c_str();
-	}
-	return "";
-}
-
 void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text)
 {
 	if (targetchannel)
@@ -335,12 +240,6 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 	}
 	else
 	{
-		if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
-		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
-			return;
-		}
-
 		if (targetuser == user || user->HasPrivPermission("users/auspex"))
 		{
 			/* Display user's current mode string */
@@ -351,14 +250,14 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 		}
 		else
 		{
-			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
+			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't view modes for other users", user->nick.c_str());
 			return;
 		}
 	}
 }
 
 ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool adding, const unsigned char modechar,
-		std::string &parameter, bool servermode, bool SkipACL)
+		std::string &parameter, bool SkipACL)
 {
 	ModeType type = chan ? MODETYPE_CHANNEL : MODETYPE_USER;
 	unsigned char mask = chan ? MASK_CHANNEL : MASK_USER;
@@ -366,44 +265,46 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 	ModeHandler *mh = FindMode(modechar, type);
 	int pcnt = mh->GetNumParams(adding);
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnRawMode, OnRawMode(user, chan, modechar, parameter, adding, pcnt, servermode));
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt));
 
-	if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY))
+	if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY))
 		return MODEACTION_DENY;
 
-	if (chan && !SkipACL && (MOD_RESULT != ACR_ALLOW))
+	if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW))
 	{
-		char needed = mh->GetNeededPrefix();
-		ModeHandler* prefixmode = FindPrefix(needed);
+		MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding);
 
-		/* If the mode defined by the handler is not '\0', but the handler for it
-		 * cannot be found, they probably dont have the right module loaded to implement
-		 * the prefix they want to compare the mode against, e.g. '&' for m_chanprotect.
-		 * Revert to checking against the minimum core prefix, '%'.
-		 */
-		if (needed && !prefixmode)
-		{
-			needed = ServerInstance->Config->AllowHalfop ? '%' : '@';
-			prefixmode = FindPrefix(needed);
-		}
-
-		if (needed)
+		if (MOD_RESULT == MOD_RES_DENY)
+			return MODEACTION_DENY;
+		if (MOD_RESULT == MOD_RES_PASSTHRU)
 		{
-			unsigned int neededrank = prefixmode->GetPrefixRank();
+			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.
 			 */
-			std::string modestring = chan->GetAllPrefixChars(user);
-			char ml = (modestring.empty() ? '\0' : modestring[0]);
-			ModeHandler* ourmode = FindPrefix(ml);
-			if (!ourmode || ourmode->GetPrefixRank() < neededrank)
+			unsigned int ourrank = chan->GetPrefixValue(user);
+			if (ourrank < neededrank)
 			{
-				/* Bog off */
-				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);
+				ModeHandler* neededmh = NULL;
+				for(char c='A'; c <= 'z'; c++)
+				{
+					ModeHandler *privmh = FindMode(c, MODETYPE_CHANNEL);
+					if (privmh && privmh->GetPrefixRank() >= neededrank)
+					{
+						// this mode is sufficient to allow this action
+						if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank())
+							neededmh = privmh;
+					}
+				}
+				if (neededmh)
+					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel %s access or above to %sset channel mode %c",
+						user->nick.c_str(), chan->name.c_str(), neededmh->name.c_str(), adding ? "" : "un", modechar);
+				else
+					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You cannot %sset channel mode %c",
+						user->nick.c_str(), chan->name.c_str(), adding ? "" : "un", modechar);
 				return MODEACTION_DENY;
 			}
 		}
@@ -413,7 +314,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 
 	for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
 	{
-		if ((*watchers)->BeforeMode(user, targetuser, chan, parameter, adding, type, servermode) == false)
+		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())
@@ -437,7 +338,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 		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(), user->oper.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
+					user->nick.c_str(), user->oper->NameStr(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
 		}
 		else
 		{
@@ -447,8 +348,23 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 		return MODEACTION_DENY;
 	}
 
+	if (mh->GetTranslateType() == TR_NICK && !ServerInstance->FindNick(parameter))
+	{
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str());
+		return MODEACTION_DENY;
+	}
+
+	if (mh->GetPrefixRank() && chan)
+	{
+		User* user_to_prefix = ServerInstance->FindNick(parameter);
+		if (!user_to_prefix)
+			return MODEACTION_DENY;
+		if (!chan->SetPrefix(user_to_prefix, modechar, adding))
+			return MODEACTION_DENY;
+	}
+
 	/* Call the handler for the mode */
-	ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding, servermode);
+	ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding);
 
 	if (pcnt && parameter.empty())
 		return MODEACTION_DENY;
@@ -456,22 +372,13 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 	if (ma != MODEACTION_ALLOW)
 		return ma;
 
-	mh->ChangeCount(adding ? 1 : -1);
-
-	if (mh->GetPrefix() && chan)
-	{
-		User* user_to_prefix = ServerInstance->FindNick(parameter);
-		if (user_to_prefix)
-			chan->SetPrefix(user_to_prefix, mh->GetPrefix(), mh->GetPrefixRank(), adding);
-	}
-
 	for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
-		(*watchers)->AfterMode(user, targetuser, chan, parameter, adding, type, servermode);
+		(*watchers)->AfterMode(user, targetuser, chan, parameter, adding, type);
 
 	return MODEACTION_ALLOW;
 }
 
-void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool merge)
 {
 	std::string target = parameters[0];
 	Channel* targetchannel = ServerInstance->FindChan(target);
@@ -493,34 +400,23 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		return;
 	}
 
-	std::string mode_sequence = parameters[1];
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
 
 	bool SkipAccessChecks = false;
 
-	if (servermode || !IS_LOCAL(user) || ServerInstance->ULine(user->server))
-	{
+	if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW)
 		SkipAccessChecks = true;
-	}
-	else if (targetchannel)
-	{
-		/* Overall access control hook for mode change */
-		LastParse = mode_sequence;
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
-		LastParse.clear();
-		if (MOD_RESULT == ACR_DENY)
-			return;
-		SkipAccessChecks = (MOD_RESULT == ACR_ALLOW);
-	}
-	else
+	else if (MOD_RESULT == MOD_RES_DENY)
+		return;
+
+	if (targetuser && !SkipAccessChecks && user != targetuser)
 	{
-		if (user != targetuser)
-		{
-			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
-			return;
-		}
+		user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
+		return;
 	}
 
+	std::string mode_sequence = parameters[1];
 
 	std::string output_mode;
 	std::ostringstream output_parameters;
@@ -562,9 +458,16 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 			/* 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())
+			{
+				std::string ours = targetchannel->GetModeParameter(modechar);
+				if (!mh->ResolveModeConflict(parameter, ours, targetchannel))
+					/* we won the mode merge, don't apply this mode */
+					continue;
+			}
 		}
 
-		ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, servermode, SkipAccessChecks);
+		ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, SkipAccessChecks);
 
 		if (ma != MODEACTION_ALLOW)
 			continue;
@@ -579,9 +482,16 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 
 		if (pcnt)
 		{
+			TranslateType tt = mh->GetTranslateType();
+			if (tt == TR_NICK)
+			{
+				User* u = ServerInstance->FindNick(parameter);
+				if (u)
+					parameter = u->nick;
+			}
 			output_parameters << " " << parameter;
 			LastParseParams.push_back(parameter);
-			LastParseTranslate.push_back(mh->GetTranslateType());
+			LastParseTranslate.push_back(tt);
 		}
 
 		if ( (output_mode.length() + output_parameters.str().length() > 450)
@@ -602,16 +512,12 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		LastParse.append(output_mode);
 		LastParse.append(output_parameters.str());
 
-		if (!user && targetchannel)
-			targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s", LastParse.c_str());
-		else if (!user && targetuser)
-			targetuser->WriteServ("MODE %s", LastParse.c_str());
-		else if (targetchannel)
+		if (targetchannel)
 		{
 			targetchannel->WriteChannel(user, "MODE %s", LastParse.c_str());
 			FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
 		}
-		else if (targetuser)
+		else
 		{
 			targetuser->WriteFrom(user, "MODE %s", LastParse.c_str());
 			FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
@@ -649,21 +555,19 @@ void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_s
 		if (!mh || !mh->IsListMode())
 			return;
 
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnRawMode, OnRawMode(user, chan, mletter, "", true, 0));
-		if (MOD_RESULT == ACR_DENY)
+		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->GetStatus(user) < STATUS_HOP))
+		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->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You do not have access to view the +%c list",
 				user->nick.c_str(), chan->name.c_str(), mletter);
 			display = false;
 		}
 
-		/** 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++)
@@ -740,6 +644,9 @@ bool ModeParser::AddMode(ModeHandler* mh)
 	if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#'))
 		return false;
 
+	if (mh->GetPrefix() && FindPrefix(mh->GetPrefix()))
+		return false;
+
 	mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
 	pos = (mh->GetModeChar()-65) | mask;
 
@@ -761,7 +668,7 @@ bool ModeParser::DelMode(ModeHandler* mh)
 	mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
 	pos = (mh->GetModeChar()-65) | mask;
 
-	if (!modehandlers[pos])
+	if (modehandlers[pos] != mh)
 		return false;
 
 	/* Note: We can't stack here, as we have modes potentially being removed across many different channels.
@@ -864,40 +771,6 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
 	return NULL;
 }
 
-std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix)
-{
-	std::string types;
-	std::string pars;
-
-	if (!channel || !user)
-		return "";
-
-	for (unsigned char mode = 'A'; mode <= 'z'; mode++)
-	{
-		unsigned char pos = (mode-65) | MASK_CHANNEL;
-		ModeHandler* mh = modehandlers[pos];
-		if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false)))
-		{
-			ModePair ret;
-			ret = mh->ModeSet(NULL, user, channel, user->nick);
-			if ((ret.first) && (ret.second == user->nick))
-			{
-				if (nick_suffix)
-				{
-					pars.append(" ");
-					pars.append(user->nick);
-				}
-				types.push_back(mh->GetModeChar());
-			}
-		}
-	}
-
-	if (nick_suffix)
-		return types+pars;
-	else
-		return types;
-}
-
 std::string ModeParser::GiveModeList(ModeMasks m)
 {
 	std::string type1;	/* Listmodes EXCEPT those with a prefix */
@@ -945,17 +818,11 @@ std::string ModeParser::GiveModeList(ModeMasks m)
 	return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
-bool ModeParser::PrefixComparison(prefixtype one, prefixtype two)
-{
-	return one.second > two.second;
-}
-
-std::string ModeParser::BuildPrefixes()
+std::string ModeParser::BuildPrefixes(bool lettersAndModes)
 {
 	std::string mletters;
 	std::string mprefixes;
-	pfxcontainer pfx;
-	std::map<char,char> prefix_to_mode;
+	std::map<int,std::pair<char,char> > prefixes;
 
 	for (unsigned char mode = 'A'; mode <= 'z'; mode++)
 	{
@@ -963,20 +830,18 @@ 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;
+	return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;
 }
 
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
@@ -1042,7 +907,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 			sprintf(moderemove,"-%c",this->GetModeChar());
 			parameters.push_back(user->nick);
 			parameters.push_back(moderemove);
-			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, true);
+			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
 		}
 	}
 }
@@ -1071,39 +936,63 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 	}
 }
 
-ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
+struct builtin_modes
 {
-	ModeHandler* modes[] =
+	ModeChannelSecret s;
+	ModeChannelPrivate p;
+	ModeChannelModerated m;
+	ModeChannelTopicOps t;
+
+	ModeChannelNoExternal n;
+	ModeChannelInviteOnly i;
+	ModeChannelKey k;
+	ModeChannelLimit l;
+
+	ModeChannelBan b;
+	ModeChannelOp o;
+	ModeChannelVoice v;
+
+	ModeUserWallops uw;
+	ModeUserInvisible ui;
+	ModeUserOperator uo;
+	ModeUserServerNoticeMask us;
+
+	void init(ModeParser* modes)
 	{
-		new ModeChannelSecret(Instance),
-		new ModeChannelPrivate(Instance),
-		new ModeChannelModerated(Instance),
-		new ModeChannelTopicOps(Instance),
-		new ModeChannelNoExternal(Instance),
-		new ModeChannelInviteOnly(Instance),
-		new ModeChannelKey(Instance),
-		new ModeChannelLimit(Instance),
-		new ModeChannelBan(Instance),
-		new ModeChannelOp(Instance),
-		new ModeChannelHalfOp(Instance),
-		new ModeChannelVoice(Instance),
-		new ModeUserWallops(Instance),
-		new ModeUserInvisible(Instance),
-		new ModeUserOperator(Instance),
-		new ModeUserServerNoticeMask(Instance),
-		NULL
-	};
+		modes->AddMode(&s);
+		modes->AddMode(&p);
+		modes->AddMode(&m);
+		modes->AddMode(&t);
+		modes->AddMode(&n);
+		modes->AddMode(&i);
+		modes->AddMode(&k);
+		modes->AddMode(&l);
+		modes->AddMode(&b);
+		modes->AddMode(&o);
+		modes->AddMode(&v);
+		modes->AddMode(&uw);
+		modes->AddMode(&ui);
+		modes->AddMode(&uo);
+		modes->AddMode(&us);
+	}
+};
+
+static builtin_modes static_modes;
 
+ModeParser::ModeParser()
+{
 	/* Clear mode handler list */
 	memset(modehandlers, 0, sizeof(modehandlers));
 
 	/* Last parse string */
 	LastParse.clear();
 
-	/* Initialise the RFC mode letters */
-	for (int index = 0; modes[index]; index++)
-		this->AddMode(modes[index]);
-
 	seq = 0;
 	memset(&sent, 0, sizeof(sent));
+
+	static_modes.init(this);
+}
+
+ModeParser::~ModeParser()
+{
 }