Run DelMode and DelModeWatcher in RemoveModule

[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 da08d06fb485df031a3b3ceeb7b4b54f63961c80..33cb4d87490d4632f2104a9d124d57574d91902d 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -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)
        {
        }
@@ -131,7 +131,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->GetStatus(source) < STATUS_OP)
+                                       else if (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;
@@ -202,8 +202,8 @@ class ModuleBanRedirect : public Module
        Module* ExceptionModule;
 
  public:
-       ModuleBanRedirect(InspIRCd* Me)
-       : Module(Me), re(Me, this)
+       ModuleBanRedirect()
+       : re(this)
        {
                nofollow = false;
 
@@ -214,7 +214,7 @@ class ModuleBanRedirect : public Module
 
                Extensible::Register(&re.extItem);
                Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-               Me->Modules->Attach(list, this, 4);
+               ServerInstance->Modules->Attach(list, this, 4);
        }
 
        virtual void OnChannelDelete(Channel* chan)
@@ -231,7 +231,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);
@@ -315,7 +315,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(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;
                                                }
@@ -328,12 +328,11 @@ class ModuleBanRedirect : public Module
 
        virtual ~ModuleBanRedirect()
        {
-               ServerInstance->Modes->DelModeWatcher(&re);
        }
 
        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, API_VERSION);
        }
 
        void Prioritize()