X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=1e61986e51c45d0f79bcabbe694b46dcf0735735;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=afa7e42257c00ad958c79cc6385cb20664024ba7;hpb=5d474dc9fbd9bd36d0a0a8df93e1ec1e180864d7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index afa7e4225..1e61986e5 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -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,7 +202,6 @@ class ModuleBanRedirect : public Module { BanRedirect re; bool nofollow; - Module* ExceptionModule; public: ModuleBanRedirect() @@ -267,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)