Add fixes to stop people changing the SID of a live server - certain configuration...

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 6b4fba8893b800547d0e8cff9f6494964c223d25..301f5a92138ef6ebd14de8f77d735baf15ac3004 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
  */
@@ -64,8 +56,8 @@ typedef std::vector<ListLimit> limitlist;
 class ListModeRequest : public Request
 {
  public:
-       userrec* user;
-       chanrec* chan;
+       User* user;
+       Channel* chan;
 
        /** Check if a user is on a channel's list.
         * The Event::Send() event returns true if the user is on the channel's list.
@@ -74,7 +66,7 @@ class ListModeRequest : public Request
         * @param u User to check against
         * @param c Channel to check against
         */
-       ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
+       ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
        {
        }
 
@@ -132,7 +124,7 @@ class ListModeBase : public ModeHandler
 
        /** See mode.h 
         */
-       std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string &parameter)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -153,7 +145,7 @@ class ListModeBase : public ModeHandler
         * @param user The user to send the list to
         * @param channel The channel the user is requesting the list for
         */
-       virtual void DisplayList(userrec* user, chanrec* channel)
+       virtual void DisplayList(User* user, Channel* channel)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -167,7 +159,7 @@ class ListModeBase : public ModeHandler
                user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
 
-       virtual void DisplayEmptyList(userrec* user, chanrec* channel)
+       virtual void DisplayEmptyList(User* user, Channel* channel)
        {
                user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
@@ -176,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(chanrec* channel)
+       virtual void RemoveMode(Channel* channel)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -206,7 +198,7 @@ class ListModeBase : public ModeHandler
 
        /** See mode.h
         */
-       virtual void RemoveMode(userrec* user)
+       virtual void RemoveMode(User*)
        {
                /* Listmodes dont get set on users */
        }
@@ -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(userrec* source, userrec* dest, chanrec* 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);
@@ -375,15 +368,15 @@ class ListModeBase : public ModeHandler
         * See modules.h.
         * @param chan Channel being deleted
         */
-       virtual void DoChannelDelete(chanrec* chan)
+       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;
                }
        }
 
@@ -393,15 +386,15 @@ class ListModeBase : public ModeHandler
         * @param proto Protocol module pointer
         * @param opaque Opaque connection handle
         */
-       virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       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));
                        }
@@ -418,7 +411,7 @@ class ListModeBase : public ModeHandler
         * @param target_type Type of target to clean
         * @param item Item to clean
         */
-       virtual void DoCleanup(int target_type, void* item)
+       virtual void DoCleanup(int, void*)
        {
        }
        
@@ -429,7 +422,7 @@ class ListModeBase : public ModeHandler
         * @param parameter The actual parameter being added
         * @return true if the parameter is valid
         */
-       virtual bool ValidateParam(userrec* source, chanrec* channel, std::string &parameter)
+       virtual bool ValidateParam(User*, Channel*, std::string&)
        {
                return true;
        }
@@ -441,7 +434,7 @@ class ListModeBase : public ModeHandler
         * @param parameter The actual parameter being added
         * @return Ignored
         */
-       virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string &parameter)
+       virtual bool TellListTooLong(User*, Channel*, std::string&)
        {
                return false;
        }
@@ -452,7 +445,7 @@ class ListModeBase : public ModeHandler
         * @param channel Channel the parameter is being added to
         * @param parameter The actual parameter being added
         */
-       virtual void TellAlreadyOnList(userrec* source, chanrec* channel, std::string &parameter)
+       virtual void TellAlreadyOnList(User*, Channel*, std::string&)
        {
        }
        
@@ -462,7 +455,7 @@ class ListModeBase : public ModeHandler
         * @param channel Channel the parameter is being removed from
         * @param parameter The actual parameter being removed
         */
-       virtual void TellNotSet(userrec* source, chanrec* channel, std::string &parameter)
+       virtual void TellNotSet(User*, Channel*, std::string&)
        {
        }
 };