X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fu_listmode.h;h=6c6e2ca28fbc63374a5e9c096e824eb390983c48;hb=8c2d96013084de950e3a63be4ae6ed626c4093ab;hp=31f07148f3ce38035c07b01e03ac901516b8eee9;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 31f07148f..6c6e2ca28 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -168,7 +168,7 @@ class ListModeBase : public ModeHandler
 	 * See mode.h
 	 * @param channel The channel to remove all instances of the mode from
 	 */
-	virtual void RemoveMode(Channel* channel)
+	virtual void RemoveMode(Channel* channel, irc::modestacker* stack)
 	{
 		modelist* el;
 		channel->GetExt(infokey, el);
@@ -181,9 +181,15 @@ class ListModeBase : public ModeHandler
 
 			for (modelist::iterator it = el->begin(); it != el->end(); it++)
 			{
-				modestack.Push(this->GetModeChar(), assign(it->mask));
+				if (stack)
+					stack->Push(this->GetModeChar(), assign(it->mask));
+				else
+					modestack.Push(this->GetModeChar(), assign(it->mask));
 			}
 
+			if (stack)
+				return;
+
 			while (modestack.GetStackedLine(stackresult))
 			{
 				for (size_t j = 0; j < stackresult.size(); j++)
@@ -198,7 +204,7 @@ class ListModeBase : public ModeHandler
 
 	/** See mode.h
 	 */
-	virtual void RemoveMode(User*)
+	virtual void RemoveMode(User*, irc::modestacker* stack)
 	{
 		/* Listmodes dont get set on users */
 	}
@@ -241,7 +247,7 @@ class ListModeBase : public ModeHandler
 	/** Handle the list mode.
 	 * See mode.h
 	 */
-	virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+	virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 	{
 		// Try and grab the list
 		modelist* el;
@@ -299,7 +305,7 @@ class ListModeBase : public ModeHandler
 							// And now add the mask onto the list...
 							ListItem e;
 							e.mask = assign(parameter);
-							e.nick = source->nick;
+							e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
 							e.time = stringtime();
 
 							el->push_back(e);
@@ -317,7 +323,7 @@ class ListModeBase : public ModeHandler
 			/* List is full, give subclass a chance to send a custom message */
 			if (!TellListTooLong(source, channel, parameter))
 			{
-				source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
+				source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
 			}
 			
 			parameter = "";