Now supports multiple commands seperated with \n. NOTE: These \n's are translated...

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index ff62f2089f798e6a53eaded1f04c4d328319a94d..8315dbcd1e7e795bc38b5ade6544edc916aeca50 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -90,23 +90,32 @@ class ListModeBase : public ModeHandler
                {
                        for(modelist::iterator it = el->begin(); it != el->end(); 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 %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");
                        char moderemove[MAXBUF];
                        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);
+                       }
+                       for(modelist::iterator it = copy.begin(); it != copy.end(); it++)
+                       {
+                               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);
@@ -249,18 +258,16 @@ class ListModeBase : public ModeHandler
                                                }
                                                return MODEACTION_ALLOW;
                                        }
-                                       else
-                                       {
-                                               /* Tried to remove something that wasn't set */
-                                               TellNotSet(source, channel, parameter);
-                                       }
                                }
+                               /* Tried to remove something that wasn't set */
+                               TellNotSet(source, channel, parameter);
                                parameter = "";
                                return MODEACTION_DENY;
                        }
                        else
                        {
-                               // Hmm, taking an exception off a non-existant list, DIE
+                               /* Hmm, taking an exception off a non-existant list, DIE */
+                               TellNotSet(source, channel, parameter);
                                parameter = "";
                                return MODEACTION_DENY;
                        }
@@ -300,19 +307,6 @@ class ListModeBase : public ModeHandler
 
        virtual void DoCleanup(int target_type, void* item)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* chan = (chanrec*)item;
-
-                       modelist* list;
-                       chan->GetExt(infokey, list);
-
-                       if (list)
-                       {
-                               chan->Shrink(infokey);
-                               delete list;
-                       }
-               }
        }
        
        virtual bool ValidateParam(userrec* source, chanrec* channel, std::string &parameter)