X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=bce2b20191493a115f6957470bbe4d1f71f06847;hb=2d4a319d961e3f9e6aa9f7926f9ed320d72de8da;hp=6b22587b186698d204d6700df2e4905d84bfe789;hpb=7bd02d8a5dbac685d53a3f2aac9052c6ab5efa6e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 6b22587b1..bce2b2019 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -91,7 +91,7 @@ unsigned int ModeHandler::GetCount()
 void ModeHandler::ChangeCount(int modifier)
 {
 	count += modifier;
-	ServerInstance->Log(DEBUG,"Change count for mode %c is now %d", mode, count);
+	ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count);
 }
 
 ModeType ModeHandler::GetModeType()
@@ -119,7 +119,7 @@ char ModeHandler::GetModeChar()
 	return mode;
 }
 
-ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
 {
 	return MODEACTION_DENY;
 }
@@ -149,6 +149,71 @@ bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&,
 	return (ours < theirs);
 }
 
+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)
+{
+	/* Only opers can change other users modes */
+	if (source != dest)
+		return MODEACTION_DENY;
+
+	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, bool servermode)
+{
+	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(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
 {
 }
@@ -167,12 +232,12 @@ ModeType ModeWatcher::GetModeType()
 	return m_type;
 }
 
-bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool)
 {
 	return true;
 }
 
-void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool)
 {
 }
 
@@ -186,7 +251,7 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 	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;
@@ -217,7 +282,7 @@ const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
 				n->first->AddVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -247,7 +312,7 @@ const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
 				n->first->DelVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -257,39 +322,39 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 	if (targetchannel)
 	{
 		/* 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);
+		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 (targetuser)
 	{
 		if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
 		{
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
 			return;
 		}
 
 		if ((targetuser == user) || (IS_OPER(user)))
 		{
 			/* Display user's current mode string */
-			user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+			user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
 			if (IS_OPER(targetuser))
-				user->WriteServ("008 %s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+				user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
 			return;
 		}
 		else
 		{
-			user->WriteServ("502 %s :Can't change mode for other users", user->nick);
+			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
 			return;
 		}
 	}
 
 	/* No such nick/channel */
-	user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
+	user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
 	return;
 }
 
-void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
 {
 	std::string target = parameters[0];
 	ModeType type = MODETYPE_USER;
@@ -302,15 +367,14 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 	/* 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 ((targetchannel) && (parameters.size() == 2))
 	{
-		const char* mode = parameters[1];
+		const char* mode = parameters[1].c_str();
 		int nonlistmodes_found = 0;
-		bool sent[256];
 
-		mask = MASK_CHANNEL;
+		seq++;
 
-		memset(&sent, 0, 256);
+		mask = MASK_CHANNEL;
 		
 		while (mode && *mode)
 		{
@@ -325,9 +389,9 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 			/* Ensure the user doesnt request the same mode twice,
 			 * so they cant flood themselves off out of idiocy.
 			 */
-			if (!sent[mletter])
+			if (sent[mletter] != seq)
 			{
-				sent[mletter] = true;
+				sent[mletter] = seq;
 			}
 			else
 			{
@@ -348,11 +412,14 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 					continue;
 				}
 
-				if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+				if (!IS_OPER(user))
 				{
-					user->WriteServ("482 %s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
-					mh->DisplayEmptyList(user, targetchannel);
-					continue;
+					if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+					{
+						user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",user->nick.c_str(), targetchannel->name.c_str(), *mode++);
+						mh->DisplayEmptyList(user, targetchannel);
+						continue;
+					}
 				}
 
 				/** See below for a description of what craq this is :D
@@ -381,11 +448,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 			return;
 	}
 
-	if (pcnt == 1)
+	if (parameters.size() == 1)
 	{
-		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str());
 	}
-	else if (pcnt > 1)
+	else if (parameters.size() > 1)
 	{
 		bool SkipAccessChecks = false;
 
@@ -414,14 +481,14 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 			mask = MASK_USER;
 			if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
 			{
-				user->WriteServ("502 %s :Can't change mode for other users", user->nick);
+				user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
 				return;
 			}
 		}
 		else
 		{
 			/* No such nick/channel */
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
 			return;
 		}
 
@@ -431,8 +498,8 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 		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;
+		unsigned int parameter_counter = 2; /* Index of first parameter */
+		unsigned int parameter_count = 0;
 		bool last_successful_state_change = false;
 
 		/* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
@@ -495,7 +562,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 							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)
+								if (parameter_counter < parameters.size())
 								{
 									parameter = parameters[parameter_counter++];
 
@@ -509,11 +576,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 									continue;
 								}
 
-								FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1));
+								FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1, servermode));
 							}
 							else
 							{
-								FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0));
+								FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0, servermode));
 							}
 
 							if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY))
@@ -521,13 +588,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 
 							if (!SkipAccessChecks && IS_LOCAL(user) && (MOD_RESULT != ACR_ALLOW))
 							{
-								ServerInstance->Log(DEBUG,"Enter minimum prefix check");
 								/* Check access to this mode character */
 								if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix()))
 								{
 									char needed = modehandlers[handler_id]->GetNeededPrefix();
 									ModeHandler* prefixmode = FindPrefix(needed);
-									ServerInstance->Log(DEBUG,"Needed prefix: %c", needed);
 
 									/* 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
@@ -549,8 +614,8 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 									if (!ourmode || ourmode->GetPrefixRank() < neededrank)
 									{
 										/* Bog off */
-										user->WriteServ("482 %s %s :You must have channel privilege %c or above to %sset channel mode %c",
-												user->nick, targetchannel->name, needed, adding ? "" : "un", modechar);
+										user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
+												user->nick.c_str(), targetchannel->name.c_str(), needed, adding ? "" : "un", modechar);
 										continue;
 									}
 								}
