Remove unnecessary header traffic

[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 6150c5193141c737933a20662f2ea7c2a1290cc0..9fa36b5169b045572bb69d8e98505180e05fc0aa 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -11,11 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "mode.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
+#include "u_listmode.h"
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
 
@@ -65,7 +62,7 @@ class BanRedirect : public ModeWatcher
                        std::string::iterator start_pos = param.begin();
                        long maxbans = channel->GetMaxBans();
                
-                       if(channel->bans.size() > static_cast<unsigned>(maxbans))
+                       if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
                        {
                                source->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)", source->nick, channel->name, channel->name, maxbans);
                                return false;
@@ -186,23 +183,25 @@ class BanRedirect : public ModeWatcher
 class ModuleBanRedirect : public Module
 {
        BanRedirect* re;
-       InspIRCd* Srv;
        bool nofollow;
-       
+       Module* ExceptionModule;
+
  public:
        ModuleBanRedirect(InspIRCd* Me)
-       : Module::Module(Me), Srv(Me)
+       : Module(Me)
        {
                re = new BanRedirect(Me);
                nofollow = false;
                
-               if(!Srv->AddModeWatcher(re))
+               if(!ServerInstance->AddModeWatcher(re))
                        throw ModuleException("Could not add mode watcher");
+
+               OnRehash(NULL, "");
        }
        
        void Implements(char* List)
        {
-               List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1;
+               List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1;
        }
        
        virtual void OnChannelDelete(chanrec* chan)
@@ -221,8 +220,8 @@ class ModuleBanRedirect : public Module
                        {
                                irc::modestacker modestack(false);
                                StringDeque stackresult;
-                               const char* mode_junk[MAXMODES+1];
-                               userrec* myhorriblefakeuser = new userrec(Srv);
+                               const char* mode_junk[MAXMODES+2];
+                               userrec* myhorriblefakeuser = new userrec(ServerInstance);
                                myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER);
                                
                                mode_junk[0] = chan->name;
@@ -245,7 +244,7 @@ class ModuleBanRedirect : public Module
                                                mode_junk[i+1] = stackresult[i].c_str();
                                        }
                                        
-                                       Srv->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser);
+                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser);
                                }
                                
                                DELETE(myhorriblefakeuser);
@@ -255,6 +254,11 @@ class ModuleBanRedirect : public Module
                }
        }
 
+       virtual void OnRehash(userrec* user, const std::string &param)
+       {
+               ExceptionModule = ServerInstance->FindModule("m_banexception.so");
+       }
+
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                /* This prevents recursion when a user sets multiple ban redirects in a chain
@@ -275,26 +279,36 @@ class ModuleBanRedirect : public Module
                                /* This was replaced with user->MakeHostIP() when I had a snprintf(), but MakeHostIP() doesn't seem to add the nick.
                                 * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost?
                                 */
+
+                               if (ExceptionModule)
+                               {
+                                       ListModeRequest n(this, ExceptionModule, user, chan);
+                                       /* Users with ban exceptions are allowed to join without being redirected */
+                                       if (n.Send())
+                                               return 0;
+                               }
+
                                std::string ipmask(user->nick);
                                ipmask.append(1, '!').append(user->MakeHostIP());
                                
                                for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++)
                                {
-                                       if(Srv->MatchText(user->GetFullRealHost(), redir->banmask) || Srv->MatchText(user->GetFullHost(), redir->banmask) || Srv->MatchText(ipmask, redir->banmask))
+                                       if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask))
                                        {
                                                /* tell them they're banned and are being transferred */
-                                               chanrec* destchan = Srv->FindChan(redir->targetchan);
+                                               chanrec* destchan = ServerInstance->FindChan(redir->targetchan);
                                                
-                                               if(destchan && Srv->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
+                                               if(destchan && ServerInstance->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
                                                {
                                                        user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
                                                        return 1;
                                                }
                                                else
                                                {
-                                                       user->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str());
+                                                       user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
+                                                       user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
                                                        nofollow = true;
-                                                       chanrec::JoinUser(Srv, user, redir->targetchan.c_str(), false, "");
+                                                       chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
                                                        nofollow = false;
                                                        return 1;
                                                }
@@ -307,7 +321,7 @@ class ModuleBanRedirect : public Module
 
        virtual ~ModuleBanRedirect()
        {
-               Srv->Modes->DelModeWatcher(re);
+               ServerInstance->Modes->DelModeWatcher(re);
                DELETE(re);
        }
        
@@ -315,29 +329,12 @@ class ModuleBanRedirect : public Module
        {
                return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-};
-
-
-class ModuleBanRedirectFactory : public ModuleFactory
-{
- public:
-       ModuleBanRedirectFactory()
-       {
-       }
-       
-       ~ModuleBanRedirectFactory()
-       {
-       }
        
-       virtual Module * CreateModule(InspIRCd* Me)
+       Priority Prioritize()
        {
-               return new ModuleBanRedirect(Me);
+               return (Priority)ServerInstance->PriorityBefore("m_banexception.so");
        }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleBanRedirectFactory;
-}
+MODULE_INIT(ModuleBanRedirect)