Just to mess with om's head, remove helperfuncs.h from everywhere

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index d30da1e5ed5acb34316c63e28b4c753a25d100fd..6bcbb728a7478a0145da40f8dce95053850fdb37 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. */
 
@@ -25,7 +27,7 @@ inline std::string stringtime()
        return TIME.str();
 }
 
-class ListItem
+class ListItem : public classbase
 {
 public:
        std::string nick;
@@ -33,7 +35,7 @@ public:
        std::string time;
 };
 
-class ListLimit
+class ListLimit : public classbase
 {
 public:
        std::string mask;
@@ -47,39 +49,56 @@ typedef std::vector<ListLimit> limitlist;
 class ListModeBase : public ModeHandler
 {
  protected:
-       Server* Srv;
- 
        std::string infokey;
        std::string listnumeric;
        std::string endoflistnumeric;
        std::string endofliststring;
+       bool tidy;
        std::string configtag;
        limitlist chanlimits;
  
  public:
-       ListModeBase(Server* serv, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, const std::string &ctag = "banlist")
-       : ModeHandler(modechar, 1, 1, true, MODETYPE_CHANNEL, false), Srv(serv), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), 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)
+        {
+               modelist* el;
+               channel->GetExt(infokey, el);
+               if (el)
+               {
+                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
+                       {
+                               if(parameter == it->mask)
+                               {
+                                       return std::make_pair(true, parameter);
+                               }
+                       }
+               }
+               return std::make_pair(false, parameter);
+        }
+
        virtual void DisplayList(userrec* user, chanrec* channel)
        {
-               modelist* el = (modelist*)channel->GetExt(infokey);
+               modelist* el;
+               channel->GetExt(infokey, el);
                if (el)
                {
                        for(modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
-                               WriteServ(user->fd, "%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+                               user->WriteServ( "%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
                        }
                }
-               WriteServ(user->fd, "%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+               user->WriteServ( "%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
 
        virtual void DoRehash()
        {
-               ConfigReader Conf;
+               ConfigReader Conf(ServerInstance);
 
                chanlimits.clear();
 
@@ -91,14 +110,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)
                {
@@ -117,7 +129,8 @@ class ListModeBase : public ModeHandler
        virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
                // Try and grab the list
-               modelist* el = (modelist*)channel->GetExt(infokey);
+               modelist* el;
+               channel->GetExt(infokey, el);
 
                if (adding)
                {
@@ -130,7 +143,8 @@ class ListModeBase : public ModeHandler
                        }
 
                        // Clean the mask up
-                       ModeParser::CleanMask(parameter);
+                       if (this->tidy)
+                               ModeParser::CleanMask(parameter);
 
                        // Check if the item already exists in the list
                        for (modelist::iterator it = el->begin(); it != el->end(); it++)
@@ -149,7 +163,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();
@@ -188,7 +202,7 @@ class ListModeBase : public ModeHandler
                        /* List is full, give subclass a chance to send a custom message */
                        if(!TellListTooLong(source, channel, parameter))
                        {
-                               WriteServ(source->fd, "478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
+                               source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str());
                        }
                        
                        parameter = "";
@@ -237,7 +251,8 @@ class ListModeBase : public ModeHandler
 
        virtual void DoChannelDelete(chanrec* chan)
        {
-               modelist* list = (modelist*)chan->GetExt(infokey);
+               modelist* list;
+               chan->GetExt(infokey, list);
 
                if (list)
                {
@@ -248,7 +263,8 @@ class ListModeBase : public ModeHandler
 
        virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque)
        {
-               modelist* list = (modelist*)chan->GetExt(infokey);
+               modelist* list;
+               chan->GetExt(infokey, list);
                if (list)
                {
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
@@ -264,7 +280,8 @@ class ListModeBase : public ModeHandler
                {
                        chanrec* chan = (chanrec*)item;
 
-                       modelist* list = (modelist*)chan->GetExt(infokey);
+                       modelist* list;
+                       chan->GetExt(infokey, list);
 
                        if (list)
                        {