...because every now and again, i have to do a massive commit.

[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 b7eb6f1ae5a7c71386bc5012910ceac7f88d9768..1ab3c3243d05bbf6f258b1c166c5fa66e6ed7abe 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,7 +20,7 @@
 /* Originally written by Om, January 2009
  */
 
-class BanRedirectEntry : public classbase
+class BanRedirectEntry
 {
  public:
        std::string targetchan;
@@ -39,7 +39,7 @@ class BanRedirect : public ModeWatcher
 {
  public:
        SimpleExtItem<BanRedirectList> extItem;
-       BanRedirect(InspIRCd* Instance, Module* parent) : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL),
+       BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
                extItem("banredirect", parent)
        {
        }
@@ -86,9 +86,13 @@ class BanRedirect : public ModeWatcher
                                                start_pos = curr+1;
                                                break;
                                        case '#':
-                                               mask[current].assign(start_pos, curr);
-                                               current = CHAN;
-                                               start_pos = curr;
+                                               /* bug #921: don't barf when redirecting to ## channels */
+                                               if (current != CHAN)
+                                               {
+                                                       mask[current].assign(start_pos, curr);
+                                                       current = CHAN;
+                                                       start_pos = curr;
+                                               }
                                                break;
                                }
                        }
@@ -202,8 +206,8 @@ class ModuleBanRedirect : public Module
        Module* ExceptionModule;
 
  public:
-       ModuleBanRedirect(InspIRCd* Me)
-       : Module(Me), re(Me, this)
+       ModuleBanRedirect()
+       : re(this)
        {
                nofollow = false;
 
@@ -212,9 +216,9 @@ class ModuleBanRedirect : public Module
 
                OnRehash(NULL);
 
-               Extensible::Register(&re.extItem);
-               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-               Me->Modules->Attach(list, this, 4);
+               ServerInstance->Extensions.Register(&re.extItem);
+               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
+               ServerInstance->Modules->Attach(list, this, 3);
        }
 
        virtual void OnChannelDelete(Channel* chan)
@@ -231,7 +235,7 @@ class ModuleBanRedirect : public Module
 
                        if(redirects)
                        {
-                               irc::modestacker modestack(ServerInstance, false);
+                               irc::modestacker modestack(false);
                                StringDeque stackresult;
                                std::vector<std::string> mode_junk;
                                mode_junk.push_back(chan->name);
@@ -283,12 +287,12 @@ class ModuleBanRedirect : public Module
                                 * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost?
                                 */
 
-                               if (ExceptionModule)
+                               ModResult result;
+                               FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan));
+                               if (result == MOD_RES_ALLOW)
                                {
-                                       ListModeRequest n(this, ExceptionModule, user, chan);
-                                       /* Users with ban exceptions are allowed to join without being redirected */
-                                       if (n.Send())
-                                               return MOD_RES_PASSTHRU;
+                                       // they have a ban exception
+                                       return MOD_RES_PASSTHRU;
                                }
 
                                std::string ipmask(user->nick);
@@ -308,16 +312,16 @@ class ModuleBanRedirect : public Module
                                                if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str())))
                                                {
                                                        user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
-                                                       return MOD_RES_ALLOW;
+                                                       return MOD_RES_DENY;
                                                }
                                                else
                                                {
                                                        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(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
+                                                       Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
                                                        nofollow = false;
-                                                       return MOD_RES_ALLOW;
+                                                       return MOD_RES_DENY;
                                                }
                                        }
                                }
@@ -328,12 +332,14 @@ class ModuleBanRedirect : public Module
 
        virtual ~ModuleBanRedirect()
        {
-               ServerInstance->Modes->DelModeWatcher(&re);
+               /* XXX is this the best place to do this? */
+               if (!ServerInstance->Modes->DelModeWatcher(&re))
+                       ServerInstance->Logs->Log("m_banredirect.so", DEBUG, "Failed to delete modewatcher!");
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+               return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
        }
 
        void Prioritize()