More comments

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index d89362569583ac402146419467ec4e29b5006955..a2a3940451ff3fd99216dce2000d299c5a9a2b31 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
 
@@ -32,7 +45,7 @@ class ListItem : public classbase
 {
 public:
        std::string nick;
-       std::string mask;
+       irc::string mask;
        std::string time;
 };
 
@@ -49,6 +62,21 @@ 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
@@ -93,31 +121,29 @@ class ListModeBase : public ModeHandler
                channel->GetExt(infokey, el);
                if (el)
                {
-                       for(modelist::iterator it = el->begin(); it != el->end(); it++)
+                       for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
                        {
                                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)
        {
-               ServerInstance->Log(DEBUG,"Removing listmode base from %s %s",channel->name,infokey.c_str());
                modelist* el;
                channel->GetExt(infokey, el);
                if (el)
                {
-                       ServerInstance->Log(DEBUG,"Channel is extended with a list");
                        irc::modestacker modestack(false);
                        std::deque<std::string> stackresult;
-                       const char* mode_junk[MAXMODES+1];
+                       const char* mode_junk[MAXMODES+2];
                        mode_junk[0] = channel->name;
                        userrec* n = new userrec(ServerInstance);
                        n->SetFd(FD_MAGIC_NUMBER);
-                       for(modelist::iterator it = el->begin(); it != el->end(); it++)
+                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
-                               modestack.Push(this->GetModeChar(), it->mask);
+                               modestack.Push(this->GetModeChar(), assign(it->mask));
                        }
                        while (modestack.GetStackedLine(stackresult))
                        {
@@ -143,17 +169,17 @@ class ListModeBase : public ModeHandler
 
                chanlimits.clear();
 
-               for(int i = 0; i < Conf.Enumerate(configtag); i++)
+               for (int i = 0; i < Conf.Enumerate(configtag); i++)
                {
                        // For each <banlist> tag
                        ListLimit limit;
                        limit.mask = Conf.ReadValue(configtag, "chan", i);
                        limit.limit = Conf.ReadInteger(configtag, "limit", i, true);
 
-                       if(limit.mask.size() && limit.limit > 0)
+                       if (limit.mask.size() && limit.limit > 0)
                                chanlimits.push_back(limit);
                }
-               if(chanlimits.size() == 0)
+               if (chanlimits.size() == 0)
                {
                        ListLimit limit;
                        limit.mask = "*";
@@ -190,7 +216,7 @@ class ListModeBase : public ModeHandler
                        // Check if the item already exists in the list
                        for (modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
-                               if(parameter == it->mask)
+                               if (parameter == it->mask)
                                {
                                        /* Give a subclass a chance to error about this */
                                        TellAlreadyOnList(source, channel, parameter);
@@ -220,11 +246,11 @@ class ListModeBase : public ModeHandler
                                                 * 2) 'fix' parameter and then allow
                                                 * 3) deny
                                                 */
-                                               if(ValidateParam(source, channel, parameter))
+                                               if (ValidateParam(source, channel, parameter))
                                                {
                                                        // And now add the mask onto the list...
                                                        ListItem e;
-                                                       e.mask = parameter;
+                                                       e.mask = assign(parameter);
                                                        e.nick = source->nick;
                                                        e.time = stringtime();
 
@@ -241,7 +267,7 @@ class ListModeBase : public ModeHandler
                        }
 
                        /* List is full, give subclass a chance to send a custom message */
-                       if(!TellListTooLong(source, channel, parameter))
+                       if (!TellListTooLong(source, channel, parameter))
                        {
                                source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
                        }
@@ -256,10 +282,10 @@ class ListModeBase : public ModeHandler
                        {
                                for (modelist::iterator it = el->begin(); it != el->end(); it++)
                                {
-                                       if(parameter == it->mask)
+                                       if (parameter == it->mask)
                                        {
                                                el->erase(it);
-                                               if(el->size() == 0)
+                                               if (el->size() == 0)
                                                {
                                                        channel->Shrink(infokey);
                                                        delete el;
@@ -310,7 +336,7 @@ class ListModeBase : public ModeHandler
                {
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               modestack.Push(std::string(1, mode)[0], it->mask);
+                               modestack.Push(std::string(1, mode)[0], assign(it->mask));
                        }
                }
                while (modestack.GetStackedLine(stackresult))
@@ -346,3 +372,4 @@ class ListModeBase : public ModeHandler
 };
 
 #endif
+