X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=a388d7f18207292c4a802d3c49d1e040735608ab;hb=bca70575cb3d58127f80d92a388b60b5f5ed2fde;hp=5fa20fccd698c424891aa93271a6267ae01d8f0f;hpb=6fa2633311098d9775593186f5f5e1d339434cd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 5fa20fccd..a388d7f18 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
@@ -241,13 +235,13 @@ class ListModeBase : public ModeHandler
 	virtual void DoImplements(Module* m)
 	{
 		Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->Attach(eventlist, m, 4);
 	}
 
 	/** 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 +299,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 +317,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 +370,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 +388,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));
 			}