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 002530df45cdf96df8db873690cec95ff29809e0..a388d7f18207292c4a802d3c49d1e040735608ab 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,15 +14,7 @@
 #ifndef INSPIRCD_LISTMODE_PROVIDER
 #define INSPIRCD_LISTMODE_PROVIDER
 
-#include <stdio.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "inspircd.h"
 
 /** Get the time as a string
  */
@@ -240,15 +232,16 @@ class ListModeBase : public ModeHandler
 
        /** Populate the Implements list with the correct events for a List Mode
         */
-       virtual void DoImplements(char* List)
+       virtual void DoImplements(Module* m)
        {
-               List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1;
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, m, 4);
        }
 
        /** 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;
@@ -306,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);
@@ -324,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 = "";
@@ -377,13 +370,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;
                }
        }
 
@@ -395,13 +388,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));
                        }