@@ -560,7 +625,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 								
 							for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
 							{
-								if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
+								if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false)
 								{
 									abort = true;
 									break;
@@ -576,19 +641,42 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 							if (abort)
 								continue;
 
+							/* If it's disabled, they have to be an oper.
+							 */
+							if (IS_LOCAL(user) && !IS_OPER(user) && ((type == MODETYPE_CHANNEL ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes)[modehandlers[handler_id]->GetModeChar() - 'A']))
+							{
+								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",
+										modehandlers[handler_id]->GetModeChar());
+								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()) && (!IS_OPER(user)))
+							if (adding && (IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!user->HasModePermission(modehandlers[handler_id]->GetModeChar(), type)))
 							{
-								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());
+								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",
+											modehandlers[handler_id]->GetModeChar());
+								}
+								else
+								{
+									user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c",
+											user->nick.c_str(),
+											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);
+							ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode);
 
 							if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty()))
 							{
@@ -631,13 +719,13 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 
 								/* 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);
+									(*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type, servermode);
 
 								/* Reset the state change flag */
 								state_change = false;
 
 								if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
-										|| (parameter_count > MAXMODES))
+										|| (parameter_count > ServerInstance->Config->Limits.MaxModes))
 								{
 									/* We cant have a mode sequence this long */
 									letter = mode_sequence.end() - 1;
@@ -649,7 +737,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 					else
 					{
 						/* 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, modechar);
+						user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
 					}
 				break;
 			}
@@ -662,12 +750,12 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
+					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name.c_str(), 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());
+					targetuser->WriteServ("MODE %s %s%s",targetuser->nick.c_str(),output_sequence.c_str(), parameter_list.str().c_str());
 					this->LastParse = targetuser->nick;
 				}
 			}
@@ -675,13 +763,13 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+					targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), 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());
+					user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), 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;
 				}
@@ -704,12 +792,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("!*@*");
@@ -775,6 +866,9 @@ 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:
@@ -878,7 +972,7 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
 	return NULL;
 }
 
-std::string ModeParser::ModeString(User* user, Channel* channel)
+std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix)
 {
 	std::string types;
 	std::string pars;
@@ -896,14 +990,20 @@ std::string ModeParser::ModeString(User* user, Channel* 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()
@@ -1041,30 +1141,48 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 
 /** This default implementation can remove simple user modes
  */
-void ModeHandler::RemoveMode(User* 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->Parser->CallHandler("MODE", parameters, user);
+		}
 	}
 }
 
 /** This default implementation can remove simple channel modes
  * (no parameters)
  */
-void ModeHandler::RemoveMode(Channel* 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()))
 	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
+		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);
+		}
 	}
 }
 
@@ -1092,9 +1210,8 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 		NULL
 	};
 
-	/* Clear mode list */
+	/* Clear mode handler list */
 	memset(modehandlers, 0, sizeof(modehandlers));
-	memset(modewatchers, 0, sizeof(modewatchers));
 
 	/* Last parse string */
 	LastParse.clear();
@@ -1102,4 +1219,7 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 	/* Initialise the RFC mode letters */
 	for (int index = 0; modes[index]; index++)
 		this->AddMode(modes[index]);
+
+	seq = 0;
+	memset(&sent, 0, 256);
 }