More craq

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index baf7367450f39e1ec7ee4ac7f4243dcd0db44e7b..dddd799ee03ddc6b1686d85cc48b7e0a97c43463 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -18,18 +18,9 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 #include "modules.h"
 #include "wildcard.h"
-#include "inspircd.h"
-
-/* Updated to use the <banlist> config tag if it exists
- * Written by Om <omster@gmail.com>, December 2005.
- * Based on code previously written by Om - April 2005
- * Updated to new API July 8th 2006 by Brain
- * Originally based on m_chanprotect and m_silence
- */
 
 /** Get the time as a string
  */
@@ -71,8 +62,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.
@@ -81,7 +72,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)
        {
        }
 
@@ -139,7 +130,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);
@@ -160,7 +151,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);
@@ -174,11 +165,16 @@ class ListModeBase : public ModeHandler
                user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
 
+       virtual void DisplayEmptyList(User* user, Channel* channel)
+       {
+               user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+       }
+
        /** Remove all instances of the mode from a channel.
         * 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);
@@ -188,28 +184,27 @@ class ListModeBase : public ModeHandler
                        std::deque<std::string> stackresult;
                        const char* mode_junk[MAXMODES+2];
                        mode_junk[0] = channel->name;
-                       userrec* n = new userrec(ServerInstance);
-                       n->SetFd(FD_MAGIC_NUMBER);
+
                        for (modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
                                modestack.Push(this->GetModeChar(), assign(it->mask));
                        }
+
                        while (modestack.GetStackedLine(stackresult))
                        {
                                for (size_t j = 0; j < stackresult.size(); j++)
                                {
                                        mode_junk[j+1] = stackresult[j].c_str();
                                }
-                               ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n);         
-                       }
 
-                       delete n;
+                               ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);                
+                       }
                }
        }
 
        /** See mode.h
         */
-       virtual void RemoveMode(userrec* user)
+       virtual void RemoveMode(User*)
        {
                /* Listmodes dont get set on users */
        }
@@ -251,7 +246,7 @@ class ListModeBase : public ModeHandler
        /** 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)
        {
                // Try and grab the list
                modelist* el;
@@ -378,7 +373,7 @@ 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);
@@ -396,7 +391,7 @@ 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);
@@ -421,7 +416,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*)
        {
        }
        
@@ -432,7 +427,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;
        }
@@ -444,7 +439,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;
        }
@@ -455,7 +450,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&)
        {
        }
        
@@ -465,7 +460,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&)
        {
        }
 };