Route SVSSILENCE/SVSWATCH using OPT_UCAST, marking them OPTCOMMON

[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 fdc5b122047858b72f499fc16f2f89ddab3066cf..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;
@@ -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;
                                }
                        }
@@ -308,7 +312,7 @@ 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
                                                {
@@ -317,7 +321,7 @@ class ModuleBanRedirect : public Module
                                                        nofollow = true;
                                                        Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
                                                        nofollow = false;
-                                                       return MOD_RES_ALLOW;
+                                                       return MOD_RES_DENY;
                                                }
                                        }
                                }
@@ -328,6 +332,9 @@ class ModuleBanRedirect : public Module
 
        virtual ~ModuleBanRedirect()
        {
+               /* 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()