Fixes for bug #493, tidyups to clearing of channel modes on losing FJOIN. Module...

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index b9a11af82f5f88b0b4b189001368825a9bfe6367..6c6e2ca28fbc63374a5e9c096e824eb390983c48 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -168,7 +168,7 @@ class ListModeBase : public ModeHandler
         * See mode.h
         * @param channel The channel to remove all instances of the mode from
         */
-       virtual void RemoveMode(Channel* channel)
+       virtual void RemoveMode(Channel* channel, irc::modestacker* stack)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -181,9 +181,15 @@ class ListModeBase : public ModeHandler
 
                        for (modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
-                               modestack.Push(this->GetModeChar(), assign(it->mask));
+                               if (stack)
+                                       stack->Push(this->GetModeChar(), assign(it->mask));
+                               else
+                                       modestack.Push(this->GetModeChar(), assign(it->mask));
                        }
 
+                       if (stack)
+                               return;
+
                        while (modestack.GetStackedLine(stackresult))
                        {
                                for (size_t j = 0; j < stackresult.size(); j++)
@@ -198,7 +204,7 @@ class ListModeBase : public ModeHandler
 
        /** See mode.h
         */
-       virtual void RemoveMode(User*)
+       virtual void RemoveMode(User*, irc::modestacker* stack)
        {
                /* Listmodes dont get set on users */
        }
@@ -241,7 +247,7 @@ class ListModeBase : public ModeHandler
        /** Handle the list mode.
         * See mode.h
         */
-       virtual ModeAction OnModeChange(User* source, User*, 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;
@@ -299,7 +305,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);
@@ -317,7 +323,7 @@ class ListModeBase : public ModeHandler
                        /* List is full, give subclass a chance to send a custom message */
                        if (!TellListTooLong(source, channel, parameter))
                        {
-                               source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
+                               source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
                        }
                        
                        parameter = "";
@@ -370,13 +376,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;
                }
        }
 
@@ -388,13 +394,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));
                        }