X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=301f5a92138ef6ebd14de8f77d735baf15ac3004;hb=4a26ba48eba312cf57705dc4c46d48e2647414f8;hp=9d78fe64b568d792a89dd3342aea9f53a37e4611;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 9d78fe64b..301f5a921 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,15 +14,7 @@
 #ifndef INSPIRCD_LISTMODE_PROVIDER
 #define INSPIRCD_LISTMODE_PROVIDER
 
-#include <stdio.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "inspircd.h"
 
 /** Get the time as a string
  */
@@ -132,7 +124,7 @@ class ListModeBase : public ModeHandler
 
 	/** See mode.h 
 	 */
-	std::pair<bool,std::string> ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+	std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 	{
 		modelist* el;
 		channel->GetExt(infokey, el);
@@ -206,7 +198,7 @@ class ListModeBase : public ModeHandler
 
 	/** See mode.h
 	 */
-	virtual void RemoveMode(User* user)
+	virtual void RemoveMode(User*)
 	{
 		/* Listmodes dont get set on users */
 	}
@@ -240,15 +232,16 @@ class ListModeBase : public ModeHandler
 
 	/** Populate the Implements list with the correct events for a List Mode
 	 */
-	virtual void DoImplements(char* List)
+	virtual void DoImplements(Module* m)
 	{
-		List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1;
+		Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, m, 4);
 	}
 
 	/** Handle the list mode.
 	 * See mode.h
 	 */
-	virtual ModeAction OnModeChange(User* source, User* dest, 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;
@@ -306,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);
@@ -377,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;
 		}
 	}
 
@@ -395,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));
 			}
@@ -418,7 +411,7 @@ class ListModeBase : public ModeHandler
 	 * @param target_type Type of target to clean
 	 * @param item Item to clean
 	 */
-	virtual void DoCleanup(int target_type, void* item)
+	virtual void DoCleanup(int, void*)
 	{
 	}
 	
@@ -429,7 +422,7 @@ class ListModeBase : public ModeHandler
 	 * @param parameter The actual parameter being added
 	 * @return true if the parameter is valid
 	 */
-	virtual bool ValidateParam(User* source, Channel* channel, std::string &parameter)
+	virtual bool ValidateParam(User*, Channel*, std::string&)
 	{
 		return true;
 	}
@@ -441,7 +434,7 @@ class ListModeBase : public ModeHandler
 	 * @param parameter The actual parameter being added
 	 * @return Ignored
 	 */
-	virtual bool TellListTooLong(User* source, Channel* channel, std::string &parameter)
+	virtual bool TellListTooLong(User*, Channel*, std::string&)
 	{
 		return false;
 	}
@@ -452,7 +445,7 @@ class ListModeBase : public ModeHandler
 	 * @param channel Channel the parameter is being added to
 	 * @param parameter The actual parameter being added
 	 */
-	virtual void TellAlreadyOnList(User* source, Channel* channel, std::string &parameter)
+	virtual void TellAlreadyOnList(User*, Channel*, std::string&)
 	{
 	}
 	
@@ -462,7 +455,7 @@ class ListModeBase : public ModeHandler
 	 * @param channel Channel the parameter is being removed from
 	 * @param parameter The actual parameter being removed
 	 */
-	virtual void TellNotSet(User* source, Channel* channel, std::string &parameter)
+	virtual void TellNotSet(User*, Channel*, std::string&)
 	{
 	}
 };