Add RAWIO log level which is more verbose than DEBUG

[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 ae81c1733e6a12ec9d7540c67d595426cabf93da..1e61986e51c45d0f79bcabbe694b46dcf0735735 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
@@ -15,7 +15,6 @@
 #include "u_listmode.h"
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
-/* $ModDep: ../../include/u_listmode.h */
 
 /* Originally written by Om, January 2009
  */
@@ -121,7 +120,7 @@ class BanRedirect : public ModeWatcher
 
                        if(mask[CHAN].length())
                        {
-                               if (IS_LOCAL(source))
+                               if (adding && IS_LOCAL(source))
                                {
                                        if (!ServerInstance->IsChannel(mask[CHAN].c_str(),  ServerInstance->Config->Limits.ChanMax))
                                        {
@@ -135,7 +134,7 @@ class BanRedirect : public ModeWatcher
                                                source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str());
                                                return false;
                                        }
-                                       else if (c->GetPrefixValue(source) < OP_VALUE)
+                                       else if (adding && c->GetPrefixValue(source) < OP_VALUE)
                                        {
                                                source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(), mask[CHAN].c_str());
                                                return false;
@@ -203,14 +202,17 @@ class ModuleBanRedirect : public Module
 {
        BanRedirect re;
        bool nofollow;
-       Module* ExceptionModule;
 
  public:
        ModuleBanRedirect()
        : re(this)
        {
                nofollow = false;
+       }
+
 
+       void init()
+       {
                if(!ServerInstance->Modes->AddModeWatcher(&re))
                        throw ModuleException("Could not add mode watcher");
 
@@ -263,7 +265,6 @@ class ModuleBanRedirect : public Module
 
        virtual void OnRehash(User* user)
        {
-               ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
        }
 
        virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -332,6 +333,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()