The bug we fixed for bug #506 may still occur in trunk if a module adjusts the nick...

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 31f07148f3ce38035c07b01e03ac901516b8eee9..a388d7f18207292c4a802d3c49d1e040735608ab 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -241,7 +241,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 +299,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 +317,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 = "";