Fix my whoopsies

[user/henk/code/inspircd.git] / include / u_listmode.h

diff --git a/include/u_listmode.h b/include/u_listmode.h
index f2abf70ca763213ba6620bad588214d076148c09..f6e3830513b16c304e44339322309d65621b9373 100644 (file)
--- 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
 
@@ -67,7 +80,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)
@@ -109,22 +122,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;
                }
        }
@@ -301,13 +317,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)