X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=6c6e2ca28fbc63374a5e9c096e824eb390983c48;hb=57608fe351cff19679b1d78fb5cbfb7cad89dfc1;hp=379bcc342a43e9d70bc5dd9725e0598957d6bbc5;hpb=198cc96a62319c569cbfa97f1d3e58b96c8fe850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 379bcc342..6c6e2ca28 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,12 +14,6 @@
 #ifndef INSPIRCD_LISTMODE_PROVIDER
 #define INSPIRCD_LISTMODE_PROVIDER
 
-#include <stdio.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include "inspircd.h"
-#include "modules.h"
 #include "wildcard.h"
 
 /** Get the time as a string
@@ -174,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);
@@ -187,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++)
@@ -204,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 */
 	}
@@ -247,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;
@@ -305,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);
@@ -323,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 = "";
@@ -376,13 +376,13 @@ class ListModeBase : public ModeHandler
 	 */
 	virtual void DoChannelDelete(Channel* chan)
 	{
-		modelist* list;
-		chan->GetExt(infokey, list);
+		modelist* mlist;
+		chan->GetExt(infokey, mlist);
 
-		if (list)
+		if (mlist)
 		{
 			chan->Shrink(infokey);
-			delete list;
+			delete mlist;
 		}
 	}
 
@@ -394,13 +394,13 @@ class ListModeBase : public ModeHandler
 	 */
 	virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		modelist* list;
-		chan->GetExt(infokey, list);
+		modelist* mlist;
+		chan->GetExt(infokey, mlist);
 		irc::modestacker modestack(true);
 		std::deque<std::string> stackresult;
-		if (list)
+		if (mlist)
 		{
-			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
 			{
 				modestack.Push(std::string(1, mode)[0], assign(it->mask));
 			}