Migrate u_listmode.h into the core, change +b to use it

[user/henk/code/inspircd.git] / src / modules / m_banredirect.cpp

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index c2dff91267fd2621262a66628543567f253a697e..ffd47d79363480e37c2f9d2086707db49946442f 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -23,7 +23,7 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
+#include "listmode.h"
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
 
@@ -43,14 +43,16 @@ class BanRedirectEntry
 };
 
 typedef std::vector<BanRedirectEntry> BanRedirectList;
-typedef std::deque<std::string> StringDeque;
 
 class BanRedirect : public ModeWatcher
 {
+       ModeReference ban;
  public:
        SimpleExtItem<BanRedirectList> extItem;
-       BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
-               extItem("banredirect", parent)
+       BanRedirect(Module* parent)
+               : ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
+               , ban(parent, "ban")
+               , extItem("banredirect", parent)
        {
        }
 
@@ -70,14 +72,16 @@ class BanRedirect : public ModeWatcher
                        std::string mask[4];
                        enum { NICK, IDENT, HOST, CHAN } current = NICK;
                        std::string::iterator start_pos = param.begin();
-                       long maxbans = channel->GetMaxBans();
 
                        if (param.length() >= 2 && param[1] == ':')
                                return true;
 
-                       if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
+                       ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+                       unsigned int maxbans = banlm->GetLimit(channel);
+                       ListModeBase::ModeList* list = banlm->GetList(channel);
+                       if ((list) && (adding) && (maxbans <= list->size()))
                        {
-                               source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans);
+                               source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %u)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans);
                                return false;
                        }
 
@@ -242,7 +246,7 @@ class ModuleBanRedirect : public Module
                        if(redirects)
                        {
                                irc::modestacker modestack(false);
-                               StringDeque stackresult;
+                               std::vector<std::string> stackresult;
                                std::vector<std::string> mode_junk;
                                mode_junk.push_back(chan->name);
 
@@ -267,15 +271,8 @@ class ModuleBanRedirect : public Module
                }
        }
 
-       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string &privs, const std::string &keygiven)
        {
-               /* This prevents recursion when a user sets multiple ban redirects in a chain
-                * (thanks Potter)
-                */
-               if (nofollow)
-                       return MOD_RES_PASSTHRU;
-
-               /* Return 1 to prevent the join, 0 to allow it */
                if (chan)
                {
                        BanRedirectList* redirects = re.extItem.get(chan);
@@ -303,6 +300,16 @@ class ModuleBanRedirect : public Module
                                {
                                        if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask))
                                        {
+                                               /* This prevents recursion when a user sets multiple ban redirects in a chain
+                                                * (thanks Potter)
+                                                *
+                                                * If we're here and nofollow is true then we're already redirecting this user
+                                                * and there's a redirecting ban set on this channel that matches him, too.
+                                                * Deny both joins.
+                                                */
+                                               if (nofollow)
+                                                       return MOD_RES_DENY;
+
                                                /* tell them they're banned and are being transferred */
                                                Channel* destchan = ServerInstance->FindChan(redir->targetchan);
                                                std::string destlimit;
@@ -320,7 +327,7 @@ class ModuleBanRedirect : public Module
                                                        user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
                                                        user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transfered to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str());
                                                        nofollow = true;
-                                                       Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
+                                                       Channel::JoinUser(user, redir->targetchan, false, "", false, ServerInstance->Time());
                                                        nofollow = false;
                                                        return MOD_RES_DENY;
                                                }