X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=28c364698fb07010b34d3fb0dbcfab88c5ccfaf9;hb=a77e32fa3267f022b4b0dd973c9b937534da9a5d;hp=8315dbcd1e7e795bc38b5ade6544edc916aeca50;hpb=38456992a31c9a44b552240b2a8f254efcb02485;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 8315dbcd1..28c364698 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #ifndef INSPIRCD_LISTMODE_PROVIDER
 #define INSPIRCD_LISTMODE_PROVIDER
 
@@ -8,7 +21,6 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "wildcard.h"
 #include "inspircd.h"
 
@@ -27,6 +39,8 @@ inline std::string stringtime()
 	return TIME.str();
 }
 
+/** An item in a listmode's list
+ */
 class ListItem : public classbase
 {
 public:
@@ -35,6 +49,8 @@ public:
 	std::string time;
 };
 
+/** The number of items a listmode's list may contain
+ */
 class ListLimit : public classbase
 {
 public:
@@ -46,6 +62,23 @@ public:
 typedef std::vector<ListItem> modelist;
 typedef std::vector<ListLimit> limitlist;
 
+class ListModeRequest : public Request
+{
+ public:
+	userrec* user;
+	chanrec* chan;
+
+	ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
+	{
+	}
+
+	~ListModeRequest()
+	{
+	}
+};
+
+/** The base class for listmodes defined by u_listmode.h
+ */
 class ListModeBase : public ModeHandler
 {
  protected:
@@ -62,7 +95,7 @@ class ListModeBase : public ModeHandler
  	: ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
 	{
 		this->DoRehash();
-		infokey = "exceptionbase_mode_" + std::string(1, mode) + "_list";
+		infokey = "listbase_mode_" + std::string(1, mode) + "_list";
 	}
 
 	std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
@@ -93,7 +126,7 @@ class ListModeBase : public ModeHandler
 				user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
 			}
 		}
-		user->WriteServ("%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+		user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
 	}
 
 	virtual void RemoveMode(chanrec* channel)
@@ -104,22 +137,25 @@ class ListModeBase : public ModeHandler
 		if (el)
 		{
 			ServerInstance->Log(DEBUG,"Channel is extended with a list");
-			char moderemove[MAXBUF];
+			irc::modestacker modestack(false);
+			std::deque<std::string> stackresult;
+			const char* mode_junk[MAXMODES+1];
+			mode_junk[0] = channel->name;
 			userrec* n = new userrec(ServerInstance);
 			n->SetFd(FD_MAGIC_NUMBER);
-			modelist copy;
-			/* Make a copy of it, because we cant change the list whilst iterating over it */
 			for(modelist::iterator it = el->begin(); it != el->end(); it++)
 			{
-				copy.push_back(*it);
+				modestack.Push(this->GetModeChar(), it->mask);
 			}
-			for(modelist::iterator it = copy.begin(); it != copy.end(); it++)
+			while (modestack.GetStackedLine(stackresult))
 			{
-				ServerInstance->Log(DEBUG,"Remove item %s",it->mask.c_str());
-				sprintf(moderemove,"-%c",this->GetModeChar());
-				const char* parameters[] = { channel->name, moderemove, it->mask.c_str() };
-				ServerInstance->SendMode(parameters, 3, n);
+				for (size_t j = 0; j < stackresult.size(); j++)
+				{
+					mode_junk[j+1] = stackresult[j].c_str();
+				}
+				ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n);		
 			}
+
 			delete n;
 		}
 	}
@@ -296,13 +332,21 @@ class ListModeBase : public ModeHandler
 	{
 		modelist* list;
 		chan->GetExt(infokey, list);
+		irc::modestacker modestack(true);
+		std::deque<std::string> stackresult;
 		if (list)
 		{
 			for (modelist::iterator it = list->begin(); it != list->end(); it++)
 			{
-				proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, "+" + std::string(1, mode) + " " + it->mask);
+				modestack.Push(std::string(1, mode)[0], it->mask);
 			}
 		}
+		while (modestack.GetStackedLine(stackresult))
+		{
+			irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
+			std::string line = mode_join.GetJoined();
+			proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line);
+		}
 	}
 
 	virtual void DoCleanup(int target_type, void* item)