banexception, chanfilter and inviteexception should now be unloadable :)

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index b3958caa2f7d5a352a83c15b4171cf90fd72c34b..ff62f2089f798e6a53eaded1f04c4d328319a94d 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -8,7 +8,9 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "wildcard.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for easily creating listmodes, stores the time set, the user, and a parameter. */
 
@@ -47,7 +49,6 @@ typedef std::vector<ListLimit> limitlist;
 class ListModeBase : public ModeHandler
 {
  protected:
-       Server* Srv;
        std::string infokey;
        std::string listnumeric;
        std::string endoflistnumeric;
@@ -57,32 +58,29 @@ class ListModeBase : public ModeHandler
        limitlist chanlimits;
  
  public:
-       ListModeBase(Server* serv, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist")
-       : ModeHandler(modechar, 1, 1, true, MODETYPE_CHANNEL, false), Srv(serv), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
+       ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist")
+       : ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
        {
                this->DoRehash();
                infokey = "exceptionbase_mode_" + std::string(1, mode) + "_list";
        }
 
-        std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-               log(DEBUG,"ListMode: ModeSet()");
+       std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
                modelist* el;
                channel->GetExt(infokey, el);
                if (el)
                {
-                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
-                       {
-                               if(parameter == it->mask)
-                               {
-                                       log(DEBUG,"Found item %s",parameter.c_str());
+                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
+                       {
+                               if(parameter == it->mask)
+                               {
                                        return std::make_pair(true, parameter);
                                }
-                       }
+                       }
                }
-               log(DEBUG,"Didnt find item %s",parameter.c_str());
                return std::make_pair(false, parameter);
-        }
+       }
 
        virtual void DisplayList(userrec* user, chanrec* channel)
        {
@@ -98,9 +96,33 @@ class ListModeBase : public ModeHandler
                user->WriteServ( "%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
 
+       virtual void RemoveMode(chanrec* channel)
+       {
+               modelist* el;
+               channel->GetExt(infokey, el);
+               if (el)
+               {
+                       char moderemove[MAXBUF];
+                       userrec* n = new userrec(ServerInstance);
+                       n->SetFd(FD_MAGIC_NUMBER);
+                       for(modelist::iterator it = el->begin(); it != el->end(); it++)
+                       {
+                               sprintf(moderemove,"-%c",this->GetModeChar());
+                               const char* parameters[] = { channel->name, moderemove, it->mask.c_str() };
+                               ServerInstance->SendMode(parameters, 3, n);
+                       }
+                       delete n;
+               }
+       }
+
+       virtual void RemoveMode(userrec* user)
+       {
+               /* Listmodes dont get set on users */
+       }
+
        virtual void DoRehash()
        {
-               ConfigReader Conf;
+               ConfigReader Conf(ServerInstance);
 
                chanlimits.clear();
 
@@ -112,14 +134,7 @@ class ListModeBase : public ModeHandler
                        limit.limit = Conf.ReadInteger(configtag, "limit", i, true);
 
                        if(limit.mask.size() && limit.limit > 0)
-                       {
                                chanlimits.push_back(limit);
-                               log(DEBUG, "Read channel listmode limit of %u for mask '%s'", limit.limit, limit.mask.c_str());
-                       }
-                       else
-                       {
-                               log(DEBUG, "Invalid tag");
-                       }
                }
                if(chanlimits.size() == 0)
                {
@@ -172,7 +187,7 @@ class ListModeBase : public ModeHandler
 
                        for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++)
                        {
-                               if (Srv->MatchText(channel->name, it->mask))
+                               if (match(channel->name, it->mask.c_str()))
                                {
                                        // We have a pattern matching the channel...
                                        maxsize = el->size();